From e95d0ff177a48f2c3dce3f326a4952e4b2660c37 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Wed, 31 Oct 2012 18:12:21 -0200 Subject: [PATCH] --- yaml --- r: 345235 b: refs/heads/master c: 4eda01b208b9b35f135bf351cca63b073ebd8b4b h: refs/heads/master i: 345233: 5ca9da3c8f5fdffdf6965dd1d68b1cb9e74a4ef7 345231: dd4ce0a5ed3916598e91bd3586b83a53e61ff475 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 30883c499a7a..8fd9c2b0677b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4837813a4c091eef5c7e326b22bfabea99a99341 +refs/heads/master: 4eda01b208b9b35f135bf351cca63b073ebd8b4b diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c index e4fd1027143c..1c97c2761e0a 100644 --- a/trunk/drivers/gpu/drm/i915/intel_crt.c +++ b/trunk/drivers/gpu/drm/i915/intel_crt.c @@ -784,7 +784,10 @@ void intel_crt_init(struct drm_device *dev) crt->base.disable = intel_disable_crt; crt->base.enable = intel_enable_crt; - crt->base.get_hw_state = intel_crt_get_hw_state; + if (IS_HASWELL(dev)) + crt->base.get_hw_state = intel_ddi_get_hw_state; + else + crt->base.get_hw_state = intel_crt_get_hw_state; intel_connector->get_hw_state = intel_connector_get_hw_state; drm_encoder_helper_add(&crt->base.base, &crt_encoder_funcs);