RFC: drm/1915: Resource streamer initial support
Subsystems (3)
Daniel Vetter suggested at some point we need to implement getparam ioctl so userspace can figure out whether kernel supports RS at runtime. For now, this will do to support the corresponding RFC mesa patches.
Based on the work of: Lukasz Anaczkowski <[email protected]>
Abdiel Janulgue (2):
drm/i915/hsw: Expose resource streamer control flags drm/i915/hsw: Enable resource streamer bit on MI_BATCH_BUFFER_START
[abj@hasbox drm-intel]$ git diff bc32705a7686370b2e50d467b001d88c2c059e39 --stat
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++-- include/uapi/drm/i915_drm.h | 1 + 4 files changed, 8 insertions(+), 2 deletions(-)
PATCH 1/2 drm/i915/hsw: Expose resource streamer control flags
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 ++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -0
@@ -865,6 +865,8 @@ 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_RS ) + flags |=I915_EXEC_RS ;switch (args->flags &I915_EXEC_RING_MASK ) {case I915_EXEC_DEFAULT :
include/uapi/drm/i915_drm.h +1 -0
@@ -661,6 +661,7 @@ struct drm_i915_gem_execbuffer2 {#define I915_EXEC_BSD (2<<0)#define I915_EXEC_BLT (3<<0)#define I915_EXEC_VEBOX (4<<0) +#define I915_EXEC_RS (8<<0)/* Used for switching the constants addressing mode on gen4+ RENDER ring. * Gen6+ only supports relative addressing to dynamic state (default) and
Signature · 1 line
1.7.9.5
Re: [PATCH 1/2] drm/i915/hsw: Expose resource streamer control flags
Quoted 11 lines · Abdiel Janulgue
Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 ++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 3 insertions(+)drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0
drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_do_execbuffer(struct drm_device *dev, void *data, · line 869
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2
-0@@ -865,6 +865,8 @@ 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_RS ) + flags |=I915_EXEC_RS ;
I think we should check for the render ring and haswell here and reject the flag everywhere else by returning -EINVAL to userspace. -Daniel
Quoted 22 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0switch (args->flags &I915_EXEC_RING_MASK ) {case I915_EXEC_DEFAULT :include/uapi/drm/i915_drm.h +1
-0@@ -661,6 +661,7 @@ struct drm_i915_gem_execbuffer2 {#define I915_EXEC_BSD (2<<0)#define I915_EXEC_BLT (3<<0)#define I915_EXEC_VEBOX (4<<0) +#define I915_EXEC_RS (8<<0)/* Used for switching the constants addressing mode on gen4+ RENDER ring. * Gen6+ only supports relative addressing to dynamic state (default) and Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2] drm/i915/hsw: Expose resource streamer control flags
In reply to Abdiel JanulgueQuoted 11 lines · Abdiel Janulgue
Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 ++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 3 insertions(+)drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0
drivers/gpu/drm/i915/i915_gem_execbuffer.c i915_gem_do_execbuffer(struct drm_device *dev, void *data, · line 869
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2
-0@@ -865,6 +865,8 @@ 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_RS ) + flags |=I915_EXEC_RS ;
Keep EXEC and DISPATCH as distinct namespaces.
include/uapi/drm/i915_drm.h struct drm_i915_gem_execbuffer2 { · line 664
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem_execbuffer.c +0
-0switch (args->flags &I915_EXEC_RING_MASK ) {case I915_EXEC_DEFAULT :include/uapi/drm/i915_drm.h +1
-0@@ -661,6 +661,7 @@ struct drm_i915_gem_execbuffer2 {#define I915_EXEC_BSD (2<<0)#define I915_EXEC_BLT (3<<0)#define I915_EXEC_VEBOX (4<<0) +#define I915_EXEC_RS (8<<0)
This is in the portion of bits set aside for new rings. Please add it to the end of the of the flags. And call it _RESOURCE_STREAMER to be less ambiguous.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 2/2 drm/i915/hsw: Enable resource streamer bit on MI_BATCH_BUFFER_START
In reply to Abdiel Janulgue--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -254,6 +254,7 @@#define MI_BATCH_NON_SECURE_HSW (1<<13)#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0)#define MI_BATCH_GTT (2<<6)/* aliased with (1<<7) on gen4 */ +#define MI_BATCH_RESOURCE_STREAMER (1<<10)#define MI_SEMAPHORE_MBOX MI_INSTR(0x16, 1)/* gen6+ */ #define MI_SEMAPHORE_GLOBAL_GTT (1<<22)#define MI_SEMAPHORE_UPDATE (1<<21)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -2
@@ -1678,14 +1678,16 @@ hsw_ring_dispatch_execbuffer(struct intel_ring_buffer *ring, unsigned flags) {int ret; +int ring_emit_flags =MI_BATCH_BUFFER_START |MI_BATCH_PPGTT_HSW | + (flags &I915_DISPATCH_SECURE ?0 :MI_BATCH_NON_SECURE_HSW ); ret =intel_ring_begin (ring,2 );if (ret)return ret;intel_ring_emit (ring, -MI_BATCH_BUFFER_START |MI_BATCH_PPGTT_HSW | - (flags &I915_DISPATCH_SECURE ?0 :MI_BATCH_NON_SECURE_HSW )); + ring_emit_flags | + (flags &I915_EXEC_RS ?MI_BATCH_RESOURCE_STREAMER :0 ));/* bit0-7 is the length on GEN6+ */ intel_ring_emit (ring, offset);intel_ring_advance (ring);
Signature · 1 line
1.7.9.5