Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b468a0 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Move HDMI aspect ratio setup to .compute_config() 



We shouldn't frob adjusted_mode after .compute_config(), so move the
infoframe aspect ratio setup to .compute_config() from
intel_hdmi_set_avi_infoframe().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent aad941d5

drivers/gpu/drm/i915/intel_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -454,9 +454,6 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, 
	union hdmi_infoframe frame;

	int ret;



	/* Set user selected PAR to incoming mode's member */

	adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio;



	ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,

						       adjusted_mode);

	if (ret < 0) {
@@ -1312,6 +1309,9 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, 
		return false;

	}



	/* Set user selected PAR to incoming mode's member */

	adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio;



	return true;

}