system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-23 21:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

video/hdmi: Don't let the user of this API create invalid infoframes

Browse source 
To set the active aspect ratio value in the AVI infoframe today, you not
only have to set the active_aspect field, but also the active_info_valid
bit. Out of the 1 user of this API, we had 100% misuse, forgetting the
_valid bit. This was fixed in:

  Author: Damien Lespiau <damien.lespiau@intel.com>
  Date:   Tue Aug 6 20:32:17 2013 +0100

      drm: Don't generate invalid AVI infoframes for CEA modes

We can do better and derive the _valid bit from the user wanting to set
the active aspect ratio.

v2: Fix multi-lines comment style (Thierry Reding)

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>
This commit is contained in:
Lespiau, Damien 2013-08-19 16:58:56 +01:00 committed by Dave Airlie
parent 3f2f653378
commit a5ad3dcf35
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/drm_edid.c
View file

@ -3259,7 +3259,6 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
frame->video_code = drm_match_cea_mode(mode); frame->video_code = drm_match_cea_mode(mode);
frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE; frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE;
frame->active_info_valid = 1;
frame->active_aspect = HDMI_ACTIVE_ASPECT_PICTURE; frame->active_aspect = HDMI_ACTIVE_ASPECT_PICTURE;
return 0; return 0;

6
drivers/video/hdmi.c
View file

@ -96,7 +96,11 @@ ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
ptr[0] = ((frame->colorspace & 0x3) << 5) | (frame->scan_mode & 0x3); ptr[0] = ((frame->colorspace & 0x3) << 5) | (frame->scan_mode & 0x3);
if (frame->active_info_valid) /*
* Data byte 1, bit 4 has to be set if we provide the active format
* aspect ratio
*/
if (frame->active_aspect & 0xf)
ptr[0] |= BIT(4); ptr[0] |= BIT(4);
if (frame->horizontal_bar_valid) if (frame->horizontal_bar_valid)

1
include/linux/hdmi.h
View file

@ -109,7 +109,6 @@ struct hdmi_avi_infoframe {
unsigned char version; unsigned char version;
unsigned char length; unsigned char length;
enum hdmi_colorspace colorspace; enum hdmi_colorspace colorspace;
bool active_info_valid;
bool horizontal_bar_valid; bool horizontal_bar_valid;
bool vertical_bar_valid; bool vertical_bar_valid;
enum hdmi_scan_mode scan_mode; enum hdmi_scan_mode scan_mode;