---

yaml --- r: 345235 b: refs/heads/master c: 4eda01b h: refs/heads/master i: 345233: 5ca9da3 345231: dd4ce0a v: v3
git-mirror · Nov 11, 2012 · e95d0ff · e95d0ff
1 parent 68e77f6
commit e95d0ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);