drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Subsystems (3)
PATCH RESEND 1/3 drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Ensures that the batch buffer is executed by the resource streamer
Testcase: igt/gem_exec_params
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + include/uapi/drm/i915_drm.h | 7 ++++++- 3 files changed, 22 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +15 -0
@@ -1485,6 +1485,21 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,return -EINVAL ; } +if (args->flags &I915_EXEC_RESOURCE_STREAMER ) { +if (!IS_HASWELL (dev) &&INTEL_INFO (dev)->gen <8 ) { +DRM_DEBUG ("RS is only allowed for Haswell, Gen8 " +"and above\n" ); +return -EINVAL ; + } +if (ring->id !=RCS ) { +DRM_DEBUG ("RS is not available on %s\n" , + ring->name); +return -EINVAL ; + } + + dispatch_flags |=I915_DISPATCH_RS ; + } +intel_runtime_pm_get (dev_priv); ret =i915_mutex_lock_interruptible (dev);
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -167,6 +167,7 @@ struct intel_engine_cs { unsigned dispatch_flags);#define I915_DISPATCH_SECURE 0x1#define I915_DISPATCH_PINNED 0x2 +#define I915_DISPATCH_RS 0x4void (*cleanup)(struct intel_engine_cs *ring);/* GEN8 signal/wait table - never trust comments!
include/uapi/drm/i915_drm.h +6 -1
@@ -760,7 +760,12 @@ struct drm_i915_gem_execbuffer2 {#define I915_EXEC_BSD_RING1 (1<<13)#define I915_EXEC_BSD_RING2 (2<<13) -#define __I915_EXEC_UNKNOWN_FLAGS -(1<<15) +/** Tell the kernel that the batchbuffer is processed by +* the resource streamer. +*/ +#define I915_EXEC_RESOURCE_STREAMER (1<<16) + +#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) \
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 2/3 drm/i915: Enable resource streamer bits on MI_BATCH_BUFFER_START
Adds support for executing the resource streamer on BDW and HSW
v2: Add support for Execlists (Minu Mathai <[email protected]>)
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 3 ++- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -356,6 +356,7 @@#define MI_BATCH_BUFFER_START MI_INSTR(0x31, 0)#define MI_BATCH_GTT (2<<6)/* aliased with (1<<7) on gen4 */ #define MI_BATCH_BUFFER_START_GEN8 MI_INSTR(0x31, 1) +#define MI_BATCH_RESOURCE_STREAMER (1<<10)#define MI_PREDICATE_SRC0 (0x2400)#define MI_PREDICATE_SRC1 (0x2408)
drivers/gpu/drm/i915/intel_lrc.c +2 -1
@@ -1172,7 +1172,8 @@ static int gen8_emit_bb_start(struct intel_ringbuffer *ringbuf,return ret;/* FIXME(BDW): Address space and security selectors. */ -intel_logical_ring_emit (ringbuf,MI_BATCH_BUFFER_START_GEN8 | (ppgtt<<8 )); +intel_logical_ring_emit (ringbuf,MI_BATCH_BUFFER_START_GEN8 | (ppgtt<<8 ) | + (I915_DISPATCH_RS ?MI_BATCH_RESOURCE_STREAMER :0 ));intel_logical_ring_emit (ringbuf,lower_32_bits (offset));intel_logical_ring_emit (ringbuf,upper_32_bits (offset));intel_logical_ring_emit (ringbuf,MI_NOOP );
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -2
@@ -2385,7 +2385,8 @@ gen8_ring_dispatch_execbuffer(struct intel_engine_cs *ring,return ret;/* FIXME(BDW): Address space and security selectors. */ -intel_ring_emit (ring,MI_BATCH_BUFFER_START_GEN8 | (ppgtt<<8 )); +intel_ring_emit (ring,MI_BATCH_BUFFER_START_GEN8 | (ppgtt<<8 ) | + (dispatch_flags &I915_DISPATCH_RS ?MI_BATCH_RESOURCE_STREAMER :0 ));intel_ring_emit (ring,lower_32_bits (offset));intel_ring_emit (ring,upper_32_bits (offset));intel_ring_emit (ring,MI_NOOP );
@@ -2408,7 +2409,8 @@ hsw_ring_dispatch_execbuffer(struct intel_engine_cs *ring,intel_ring_emit (ring,MI_BATCH_BUFFER_START | (dispatch_flags &I915_DISPATCH_SECURE ? -0 :MI_BATCH_PPGTT_HSW |MI_BATCH_NON_SECURE_HSW )); +0 :MI_BATCH_PPGTT_HSW |MI_BATCH_NON_SECURE_HSW ) | + (dispatch_flags &I915_DISPATCH_RS ?MI_BATCH_RESOURCE_STREAMER :0 ));/* bit0-7 is the length on GEN6+ */ intel_ring_emit (ring, offset);intel_ring_advance (ring);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 3/3 drm/i915: Enable Resource Streamer state save/restore in HSW
In reply to Abdiel JanulgueAlso clarify comments on context size that the extra state for Resource Streamer is included.
v2: Don't remove the extended save/restore enabled for older
platforms. (Ville)
Use new MI_SET_CONTEXT defines for HSW RS save/restore state instead of extended save/restore. (Daniel)
--- drivers/gpu/drm/i915/i915_gem_context.c | 4 +++- drivers/gpu/drm/i915/i915_reg.h | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +3 -1
@@ -509,7 +509,9 @@ mi_set_context(struct intel_engine_cs *ring, }/* These flags are for resource streamer on HSW+ */ -if (!IS_HASWELL (ring->dev) &&INTEL_INFO (ring->dev)->gen <8 ) +if (IS_HASWELL (ring->dev)) + flags |= (HSW_MI_RS_SAVE_STATE_EN |HSW_MI_RS_RESTORE_STATE_EN ); +else if (INTEL_INFO (ring->dev)->gen <8 ) flags |= (MI_SAVE_EXT_STATE_EN |MI_RESTORE_EXT_STATE_EN );
drivers/gpu/drm/i915/i915_reg.h +4 -1
@@ -316,6 +316,8 @@#define MI_RESTORE_EXT_STATE_EN (1<<2)#define MI_FORCE_RESTORE (1<<1)#define MI_RESTORE_INHIBIT (1<<0) +#define HSW_MI_RS_SAVE_STATE_EN (1<<3) +#define HSW_MI_RS_RESTORE_STATE_EN (1<<2)#define MI_SEMAPHORE_SIGNAL MI_INSTR(0x1b, 0)/* GEN8+ */ #define MI_SEMAPHORE_TARGET (engine) ((engine)<<15)#define MI_SEMAPHORE_WAIT MI_INSTR(0x1c, 2)/* GEN8+ */
@@ -2498,7 +2500,8 @@ enum skl_disp_power_wells {* valid. Now, docs explain in dwords what is in the context object. The full * size is 70720 bytes, however, the power context and execlist context will * never be saved (power context is stored elsewhere, and execlists don't work -* on HSW) - so the final size is 66944 bytes, which rounds to 17 pages. +* on HSW) - so the final size, including the extra state required for the +* Resource Streamer, is 66944 bytes, which rounds to 17 pages. */ #define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE)/* Same as Haswell, but 72064 bytes now. */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH resend 3/3] drm/i915: Enable Resource Streamer state save/restore in HSW
Task id: 6432 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 234/234 234/234 ILK 262/262 262/262 SNB -1 282/282 281/282 IVB 300/300 300/300 BYT 254/254 254/254 BDW 275/275 275/275
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(10)PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx