diff options
| author | Abdiel Janulgue <abdiel.janulgue@linux.intel.com> | 2014-05-05 21:08:43 +0300 |
|---|---|---|
| committer | Abdiel Janulgue <abdiel.janulgue@linux.intel.com> | 2014-05-05 23:38:07 +0300 |
| commit | d43df91bba62c34fa2898c2c886e99264380f2c1 (patch) | |
| tree | f9b19afd871ab5d8dcdedebaac12736b29e9a82d | |
| parent | fe9deae6d654eae4ee28643aab5ab48540f169c5 (diff) | |
drm/i915/bdw: Expose I915_EXEC_RESOURCE_STREAMER flagintel_resource_streamer
Ensures that the batch buffer is executed by the resource streamer
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 | ||||
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 47fe8ecef135..68aaa9b2c9bf 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1074,6 +1074,14 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, if (args->flags & I915_EXEC_IS_PINNED) flags |= I915_DISPATCH_PINNED; + if (args->flags & I915_EXEC_RESOURCE_STREAMER) { + if ((args->flags & I915_EXEC_RING_MASK) != I915_EXEC_RENDER || + !IS_BROADWELL(dev)) + return -EINVAL; + + flags |= I915_DISPATCH_RS; + } + if ((args->flags & I915_EXEC_RING_MASK) > LAST_USER_RING) { DRM_DEBUG("execbuf with unknown ring: %d\n", (int)(args->flags & I915_EXEC_RING_MASK)); diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 8a3e4ef00c3d..adfc45d7fd25 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -734,7 +734,12 @@ struct drm_i915_gem_execbuffer2 { */ #define I915_EXEC_HANDLE_LUT (1<<12) -#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_HANDLE_LUT<<1) +/** Tell the kernel that the batchbuffer is processed by + * the resource streamer. + */ +#define I915_EXEC_RESOURCE_STREAMER (1<<13) + +#define __I915_EXEC_UNKNOWN_FLAGS -(I915_EXEC_RESOURCE_STREAMER <<1) #define I915_EXEC_CONTEXT_ID_MASK (0xffffffff) #define i915_execbuffer2_set_context_id(eb2, context) \ |