Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "There is nothing really major here (though removal of the dead igafb
  driver stands out in diffstat).

  Summary:

   - convert timers to use timer_setup() (Kees Cook, Thierry Reding)

   - fix panels support on iMX boards in mxsfb driver (Stefan Agner)

   - fix timeout on EDID read in udlfb driver (Ladislav Michl)

   - add missing modes to fix out of bounds access in controlfb driver
     (Geert Uytterhoeven)

   - update initialisation paths in sa1100fb driver to be more robust
     (Russell King)

   - fix error handling path of ->probe method in au1200fb driver
     (Christophe JAILLET)

   - fix handling of cases when either panel or crt is defined in
     sm501fb driver (Sudip Mukherjee, Colin Ian King)

   - add ability to the Goldfish FB driver to be recognized by OS via DT
     (Aleksandar Markovic)

   - structures constifications (Bhumika Goyal)

   - misc fixes (Allen Pais, Gustavo A. R. Silva, Dan Carpenter)

   - misc cleanups (Colin Ian King, Himanshu Jha, Markus Elfring)

   - remove dead igafb driver"

* tag 'fbdev-v4.15' of git://github.com/bzolnier/linux: (42 commits)
  OMAPFB: prevent buffer underflow in omapfb_parse_vram_param()
  video: fbdev: sm501fb: fix potential null pointer dereference on fbi
  fbcon: Initialize ops->info early
  video: fbdev: Convert timers to use timer_setup()
  video: fbdev: pxa3xx_gcu: Convert timers to use timer_setup()
  fbdev: controlfb: Add missing modes to fix out of bounds access
  video: fbdev: sis_main: mark expected switch fall-throughs
  video: fbdev: cirrusfb: mark expected switch fall-throughs
  video: fbdev: aty: radeon_pm: mark expected switch fall-throughs
  video: fbdev: sm501fb: mark expected switch fall-through in sm501fb_blank_crt
  video: fbdev: intelfb: remove redundant variables
  video/fbdev/dnfb: Use common error handling code in dnfb_probe()
  sm501fb: suspend and resume fb if it exists
  sm501fb: unregister framebuffer only if registered
  sm501fb: deallocate colormap only if allocated
  video: goldfishfb: Add support for device tree bindings
  Documentation: Add device tree binding for Goldfish FB driver
  video: udlfb: Fix read EDID timeout
  video: fbdev: remove dead igafb driver
  video: fbdev: mxsfb: fix pixelclock polarity
  ...
parents c633e898 5f215d25

Documentation/devicetree/bindings/display/google,goldfish-fb.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Android Goldfish framebuffer



Android Goldfish framebuffer device used by Android emulator.



Required properties:



- compatible : should contain "google,goldfish-fb"

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	display-controller@1f008000 {

		compatible = "google,goldfish-fb";

		interrupts = <0x10>;

		reg = <0x1f008000 0x100>;

	};

drivers/video/fbdev/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -905,16 +905,6 @@ config FB_LEO 
	  This is the frame buffer device driver for the SBUS-based Sun ZX

	  (leo) frame buffer cards.



config FB_IGA

	bool "IGA 168x display support"

	depends on (FB = y) && SPARC32

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	help

	  This is the framebuffer device for the INTERGRAPHICS 1680 and

	  successor frame buffer cards.



config FB_XVR500

	bool "Sun XVR-500 3DLABS Wildcat support"

	depends on (FB = y) && PCI && SPARC64

drivers/video/fbdev/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ obj-$(CONFIG_FB_HGA) += hgafb.o 
obj-$(CONFIG_FB_XVR500)           += sunxvr500.o

obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o

obj-$(CONFIG_FB_XVR1000)          += sunxvr1000.o

obj-$(CONFIG_FB_IGA)              += igafb.o

obj-$(CONFIG_FB_APOLLO)           += dnfb.o

obj-$(CONFIG_FB_Q40)              += q40fb.o

obj-$(CONFIG_FB_TGA)              += tgafb.o

drivers/video/fbdev/aty/atyfb_base.c

+2 −2
Original line number Diff line number Diff line
@@ -2272,10 +2272,10 @@ static void aty_bl_exit(struct backlight_device *bd) 


static void aty_calc_mem_refresh(struct atyfb_par *par, int xclk)

{

	const int ragepro_tbl[] = {

	static const int ragepro_tbl[] = {

		44, 50, 55, 66, 75, 80, 100

	};

	const int ragexl_tbl[] = {

	static const int ragexl_tbl[] = {

		50, 66, 75, 83, 90, 95, 100, 105,

		110, 115, 120, 125, 133, 143, 166

	};

drivers/video/fbdev/aty/radeon_base.c

+4 −6
Original line number Diff line number Diff line
@@ -1454,9 +1454,9 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg 
/*

 * Timer function for delayed LVDS panel power up/down

 */

static void radeon_lvds_timer_func(unsigned long data)

static void radeon_lvds_timer_func(struct timer_list *t)

{

	struct radeonfb_info *rinfo = (struct radeonfb_info *)data;

	struct radeonfb_info *rinfo = from_timer(rinfo, t, lvds_timer);



	radeon_engine_idle();
@@ -1534,7 +1534,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, 
static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs *regs,

				 unsigned long freq)

{

	const struct {

	static const struct {

		int divider;

		int bitvalue;

	} *post_div,
@@ -2291,9 +2291,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, 
	rinfo->pdev = pdev;

	

	spin_lock_init(&rinfo->reg_lock);

	init_timer(&rinfo->lvds_timer);

	rinfo->lvds_timer.function = radeon_lvds_timer_func;

	rinfo->lvds_timer.data = (unsigned long)rinfo;

	timer_setup(&rinfo->lvds_timer, radeon_lvds_timer_func, 0);



	c1 = ent->device >> 8;

	c2 = ent->device & 0xff;