Commit be129fab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fbdev fixes from Helge Deller:
 "Two bug fixes for the pxa3xx and intelfb drivers:

   - pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write

   - intelfb: Initialize value of stolen size

  The other changes are small cleanups, simplifications and
  documentation updates to the cirrusfb, skeletonfb, omapfb,
  intelfb, au1100fb and simplefb drivers"

* tag 'for-5.19/fbdev-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  video: fbdev: omap: Remove duplicate 'the' in comment
  video: fbdev: omapfb: Align '*' in comment
  video: fbdev: simplefb: Check before clk_put() not needed
  video: fbdev: au1100fb: Drop unnecessary NULL ptr check
  video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
  video: fbdev: skeletonfb: Convert to generic power management
  video: fbdev: cirrusfb: Remove useless reference to PCI power management
  video: fbdev: intelfb: Initialize value of stolen size
  video: fbdev: intelfb: Use aperture size from pci_resource_len
  video: fbdev: skeletonfb: Fix syntax errors in comments
parents c0c6a7bd cb517733

drivers/video/fbdev/au1100fb.c

+2 −4
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ int au1100fb_drv_suspend(struct platform_device *dev, pm_message_t state) 
	/* Blank the LCD */

	au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);



	if (fbdev->lcdclk)

	clk_disable(fbdev->lcdclk);



	memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs));
@@ -577,7 +576,6 @@ int au1100fb_drv_resume(struct platform_device *dev) 


	memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs));



	if (fbdev->lcdclk)

	clk_enable(fbdev->lcdclk);



	/* Unblank the LCD */

drivers/video/fbdev/cirrusfb.c

+0 −6
Original line number Diff line number Diff line
@@ -2184,12 +2184,6 @@ static struct pci_driver cirrusfb_pci_driver = { 
	.id_table	= cirrusfb_pci_table,

	.probe		= cirrusfb_pci_register,

	.remove		= cirrusfb_pci_unregister,

#ifdef CONFIG_PM

#if 0

	.suspend	= cirrusfb_pci_suspend,

	.resume		= cirrusfb_pci_resume,

#endif

#endif

};

#endif /* CONFIG_PCI */

drivers/video/fbdev/intelfb/intelfbdrv.c

+2 −2
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int intelfb_pci_register(struct pci_dev *pdev, 
	struct fb_info *info;

	struct intelfb_info *dinfo;

	int i, err, dvo;

	int aperture_size, stolen_size;

	int aperture_size, stolen_size = 0;

	struct agp_kern_info gtt_info;

	int agp_memtype;

	const char *s;

drivers/video/fbdev/intelfb/intelfbhw.c

+5 −7
Original line number Diff line number Diff line
@@ -201,13 +201,11 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, 
	case PCI_DEVICE_ID_INTEL_945GME:

	case PCI_DEVICE_ID_INTEL_965G:

	case PCI_DEVICE_ID_INTEL_965GM:

		/* 915, 945 and 965 chipsets support a 256MB aperture.

		   Aperture size is determined by inspected the

		   base address of the aperture. */

		if (pci_resource_start(pdev, 2) & 0x08000000)

			*aperture_size = MB(128);

		else

			*aperture_size = MB(256);

		/*

		 * 915, 945 and 965 chipsets support 64MB, 128MB or 256MB

		 * aperture. Determine size from PCI resource length.

		 */

		*aperture_size = pci_resource_len(pdev, 2);

		break;

	default:

		if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)

drivers/video/fbdev/omap/sossi.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void sossi_set_bits_per_cycle(int bpc) 
	int bus_pick_count, bus_pick_width;



	/*

	 * We set explicitly the the bus_pick_count as well, although

	 * We set explicitly the bus_pick_count as well, although

	 * with remapping/reordering disabled it will be calculated by HW

	 * as (32 / bus_pick_width).

	 */