diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-09-04 18:25:18 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-16 23:18:50 +0200 |
| commit | a2b076b6e4890b693fed709f6d68a44f42875a3f (patch) | |
| tree | 37a7ee8f913bc123636592181a8c5ba093a099fc | |
| parent | d71b8d4a741596e6b8a68f88a9c9ea522ba1fd68 (diff) | |
drm/i915: Grab the pixel clock from adjusted_mode not requested_mode
i9xx_set_pipeconf() attempts to get the current pixel clock from
requested_mode. requested_mode.clock may be totally bogus, so the
clock should come from adjusted_mode.
v2: Dropped the intel_compute_config() hunk due to killing of the
INTEL_FDI_FREQ check
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c2a4d7b491d..3ff9d98c782 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4809,7 +4809,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) * XXX: No double-wide on 915GM pipe B. Is that the only reason for the * pipe == 0 check? */ - if (intel_crtc->config.requested_mode.clock > + if (intel_crtc->config.adjusted_mode.clock > dev_priv->display.get_display_clock_speed(dev) * 9 / 10) pipeconf |= PIPECONF_DOUBLE_WIDE; } |