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

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

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 659a03b088493f40d01d84eec4f7991a71625d60..315920c35cc04255813c20da12ee3da15c4a790e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2451,8 +2451,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
        if (ret)
                return ret;
 
-       /* Set user selected PAR to incoming mode's member */
-       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;
 
        pipe_config->lane_count = 4;