From 4e903299931848ff925a35d3ff2d0423c89c7680 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Thu, 3 Sep 2009 09:30:06 +0800 Subject: [PATCH] --- yaml --- r: 163971 b: refs/heads/master c: 5e17ee74b541b56b5d4cfab6502a5116f224e32c h: refs/heads/master i: 163969: 38125a6bde6287262ce7c203b70a5a4d54c6439a 163967: 45012aa352f1da78f912595c00846edde2b58189 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7217f521a55a..6639171751fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57cdaf90f5f607eb029356074fefb66c9b1c0659 +refs/heads/master: 5e17ee74b541b56b5d4cfab6502a5116f224e32c diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index d7c7fa489872..9aa1d2de8a84 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/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);