drm/i915: Do not override mode's aspect ratio with the prop value NONE

[linux.git] / drivers / gpu / drm / i915 / display / intel_sdvo.c

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index a4b1339fcc00c8ceddae742dfe6914cc6ca0d72a..c9cae6a9e8974355232aac91457ff4bb0f98c3cc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -1349,9 +1349,9 @@ static int intel_sdvo_compute_config(struct intel_encoder *encoder,
        if (IS_TV(intel_sdvo_connector))
                i9xx_adjust_sdvo_tv_clock(pipe_config);
 
-       /* Set user selected PAR to incoming mode's member */
-       if (intel_sdvo_connector->is_hdmi)
-               adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio;
+       if (conn_state->picture_aspect_ratio)
+               adjusted_mode->picture_aspect_ratio =
+                       conn_state->picture_aspect_ratio;
 
        if (!intel_sdvo_compute_avi_infoframe(intel_sdvo,
                                              pipe_config, conn_state)) {