drm/edid: Check for user aspect ratio input

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

v3: Thierry's review comments.
	- Modified the comment to block comment format.

Signed-off-by: Vandana Kannan <vandana.kannan@intel.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index dfa9769b26b5..58a4a9d20e4a 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3775,8 +3775,14 @@ 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);