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);