UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

HDMI_PICTURE_ASPECT_NONE means "Automatic" so when the user has that
selected we should keep whatever aspect ratio the mode already has.

Also no point in checking for connector->is_hdmi in the SDVO code
since we only attach the property to HDMI connectors.

Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190620142639.17518-5-ville.syrjala@linux.intel.com
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
This commit is contained in:
Ville Syrjälä 2019-06-20 17:26:38 +03:00
parent c9ad602fea
commit c504f4dfaa
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/display/intel_hdmi.c
View File

@ -2451,8 +2451,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
if (ret) if (ret)
return ret; return ret;
/* Set user selected PAR to incoming mode's member */ if (conn_state->picture_aspect_ratio)
adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio; adjusted_mode->picture_aspect_ratio =
conn_state->picture_aspect_ratio;
pipe_config->lane_count = 4; pipe_config->lane_count = 4;

6
drivers/gpu/drm/i915/display/intel_sdvo.c
View File

@ -1349,9 +1349,9 @@ static int intel_sdvo_compute_config(struct intel_encoder *encoder,
if (IS_TV(intel_sdvo_connector)) if (IS_TV(intel_sdvo_connector))
i9xx_adjust_sdvo_tv_clock(pipe_config); i9xx_adjust_sdvo_tv_clock(pipe_config);
/* Set user selected PAR to incoming mode's member */ if (conn_state->picture_aspect_ratio)
if (intel_sdvo_connector->is_hdmi) adjusted_mode->picture_aspect_ratio =
adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio; conn_state->picture_aspect_ratio;
if (!intel_sdvo_compute_avi_infoframe(intel_sdvo, if (!intel_sdvo_compute_avi_infoframe(intel_sdvo,
pipe_config, conn_state)) { pipe_config, conn_state)) {