drm/i915: Simplify cmd-parser DISPATCH_SECURE check

danvet · danvet · commit c6b8a4bc1ece · 2015-05-08T13:03:09.000+02:00
i915_needs_cmd_parser already checks that for us.

Suggested-by: Mika Kuoppala &lt;mika.kuoppala@intel.com&gt;
Cc: Mika Kuoppala &lt;mika.kuoppala@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@intel.com&gt;
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1559,8 +1559,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 		 * don't want that set when the command parser is
 		 * enabled.
 		 */
-		if (USES_PPGTT(dev))
-			dispatch_flags |= I915_DISPATCH_SECURE;
+		dispatch_flags |= I915_DISPATCH_SECURE;
 
 		exec_start = 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1559,8 +1559,7 @@ i915_gem_do_execbuffer(struct drm_device dev, void data,`
`1559`	`1559`	`* don't want that set when the command parser is`
`1560`	`1560`	`* enabled.`
`1561`	`1561`	`*/`
`1562`		`- if (USES_PPGTT(dev))`
`1563`		`- dispatch_flags \|= I915_DISPATCH_SECURE;`
	`1562`	`+ dispatch_flags \|= I915_DISPATCH_SECURE;`
`1564`	`1563`
`1565`	`1564`	`exec_start = 0;`
`1566`	`1565`	`}`