[PATCH] HAX drm/i915: Disable CSR (DMC) for Kabylake

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_drv.c | 3 +--
 drivers/gpu/drm/i915/i915_pci.c | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3db5851756f0..074205ea8a67 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1823,8 +1823,7 @@ static int i915_drm_resume_early(struct drm_device *dev)
 
 	intel_uncore_sanitize(dev_priv);
 
-	if (IS_GEN9_LP(dev_priv) ||
-	    !(dev_priv->suspended_to_idle && dev_priv->csr.dmc_payload))
+	if (IS_GEN9_LP(dev_priv) || !dev_priv->suspended_to_idle)
 		intel_power_domains_init_hw(dev_priv, true);
 
 	i915_gem_sanitize(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index bf467f30c99b..386cd5236b51 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -527,6 +527,7 @@ static const struct intel_device_info intel_geminilake_info __initconst = {
 #define KBL_PLATFORM \
 	GEN9_FEATURES, \
 	.gen = 9, \
+	.has_csr = false, \
 	.platform = INTEL_KABYLAKE
 
 static const struct intel_device_info intel_kabylake_gt1_info __initconst = {
-- 
2.15.0.rc1