From: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Thu, 3 Sep 2009 01:30:06 +0000 (+0800)
Subject: drm/i915: do dynamic clock freq control only in kernel modesetting
X-Git-Tag: v2.6.32-rc1~52^2~71^2~2
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=5e17ee74b541b56b5d4cfab6502a5116f224e32c;p=safe%2Fjmp%2Flinux-2.6

drm/i915: do dynamic clock freq control only in kernel modesetting

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d7c7fa4..9aa1d2d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3472,6 +3472,9 @@ void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj)
 	struct intel_framebuffer *intel_fb;
 	struct intel_crtc *intel_crtc;
 
+	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+		return;
+
 	dev_priv->busy = true;
 	intel_increase_renderclock(dev, true);