summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLespiau, Damien <damien.lespiau@intel.com>2013-08-19 16:58:57 +0100
committerDave Airlie <airlied@gmail.com>2013-08-30 08:40:35 +1000
commit974e0701c5251de879624d166890fbd0ee9fc429 (patch)
tree8a7a610ff4a91aecb04ef622932b52d8f3aacb46 /drivers/video
parenta5ad3dcf358475dfc5ccf11e28d3822fc3c8e5fe (diff)
downloadop-kernel-dev-974e0701c5251de879624d166890fbd0ee9fc429.zip
op-kernel-dev-974e0701c5251de879624d166890fbd0ee9fc429.tar.gz
video/hdmi: Derive the bar data valid bit from the bar data fields
Just like: Author: Damien Lespiau <damien.lespiau@intel.com> Date: Mon Aug 12 11:53:24 2013 +0100 video/hdmi: Don't let the user of this API create invalid infoframes But this time for the horizontal/vertical bar data present bits. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Dave Airlie <airlied@gmail.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/hdmi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 7ccc118..1201357 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -103,10 +103,11 @@ ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
if (frame->active_aspect & 0xf)
ptr[0] |= BIT(4);
- if (frame->horizontal_bar_valid)
+ /* Bit 3 and 2 indicate if we transmit horizontal/vertical bar data */
+ if (frame->top_bar || frame->bottom_bar)
ptr[0] |= BIT(3);
- if (frame->vertical_bar_valid)
+ if (frame->left_bar || frame->right_bar)
ptr[0] |= BIT(2);
ptr[1] = ((frame->colorimetry & 0x3) << 6) |
OpenPOWER on IntegriCloud