From: Daniel Vetter Date: Wed, 12 Feb 2014 22:44:34 +0000 (+0100) Subject: drm/i915: protect ringbuffer sarea update behind !MODESET X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb19e2ac7cc0f4addbdb1577501a4cdfb6183e7d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/i915: protect ringbuffer sarea update behind !MODESET Avoids surprises when userspace races open/closes against this. Cc: Stéphane Marchesin Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index ba686d75ff32..ae6d234b8c12 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1513,7 +1513,8 @@ static int ring_wait_for_space(struct intel_ring_buffer *ring, int n) return 0; } - if (dev->primary->master) { + if (!drm_core_check_feature(dev, DRIVER_MODESET) && + dev->primary->master) { struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; if (master_priv->sarea_priv) master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;