drm/i915: Enable resource streamer bits on MI_BATCH_BUFFER_START
Subsystems (3)
PATCH RESEND 1/5 drm/i915: Enable resource streamer bits on MI_BATCH_BUFFER_START
Adds support for enabling the resource streamer on the legacy ringbuffer for HSW and GEN8.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 3 files changed, 8 insertions(+), 2 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_ringbuffer.c +6 -2
@@ -2385,7 +2385,9 @@ 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 +2410,9 @@ 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);
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!
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 2/5 drm/i915: Enable Resource Streamer state save/restore on MI_SET_CONTEXT
Also 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) ||INTEL_INFO (ring->dev)->gen >=8 ) + 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
PATCH RESEND 3/5 drm/i915: Enable resource streamer on Execlists
In reply to Abdiel JanulgueGEN8 and above uses Execlists by default instead of the legacy ringbuffer for batch execution. This patch enables the resource streamer bits when required.
Patch is based on the initial work by Minu Mathai <[email protected]> This version also adds the required bits to enable GEN8 Resource Streamer context save and restore for Execlists.
--- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++++-- drivers/gpu/drm/i915/intel_lrc.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +6 -2
@@ -1172,7 +1172,10 @@ 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 ) | + (dispatch_flags &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 );
@@ -1726,7 +1729,8 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o reg_state[CTX_CONTEXT_CONTROL ] =RING_CONTEXT_CONTROL (ring); reg_state[CTX_CONTEXT_CONTROL +1 ] =_MASKED_BIT_ENABLE (CTX_CTRL_INHIBIT_SYN_CTX_SWITCH | -CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT ); +CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT | +CTX_CTRL_RS_CTX_ENABLE ); reg_state[CTX_RING_HEAD ] =RING_HEAD (ring->mmio_base); reg_state[CTX_RING_HEAD +1 ] =0 ; reg_state[CTX_RING_TAIL ] =RING_TAIL (ring->mmio_base);
drivers/gpu/drm/i915/intel_lrc.h +1 -0
@@ -32,6 +32,7 @@#define RING_CONTEXT_CONTROL (ring) ((ring)->mmio_base+0x244)#define CTX_CTRL_INHIBIT_SYN_CTX_SWITCH (1 << 3)#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0) +#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF (ring) ((ring)->mmio_base+0x370)#define RING_CONTEXT_STATUS_PTR (ring) ((ring)->mmio_base+0x3a0)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH resend 3/5] drm/i915: Enable resource streamer on Execlists
Quoted 47 lines · Abdiel Janulgue
GEN8 and above uses Execlists by default instead of the legacy ringbuffer for batch execution. This patch enables the resource streamer bits when required.
Patch is based on the initial work by Minu Mathai <[email protected]> This version also adds the required bits to enable GEN8 Resource Streamer context save and restore for Execlists.
Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 8 ++++++-- drivers/gpu/drm/i915/intel_lrc.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +6
-2@@ -1172,7 +1172,10 @@ 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 ) | + (dispatch_flags &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 );@@ -1726,7 +1729,8 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o reg_state[CTX_CONTEXT_CONTROL ] =RING_CONTEXT_CONTROL (ring); reg_state[CTX_CONTEXT_CONTROL +1 ] =_MASKED_BIT_ENABLE (CTX_CTRL_INHIBIT_SYN_CTX_SWITCH | -CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT ); +CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT | +CTX_CTRL_RS_CTX_ENABLE ); reg_state[CTX_RING_HEAD ] =RING_HEAD (ring->mmio_base); reg_state[CTX_RING_HEAD +1 ] =0 ; reg_state[CTX_RING_TAIL ] =RING_TAIL (ring->mmio_base);drivers/gpu/drm/i915/intel_lrc.h +0
-0
drivers/gpu/drm/i915/intel_lrc.h line 38
Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.h +1
-0@@ -32,6 +32,7 @@#define RING_CONTEXT_CONTROL (ring) ((ring)->mmio_base+0x244)#define CTX_CTRL_INHIBIT_SYN_CTX_SWITCH (1 << 3)#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT (1 << 0) +#define CTX_CTRL_RS_CTX_ENABLE (1 << 1)#define RING_CONTEXT_STATUS_BUF (ring) ((ring)->mmio_base+0x370)#define RING_CONTEXT_STATUS_PTR (ring) ((ring)->mmio_base+0x3a0)
looks good to me,
regards
Arun
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 4/5 drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
In reply to Abdiel JanulgueThis will let userspace know whether Resource Streamer is supported in the kernel.
--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -163,6 +163,9 @@ static int i915_getparam(struct drm_device *dev, void *data,if (!value)return -ENODEV ;break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =1 ; +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
include/uapi/drm/i915_drm.h +1 -0
@@ -350,6 +350,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_REVISION 32#define I915_PARAM_SUBSLICE_TOTAL 33#define I915_PARAM_EU_TOTAL 34 +#define I915_PARAM_HAS_RESOURCE_STREAMER 35 typedef struct drm_i915_getparam { int param;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND v2 4/5 drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
This will let userspace know whether Resource Streamer is supported in the kernel.
v2: Update I915_PARAM_HAS_RESOURCE_STREAMER so it's after
I915_PARAM_HAS_GPU_RESET.
--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -168,6 +168,9 @@ static int i915_getparam(struct drm_device *dev, void *data, i915.reset &&intel_has_gpu_reset (dev);break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =1 ; +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
include/uapi/drm/i915_drm.h +1 -0
@@ -355,6 +355,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_SUBSLICE_TOTAL 33#define I915_PARAM_EU_TOTAL 34#define I915_PARAM_HAS_GPU_RESET 35 +#define I915_PARAM_HAS_RESOURCE_STREAMER 36 typedef struct drm_i915_getparam { int param;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 resend 4/5] drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
Quoted 19 lines · Abdiel Janulgue
This will let userspace know whether Resource Streamer is supported in the kernel.
v2: Update
I915_PARAM_HAS_RESOURCE_STREAMERso it's afterI915_PARAM_HAS_GPU_RESET.Suggested-by Kenneth Graunke <[email protected]>Cc Kenneth Graunke <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+)drivers/gpu/drm/i915/i915_dma.c +0
-0
drivers/gpu/drm/i915/i915_dma.c static int i915_getparam(struct drm_device *dev, void *data, · line 172
Quoted 5 lines
drivers/gpu/drm/i915/i915_dma.c +2
-0@@ -168,6 +168,9 @@ static int i915_getparam(struct drm_device *dev, void *data, i915.reset &&intel_has_gpu_reset (dev);break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =1 ;
Really, we support the resource streamer on all platforms in all configurations? I think you jest!
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND v3 4/5 drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
This will let userspace know whether Resource Streamer is supported in the kernel.
v2: Update I915_PARAM_HAS_RESOURCE_STREAMER so it's after
I915_PARAM_HAS_GPU_RESET.
v3: Only advertise RS support for hardware that supports it.
--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -168,6 +168,9 @@ static int i915_getparam(struct drm_device *dev, void *data, i915.reset &&intel_has_gpu_reset (dev);break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =IS_HASWELL (dev) ||INTEL_INFO (dev)->gen >=8 ; +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
include/uapi/drm/i915_drm.h +1 -0
@@ -355,6 +355,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_SUBSLICE_TOTAL 33#define I915_PARAM_EU_TOTAL 34#define I915_PARAM_HAS_GPU_RESET 35 +#define I915_PARAM_HAS_RESOURCE_STREAMER 36 typedef struct drm_i915_getparam { int param;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 resend 4/5] drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
Quoted 6 lines · Abdiel Janulgue
This will let userspace know whether Resource Streamer is supported in the kernel.
v2: Update
I915_PARAM_HAS_RESOURCE_STREAMERso it's afterI915_PARAM_HAS_GPU_RESET.v3: Only advertise RS support for hardware that supports it.
Ping. Any status on this one?
Quoted 29 lines
Suggested-by Kenneth Graunke <[email protected]>Cc Kenneth Graunke <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+)drivers/gpu/drm/i915/i915_dma.c +3
-0@@ -168,6 +168,9 @@ static int i915_getparam(struct drm_device *dev, void *data, i915.reset &&intel_has_gpu_reset (dev);break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =IS_HASWELL (dev) ||INTEL_INFO (dev)->gen >=8 ; +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;include/uapi/drm/i915_drm.h +0
-0
include/uapi/drm/i915_drm.h typedef struct drm_i915_irq_wait { · line 361
Quoted 7 lines
include/uapi/drm/i915_drm.h +1
-0@@ -355,6 +355,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_SUBSLICE_TOTAL 33#define I915_PARAM_EU_TOTAL 34#define I915_PARAM_HAS_GPU_RESET 35 +#define I915_PARAM_HAS_RESOURCE_STREAMER 36 typedef struct drm_i915_getparam { int param;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 resend 4/5] drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
Quoted 11 lines · Abdiel Janulgue
Quoted 6 lines · Abdiel Janulgue
This will let userspace know whether Resource Streamer is supported in the kernel.
v2: Update
I915_PARAM_HAS_RESOURCE_STREAMERso it's afterI915_PARAM_HAS_GPU_RESET.v3: Only advertise RS support for hardware that supports it.
Ping. Any status on this one?
Chris?
Quoted 34 lines
Quoted 34 lines
Suggested-by Kenneth Graunke <[email protected]>Cc Kenneth Graunke <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ include/uapi/drm/i915_drm.h | 1 + 2 files changed, 4 insertions(+)drivers/gpu/drm/i915/i915_dma.c +3
-0@@ -168,6 +168,9 @@ static int i915_getparam(struct drm_device *dev, void *data, i915.reset &&intel_has_gpu_reset (dev);break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =IS_HASWELL (dev) ||INTEL_INFO (dev)->gen >=8 ; +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;include/uapi/drm/i915_drm.h +1
-0@@ -355,6 +355,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_SUBSLICE_TOTAL 33#define I915_PARAM_EU_TOTAL 34#define I915_PARAM_HAS_GPU_RESET 35 +#define I915_PARAM_HAS_RESOURCE_STREAMER 36
Quoted 8 lines
include/uapi/drm/i915_drm.h typedef struct drm_i915_irq_wait { · line 361
Quoted 3 lines
include/uapi/drm/i915_drm.h +0
-0typedef struct drm_i915_getparam { int param;_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 resend 4/5] drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
Quoted 9 lines · Abdiel Janulgue
Quoted 6 lines · Abdiel Janulgue
Quoted 3 lines · Abdiel Janulgue
This will let userspace know whether Resource Streamer is supported in the kernel.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
v2: Update
I915_PARAM_HAS_RESOURCE_STREAMERso it's afterI915_PARAM_HAS_GPU_RESET.v3: Only advertise RS support for hardware that supports it.
Ping. Any status on this one?
Chris?
Run it through indent, and I'm happy with it. I think we should make it a HAS_RESOURCE_STREAMER() macro so we can share the definition between here and execbuf validation, but that's icing on the cake. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/5 drm/i915: add I915_PARAM_HAS_RESOURCE_STREAMER to i915_getparam
This will let userspace know whether Resource Streamer is supported in the kernel.
v2: Update I915_PARAM_HAS_RESOURCE_STREAMER so it's after
I915_PARAM_HAS_GPU_RESET.
v3: Only advertise RS support for hardware that supports it.
v4: Add HAS_RESOURCE_STREAMER() macro (Chris)
--- drivers/gpu/drm/i915/i915_dma.c | 3 +++ drivers/gpu/drm/i915/i915_drv.h | 3 +++ include/uapi/drm/i915_drm.h | 1 + 3 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_dma.c +3 -0
@@ -167,6 +167,9 @@ static int i915_getparam(struct drm_device *dev, void *data, value = i915.enable_hangcheck &&intel_has_gpu_reset (dev);break ; +case I915_PARAM_HAS_RESOURCE_STREAMER : + value =HAS_RESOURCE_STREAMER (dev); +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -2520,6 +2520,9 @@ struct drm_i915_cmd_table {#define HAS_CSR (dev) (IS_SKYLAKE(dev)) +#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ + INTEL_INFO(dev)->gen >= 8) +#define INTEL_PCH_DEVICE_ID_MASK 0xff00#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00#define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00
include/uapi/drm/i915_drm.h +1 -0
@@ -355,6 +355,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_SUBSLICE_TOTAL 33#define I915_PARAM_EU_TOTAL 34#define I915_PARAM_HAS_GPU_RESET 35 +#define I915_PARAM_HAS_RESOURCE_STREAMER 36 typedef struct drm_i915_getparam { int param;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH RESEND 5/5 drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
In reply to Abdiel JanulgueEnsures that the batch buffer is executed by the resource streamer
v2: Don't skip 1<<15 for the exec flags (Jani Nikula)
Testcase: igt/gem_exec_params
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 ++++++++++++++ include/uapi/drm/i915_drm.h | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +14 -0
@@ -1485,6 +1485,20 @@ 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);
include/uapi/drm/i915_drm.h +6 -1
@@ -761,7 +761,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<<15) + +#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 v3 5/5 drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Ensures that the batch buffer is executed by the resource streamer
v2: Don't skip 1<<15 for the exec flags (Jani Nikula)
v3: Use HAS_RESOURCE_STREAMER macro for execbuf validation (Chris Wilson)
Testcase: igt/gem_exec_params
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 ++++++++++++++ include/uapi/drm/i915_drm.h | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +14 -0
@@ -1490,6 +1490,20 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,return -EINVAL ; } +if (args->flags &I915_EXEC_RESOURCE_STREAMER ) { +if (!HAS_RESOURCE_STREAMER (dev)) { +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);
include/uapi/drm/i915_drm.h +6 -1
@@ -766,7 +766,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<<15) + +#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
Re: [PATCH v3 5/5] drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Quoted 9 lines · Abdiel Janulgue
Ensures that the batch buffer is executed by the resource streamer
v2: Don't skip 1<<15 for the exec flags (Jani Nikula)
v3: UseHAS_RESOURCE_STREAMERmacro for execbuf validation (Chris Wilson)Testcase: igt/gem_exec_params
Cc Jani Nikula <[email protected]>Reviewed-by Chris Wilson <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>
This no longer applies (unrecognised base). Honestly, I would prefer 4&5 squashed together, or 4 after 5 so that we do not declare HAS_RESOURCE_STREAMER before we accept the RS execbuf.
Minor bit of patch reordering, but the code in 4 looks ok, so
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 5/5] drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Quoted 11 lines · Chris Wilson
Quoted 9 lines · Abdiel Janulgue
Ensures that the batch buffer is executed by the resource streamer
v2: Don't skip 1<<15 for the exec flags (Jani Nikula)
v3: UseHAS_RESOURCE_STREAMERmacro for execbuf validation (Chris Wilson)Testcase: igt/gem_exec_params
Cc Jani Nikula <[email protected]>Reviewed-by Chris Wilson <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>
Quoted 6 lines
This no longer applies (unrecognised base). Honestly, I would prefer 4&5 squashed together, or 4 after 5 so that we do not declare
HAS_RESOURCE_STREAMERbefore we accept the RS execbuf.Minor bit of patch reordering, but the code in 4 looks ok, so
Reviewed-by Chris Wilson <[email protected]> # for 4/5
Yeah I just reordered 5 to go before 4. Series merged to dinq, thanks. Abdiel can you pls push the corresponding igts (or ask Thomas to do it for you)?
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 5/5] drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Quoted 16 lines · Daniel Vetter
Quoted 15 lines · Chris Wilson
Quoted 9 lines · Abdiel Janulgue
Ensures that the batch buffer is executed by the resource streamer
v2: Don't skip 1<<15 for the exec flags (Jani Nikula)
v3: UseHAS_RESOURCE_STREAMERmacro for execbuf validation (Chris Wilson)Testcase: igt/gem_exec_params
Cc Jani Nikula <[email protected]>Reviewed-by Chris Wilson <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>This no longer applies (unrecognised base). Honestly, I would prefer 4&5 squashed together, or 4 after 5 so that we do not declare
HAS_RESOURCE_STREAMERbefore we accept the RS execbuf.
Quoted 6 lines
Quoted 2 lines
Minor bit of patch reordering, but the code in 4 looks ok, so
Reviewed-by Chris Wilson <[email protected]> # for 4/5Yeah I just reordered 5 to go before 4. Series merged to dinq, thanks. Abdiel can you pls push the corresponding igts (or ask Thomas to do it for you)?
Thank you! I don't have commit rights in igt, but here is the patch:
http://lists.freedesktop.org/archives/intel-gfx/2015-June/068799.html
-Abdiel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 5/5] drm/i915: Expose I915_EXEC_RESOURCE_STREAMER flag
Quoted 22 lines · Abdiel Janulgue
Quoted 19 lines · Daniel Vetter
Quoted 17 lines · Chris Wilson
Quoted 9 lines · Abdiel Janulgue
Ensures that the batch buffer is executed by the resource streamer
v2: Don't skip 1<<15 for the exec flags (Jani Nikula)
v3: UseHAS_RESOURCE_STREAMERmacro for execbuf validation (Chris Wilson)Testcase: igt/gem_exec_params
Cc Jani Nikula <[email protected]>Reviewed-by Chris Wilson <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>This no longer applies (unrecognised base). Honestly, I would prefer 4&5 squashed together, or 4 after 5 so that we do not declare
HAS_RESOURCE_STREAMERbefore we accept the RS execbuf.Minor bit of patch reordering, but the code in 4 looks ok, so
Reviewed-by Chris Wilson <[email protected]> # for 4/5
Quoted 6 lines
Quoted 3 lines
Yeah I just reordered 5 to go before 4. Series merged to dinq, thanks. Abdiel can you pls push the corresponding igts (or ask Thomas to do it for you)?
Thank you! I don't have commit rights in igt, but here is the patch:
http://lists.freedesktop.org/archives/intel-gfx/2015-June/068799.html
Pushed, thanks.
Quoted 2 lines
-Abdiel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Abdiel Janulgue
Adds support for enabling the resource streamer on the legacy ringbuffer for HSW and GEN8.
Reviewed-by Chris Wilson <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>
I've run a few examples with RS-enabled mesa and kernel, and nothing fell over. I didn't see any significant changes on a hsw-gt2 either with the current patches.
As far as the kernel goes for feature enablement, it looks ready. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx