summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorVille Syrjälä2015-05-05 16:06:26 +0200
committerDaniel Vetter2015-06-15 11:36:23 +0200
commitbe69a1335fceb706e19f7eaf8d34c9a721c5baf9 (patch)
treef2074e2744e2b2efc02815644b3fa29581f05222 /drivers/gpu/drm/i915/intel_hdmi.c
parentdrm/i915: Check infoframe state more diligently. (diff)
downloadkernel-qcow2-linux-be69a1335fceb706e19f7eaf8d34c9a721c5baf9.tar.gz
kernel-qcow2-linux-be69a1335fceb706e19f7eaf8d34c9a721c5baf9.tar.xz
kernel-qcow2-linux-be69a1335fceb706e19f7eaf8d34c9a721c5baf9.zip
drm/i915: Fix hdmi clock readout with pixel repeat
Account for the pixel multiplier when reading out the HDMI mode dotclock. Makes the state checked happier on my ILK when using double clocked modes. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Chandra Konduru <Chandra.konduru@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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 1cde6c045da2..42fc50528190 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -943,6 +943,9 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
else
dotclock = pipe_config->port_clock;
+ if (pipe_config->pixel_multiplier)
+ dotclock /= pipe_config->pixel_multiplier;
+
if (HAS_PCH_SPLIT(dev_priv->dev))
ironlake_check_encoder_dotclock(pipe_config, dotclock);