| From d4e8d43624422018c00e583c4e22b7c30845fa2f Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Wed, 4 Sep 2013 18:25:18 +0300 |
| Subject: drm/i915: Grab the pixel clock from adjusted_mode not requested_mode |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit a2b076b6e4890b693fed709f6d68a44f42875a3f) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 79574f4f2146..1be863c5dd88 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; |
| } |
| -- |
| 1.8.5.rc3 |
| |
