| Message ID | 1399404306-26834-3-git-send-email-abdiel.janulgue@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 06, 2014 at 10:25:06PM +0300, Abdiel Janulgue wrote: > Ensures that the batch buffer is executed by the resource streamer > > Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 ++++++++ > include/uapi/drm/i915_drm.h | 7 ++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > index 47fe8ec..68aaa9b 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; This misses I915_EXEC_DEFAULT. If you reorder this testing to after we decide upon which ring is being run, this should look simpler. if (args->flags & I915_EXEC_RESOURCE_STREAMER) { if (!IS_BROADWELL(dev)) { DRM_DEBUG("resource streamer is only enabled for Broadwell\n"); return -EINVAL; } if (ring->id != RCS) { DRM_DEBUG("resource streamer is only available on the render ring (not %s)\n", ring->name); return -EINVAL; } flags |= I915_DISPATCH_RS; } -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 47fe8ec..68aaa9b 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 8a3e4ef00..adfc45d 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) \
Ensures that the batch buffer is executed by the resource streamer Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 ++++++++ include/uapi/drm/i915_drm.h | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-)