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>

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;