From: Keith Packard <keithp@keithp.com>
Date: Sat, 13 Aug 2011 00:07:18 +0000 (-0700)
Subject: drm/i915: Cannot set clock gating under UMS
X-Git-Tag: firefly_0821_release~3680^2~4639^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=92b79f4322b8a2506bdd862f554a2a81ff0a2dad;p=firefly-linux-kernel-4.4.55.git

drm/i915: Cannot set clock gating under UMS

The clock gating functions are only assigned under KMS, so don't try
to call them under UMS.

Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Justin P. Mattock <justinmattock@gmail.com>
---

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 87677d60d0df..f10742359ec9 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -871,7 +871,8 @@ int i915_restore_state(struct drm_device *dev)
 	}
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_init_clock_gating(dev);
+	if (drm_core_check_feature(dev, DRIVER_MODESET))
+		intel_init_clock_gating(dev);
 
 	if (IS_IRONLAKE_M(dev)) {
 		ironlake_enable_drps(dev);