diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-31 16:07:37 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-31 16:07:37 -0500 |
| commit | db4a29993d207fec33c07de8b8cb8a3fd22c9e6c (patch) | |
| tree | c5a0827a5cc8b053e9095d1ee8635795d588b449 | |
| parent | ab0ec15f77b5692c06fac024f34a90ab4752b41a (diff) | |
| parent | 6df07d854b9ee81d31fafcd83724bed7fb1fd6d7 (diff) | |
| download | u-boot-db4a29993d207fec33c07de8b8cb8a3fd22c9e6c.tar.gz | |
Merge tag 'video-updates-for-2019.04-rc1' of git://git.denx.de/u-boot-video
- ihs and imx driver fixes
- relax EDID validation checks for 0 hsync/vsync
pulse width (support some quirky displays)
| -rw-r--r-- | arch/arm/mach-imx/video.c | 4 | ||||
| -rw-r--r-- | drivers/video/ihs_video_out.c | 6 | ||||
| -rw-r--r-- | drivers/video/videomodes.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c index b40ce53405..953fe53cb4 100644 --- a/arch/arm/mach-imx/video.c +++ b/arch/arm/mach-imx/video.c @@ -7,7 +7,7 @@ int board_video_skip(void) { int i; - int ret; + int ret = 0; char const *panel = env_get("panel"); if (!panel) { @@ -50,7 +50,7 @@ int board_video_skip(void) return -EINVAL; } - return 0; + return ret; } #ifdef CONFIG_IMX_HDMI diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c index 5cdf17aec1..0af7c2bf44 100644 --- a/drivers/video/ihs_video_out.c +++ b/drivers/video/ihs_video_out.c @@ -238,8 +238,8 @@ int ihs_video_out_probe(struct udevice *dev) int res; res = regmap_init_mem(dev_ofnode(dev), &priv->map); - if (!res) { - debug("%s: Could initialize regmap (err = %d)\n", dev->name, + if (res) { + debug("%s: Could not initialize regmap (err = %d)\n", dev->name, res); return res; } @@ -322,7 +322,7 @@ int ihs_video_out_probe(struct udevice *dev) } res = display_enable(priv->video_tx, 8, &timing); - if (res) { + if (res && res != -EIO) { /* Ignore missing DP sink error */ debug("%s: Could not enable the display (err = %d)\n", dev->name, res); return res; diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c index 74bafff011..1cfeaa980f 100644 --- a/drivers/video/videomodes.c +++ b/drivers/video/videomodes.c @@ -396,9 +396,7 @@ int video_edid_dtd_to_ctfb_res_modes(struct edid_detailed_timing *t, EDID_DETAILED_TIMING_VERTICAL_ACTIVE(*t) == 0 || EDID_DETAILED_TIMING_VERTICAL_BLANKING(*t) == 0 || EDID_DETAILED_TIMING_HSYNC_OFFSET(*t) == 0 || - EDID_DETAILED_TIMING_HSYNC_PULSE_WIDTH(*t) == 0 || EDID_DETAILED_TIMING_VSYNC_OFFSET(*t) == 0 || - EDID_DETAILED_TIMING_VSYNC_PULSE_WIDTH(*t) == 0 || /* 3d formats are not supported*/ EDID_DETAILED_TIMING_FLAG_STEREO(*t) != 0) return -EINVAL; |