| Message ID | 1401098862-30278-1-git-send-email-vandana.kannan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 26, 2014 at 03:37:42PM +0530, Vandana Kannan wrote: > In case user has specified an input for aspect ratio through the property, > then the user space value for PAR would take preference over the value from > CEA mode list. > > v2: Thierry's review comments. > - Modified the comment "Populate..." as per review comments > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > --- > drivers/gpu/drm/drm_edid.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 7a4fd2e..2628dd1 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -3657,8 +3657,13 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, > > frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE; > > - /* Populate picture aspect ratio from CEA mode list */ > - if (frame->video_code > 0) > + /* Populate picture aspect ratio from either user input (if specified) > + * or from the CEA mode list > + */ Block comments should be of this form: /* * Populate ... * ... mode list. */ > + if (mode->picture_aspect_ratio == HDMI_PICTURE_ASPECT_4_3 || > + mode->picture_aspect_ratio == HDMI_PICTURE_ASPECT_16_9) > + frame->picture_aspect = mode->picture_aspect_ratio; > + else if (frame->video_code > 0) > frame->picture_aspect = drm_get_cea_aspect_ratio( > frame->video_code); With the above fixed, this is: Reviewed-by: Thierry Reding <treding@nvidia.com>
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 7a4fd2e..2628dd1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3657,8 +3657,13 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE; - /* Populate picture aspect ratio from CEA mode list */ - if (frame->video_code > 0) + /* Populate picture aspect ratio from either user input (if specified) + * or from the CEA mode list + */ + if (mode->picture_aspect_ratio == HDMI_PICTURE_ASPECT_4_3 || + mode->picture_aspect_ratio == HDMI_PICTURE_ASPECT_16_9) + frame->picture_aspect = mode->picture_aspect_ratio; + else if (frame->video_code > 0) frame->picture_aspect = drm_get_cea_aspect_ratio( frame->video_code);
In case user has specified an input for aspect ratio through the property, then the user space value for PAR would take preference over the value from CEA mode list. v2: Thierry's review comments. - Modified the comment "Populate..." as per review comments Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/drm_edid.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)