diff options
| author | Ville Syrjälä | 2015-09-08 12:40:48 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-30 10:20:10 +0200 |
| commit | 28b468a008888928ce59bc2528713b913be60baa (patch) | |
| tree | 1d0132ebefe295d2991772ad13d2ea47ddcfcbea /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915: Always use crtc_ timings when dealing with adjustead_mode (diff) | |
| download | kernel-qcow2-linux-28b468a008888928ce59bc2528713b913be60baa.tar.gz kernel-qcow2-linux-28b468a008888928ce59bc2528713b913be60baa.tar.xz kernel-qcow2-linux-28b468a008888928ce59bc2528713b913be60baa.zip | |
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index c11703a0e6b1..08f8399f8418 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -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; } |