high volatileforce_throttle

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0981bd19e33d..02fe76119254 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -294,14 +294,17 @@ i915_gem_gproc_nice_ioctl(struct drm_device *dev, void *data,
 	kref_get(&p->proc_refcount);
 	spin_unlock(&dev_priv->proc_lock);
 
-	if (p != file_priv->fp_proc)
-		DRM_ERROR("You're using a gpid you probably shouldn't be\n");
-
 	mutex_lock(&dev->struct_mutex);
 	if (p->current_pri == args->priority)
 		goto out;
 
 	BUG_ON(p->current_pri > 2);
+
+	if (p != file_priv->fp_proc) {
+		DRM_ERROR("You're using a gpid you probably shouldn't be\n");
+		file_priv->fp_proc = p;
+	}
+
 	list_move(&p->link, &dev_priv->proc_list[args->priority]);
 	p->current_pri = args->priority;
 	p->max = pri_max[args->priority];