From: "Lodes, Jim" <[email protected]>
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: Lodes, Jim <[email protected]>
Signed-off-by: J.D. Schroeder <[email protected]>
---
drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +-
drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 +-
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 d993f78..8ab2093 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 f3e4b81..bbfe7e2 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;
--
1.9.1
Hi,
On 21/04/16 16:48, J.D. Schroeder wrote:
> From: "Lodes, Jim" <[email protected]>
>
> 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: Lodes, Jim <[email protected]>
> Signed-off-by: J.D. Schroeder <[email protected]>
Thanks, looks good. Can you fix the email here too, and resend?
Tomi
> drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 +-
> 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 d993f78..8ab2093 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 f3e4b81..bbfe7e2 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;
>
On 04/21/2016 09:43 AM, Tomi Valkeinen wrote:
>> Signed-off-by: Lodes, Jim <[email protected]>
>
> Thanks, looks good. Can you fix the email here too, and resend?
Yes, I'll fix the sign off and make sure we have it correct going forward.
From: Jim Lodes <[email protected]>
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 <[email protected]>
Signed-off-by: J.D. Schroeder <[email protected]>
---
drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +-
drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 +-
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 d993f78..8ab2093 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 f3e4b81..bbfe7e2 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;
--
1.9.1
On 21/04/16 20:49, J.D. Schroeder wrote:
> From: Jim Lodes <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: J.D. Schroeder <[email protected]>
> ---
> drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +-
> drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Thanks! Queuing this for 4.7.
Tomi