summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJim Lodes <jim.lodes@garmin.com>2016-04-21 12:49:00 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-05-31 08:20:42 +0300
commit08f707ac3eb1fa86c43c705f9f78c1e40c49aba1 (patch)
treee6e1235234ec691d3e6193a4a79859a5e73a26f3 /drivers
parent91cd220aadc88dff6650127e7b19a85569ef8b7c (diff)
downloadlinux-stable-08f707ac3eb1fa86c43c705f9f78c1e40c49aba1.tar.gz
linux-stable-08f707ac3eb1fa86c43c705f9f78c1e40c49aba1.tar.bz2
linux-stable-08f707ac3eb1fa86c43c705f9f78c1e40c49aba1.zip
OMAPDSS: HDMI5: Fix AVI infoframe
The AVI infoframe R0-R3 in the 2nd data byte represents the Active Format Aspect Ratio. It is four bits long not two bits. This fixes that mask used to extract the bits before writing the bits to the hardware registers. Signed-off-by: Jim Lodes <jim.lodes@garmin.com> Signed-off-by: J.D. Schroeder <jay.schroeder@garmin.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/hdmi5_core.c2
-rw-r--r--drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index 6a397520cae5..f9a2d4377e45 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -458,7 +458,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core,
c = (ptr[1] >> 6) & 0x3;
m = (ptr[1] >> 4) & 0x3;
- r = (ptr[1] >> 0) & 0x3;
+ r = (ptr[1] >> 0) & 0xf;
itc = (ptr[2] >> 7) & 0x1;
ec = (ptr[2] >> 4) & 0x7;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
index 8ea531d2652c..fc5eceeddf9c 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c
@@ -442,7 +442,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_core_data *core,
c = (ptr[1] >> 6) & 0x3;
m = (ptr[1] >> 4) & 0x3;
- r = (ptr[1] >> 0) & 0x3;
+ r = (ptr[1] >> 0) & 0xf;
itc = (ptr[2] >> 7) & 0x1;
ec = (ptr[2] >> 4) & 0x7;