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

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

Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev updates from Tomi Valkeinen:
 "Small fixes and improvements to various fbdev drivers"

* tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (24 commits)
  omapdss: extend pm notifier to handle hibernation
  OMAPDSS: Correct video ports description file path in DT binding doc
  OMAPDSS: disable VT switch
  fbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex
  video: fbdev: sh_mobile_lcdcfb: Fix ROP3 sysfs attribute parsing
  fbdev: pm3fb: cleanup some confusing indenting
  hyperv: hyperv_fb: match wait_for_completion_timeout return type
  video: fbdev: use msecs_to_jiffies for time conversions
  fbdev: via/via_clock: fix sparse warning
  video: fbdev: make of_device_id array const
  fbdev: sm501fb: use memset_io
  OMAPDSS: workaround for MFLAG + NV12 issue
  OMAPDSS: Add support for MFLAG
  OMAPDSS: setup default fifo thresholds
  OMAPDSS: DISPC: lock access to DISPC_CONTROL & DISPC_CONFIG
  OMAPDSS: DISPC: fix div by zero issue in overlay scaling
  OMAPDSS: DISPC: change sync_pclk_edge default value
  OMAPDSS: change signal_level & signal_edge enum values
  OMAPDSS: DISPC: explicit handling for sync and de levels
  OMAPDSS: DISPC: remove OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES
  ...
parents 14aa0244 6b75b54c

Documentation/devicetree/bindings/video/ti,omap-dss.txt

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ Video Ports 
-----------



The DSS Core and the encoders have video port outputs. The structure of the

video ports is described in Documentation/devicetree/bindings/video/video-

ports.txt, and the properties for the ports and endpoints for each encoder are

video ports is described in Documentation/devicetree/bindings/graph.txt,

and the properties for the ports and endpoints for each encoder are

described in the SoC's DSS binding documentation.



The video ports are used to describe the connections to external hardware, like

drivers/gpu/drm/omapdrm/omap_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void copy_timings_drm_to_omap(struct omap_video_timings *timings, 


	timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;

	timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;

	timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;

	timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;

}



static enum drm_connector_status omap_connector_detect(

drivers/video/fbdev/hyperv_fb.c

+4 −2
Original line number Diff line number Diff line
@@ -415,7 +415,8 @@ static int synthvid_negotiate_ver(struct hv_device *hdev, u32 ver) 
	struct fb_info *info = hv_get_drvdata(hdev);

	struct hvfb_par *par = info->par;

	struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;

	int t, ret = 0;

	int ret = 0;

	unsigned long t;



	memset(msg, 0, sizeof(struct synthvid_msg));

	msg->vid_hdr.type = SYNTHVID_VERSION_REQUEST;
@@ -488,7 +489,8 @@ static int synthvid_send_config(struct hv_device *hdev) 
	struct fb_info *info = hv_get_drvdata(hdev);

	struct hvfb_par *par = info->par;

	struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;

	int t, ret = 0;

	int ret = 0;

	unsigned long t;



	/* Send VRAM location */

	memset(msg, 0, sizeof(struct synthvid_msg));

drivers/video/fbdev/imxfb.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static struct platform_device_id imxfb_devtype[] = { 
};

MODULE_DEVICE_TABLE(platform, imxfb_devtype);



static struct of_device_id imxfb_of_dev_id[] = {

static const struct of_device_id imxfb_of_dev_id[] = {

	{

		.compatible = "fsl,imx1-fb",

		.data = &imxfb_devtype[IMX1_FB],

drivers/video/fbdev/omap2/displays-new/connector-dvi.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const struct omap_video_timings dvic_default_timings = { 
	.hsync_level	= OMAPDSS_SIG_ACTIVE_HIGH,

	.data_pclk_edge	= OMAPDSS_DRIVE_SIG_RISING_EDGE,

	.de_level	= OMAPDSS_SIG_ACTIVE_HIGH,

	.sync_pclk_edge	= OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,

	.sync_pclk_edge	= OMAPDSS_DRIVE_SIG_FALLING_EDGE,

};



struct panel_drv_data {