Commit 89b749d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev fixes and updates from Helge Deller:
 "Mostly just small patches, with the exception of the bigger indenting
  cleanups in the sisfb and radeonfb drivers.

  Two patches should be mentioned though: A fix-up for fbdev if the
  screen resize fails (by Shigeru Yoshida), and a potential divide by
  zero fix in fb_pm2fb (by Letu Ren).

  Summary:

  Major fixes:
   - Revert the changes for fbcon console when vc_resize() fails
     [Shigeru Yoshida]
   - Avoid a potential divide by zero error in fb_pm2fb [Letu Ren]

  Minor fixes:
   - Add missing pci_disable_device() in chipsfb_pci_init() [Yang
     Yingliang]
   - Fix tests for platform_get_irq() failure in omapfb [Yu Zhe]
   - Destroy mutex on freeing struct fb_info in fbsysfs [Shigeru
     Yoshida]

  Cleanups:
   - Move fbdev drivers from strlcpy to strscpy [Wolfram Sang]
   - Indenting fixes, comment fixes, ... [Jiapeng Chong & Jilin Yuan]"

* tag 'fbdev-for-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: fbcon: Properly revert changes when vc_resize() failed
  fbdev: Move fbdev drivers from strlcpy to strscpy
  fbdev: omap: Remove unnecessary print function dev_err()
  fbdev: chipsfb: Add missing pci_disable_device() in chipsfb_pci_init()
  fbdev: fbcon: Destroy mutex on freeing struct fb_info
  fbdev: radeon: Clean up some inconsistent indenting
  fbdev: sisfb: Clean up some inconsistent indenting
  fbdev: fb_pm2fb: Avoid potential divide by zero error
  fbdev: ssd1307fb: Fix repeated words in comments
  fbdev: omapfb: Fix tests for platform_get_irq() failure
parents d6ffe606 a5a92303

drivers/video/console/sticore.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static char default_sti_path[21] __read_mostly; 
static int __init sti_setup(char *str)

{

	if (str)

		strlcpy (default_sti_path, str, sizeof (default_sti_path));

		strscpy(default_sti_path, str, sizeof(default_sti_path));

	

	return 1;

}

drivers/video/fbdev/aty/atyfb_base.c

+1 −1
Original line number Diff line number Diff line
@@ -3891,7 +3891,7 @@ static int __init atyfb_setup(char *options) 
			 && (!strncmp(this_opt, "Mach64:", 7))) {

			static unsigned char m64_num;

			static char mach64_str[80];

			strlcpy(mach64_str, this_opt + 7, sizeof(mach64_str));

			strscpy(mach64_str, this_opt + 7, sizeof(mach64_str));

			if (!store_video_par(mach64_str, m64_num)) {

				m64_num++;

				mach64_count = m64_num;

drivers/video/fbdev/aty/radeon_base.c

+24 −24
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ static int radeon_set_fbinfo(struct radeonfb_info *rinfo) 
	info->screen_base = rinfo->fb_base;

	info->screen_size = rinfo->mapped_vram;

	/* Fill fix common fields */

	strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id));

	strscpy(info->fix.id, rinfo->name, sizeof(info->fix.id));

        info->fix.smem_start = rinfo->fb_base_phys;

        info->fix.smem_len = rinfo->video_ram;

        info->fix.type = FB_TYPE_PACKED_PIXELS;
@@ -2101,8 +2101,8 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) 
            (rinfo->family == CHIP_FAMILY_RS400) ||

	    (rinfo->family == CHIP_FAMILY_RS480) ) {

		u32 tom = INREG(NB_TOM);

          tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);



		tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024);

		radeon_fifo_wait(6);

		OUTREG(MC_FB_LOCATION, tom);

		OUTREG(DISPLAY_BASE_ADDR, (tom & 0xffff) << 16);
@@ -2115,7 +2115,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) 
		if ((rinfo->family == CHIP_FAMILY_RS100) ||

		    (rinfo->family == CHIP_FAMILY_RS200)) {

			/* This is to workaround the asic bug for RMX, some versions

                of BIOS doesn't have this register initialized correctly.

			 * of BIOS doesn't have this register initialized correctly.

			 */

			OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN,

				~CRTC_H_CUTOFF_ACTIVE_EN);

drivers/video/fbdev/bw2.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) 


static void bw2_init_fix(struct fb_info *info, int linebytes)

{

	strlcpy(info->fix.id, "bwtwo", sizeof(info->fix.id));

	strscpy(info->fix.id, "bwtwo", sizeof(info->fix.id));



	info->fix.type = FB_TYPE_PACKED_PIXELS;

	info->fix.visual = FB_VISUAL_MONO01;

drivers/video/fbdev/chipsfb.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent) 
 err_release_fb:

	framebuffer_release(p);

 err_disable:

	pci_disable_device(dp);

 err_out:

	return rc;

}