From: Daniel Vetter Date: Tue, 3 Sep 2013 18:40:37 +0000 (+0200) Subject: drm/i915: fix i9xx_crtc_clock_get for multiplied pixels X-Git-Tag: firefly_0821_release~176^2~4694^2~201^2~120 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2dc53e7dc4d22f20aecdfa10f85004de442e4d0;p=firefly-linux-kernel-4.4.55.git drm/i915: fix i9xx_crtc_clock_get for multiplied pixels The dpll actually runs at the port clock so we don't need to multiply it again with the pixel multiplier to get the adjusted_mode.clock. This is in contrast to the ironlake pixel clock readout code which uses the fdi dotclock: That one does _not_ run with multiplied pixels. This issue goes back to the original clock readout code added in commit f1f644dc66cbaf5a4c7dcde683361536b41885b9 Author: Jesse Barnes Date: Thu Jun 27 00:39:25 2013 +0300 drm/i915: get mode clock when reading the pipe config v9 Cc: Jesse Barnes Cc: Ville Syrjälä Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 73dec62f871f..0534d5b9b3e3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7313,8 +7313,7 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc, } } - pipe_config->adjusted_mode.clock = clock.dot * - pipe_config->pixel_multiplier; + pipe_config->adjusted_mode.clock = clock.dot; } static void ironlake_crtc_clock_get(struct intel_crtc *crtc,