drm/i915/gen9: Set value of Indirect Context Offset based on gen version
Subsystems (2)
PATCH 1/1 drm/i915/gen9: Set value of Indirect Context Offset based on gen version
The cache line offset for the Indirect CS context (0x21C8) varies from gen to gen.
--- drivers/gpu/drm/i915/intel_lrc.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +19 -2
@@ -226,7 +226,8 @@ enum {FAULT_AND_CONTINUE /* Unsupported */ };#define GEN8_CTX_ID_SHIFT 32 -#define CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26static int intel_lr_context_pin (struct drm_i915_gem_request *rq); static void lrc_setup_hardware_status_page(struct intel_engine_cs *ring,
@@ -2330,13 +2331,29 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_oif (ring->wa_ctx.obj) {struct i915_ctx_workarounds *wa_ctx = &ring->wa_ctx;uint32_t ggtt_offset =i915_gem_obj_ggtt_offset (wa_ctx->obj); +uint32_t indirect_ctx_offset; reg_state[CTX_RCS_INDIRECT_CTX +1 ] = (ggtt_offset + wa_ctx->indirect_ctx.offset *sizeof (uint32_t )) | (wa_ctx->indirect_ctx.size /CACHELINE_DWORDS ); +switch (INTEL_INFO (ring->dev)->gen) { +default : +DRM_ERROR ("Unknown indirect ctx offset for GEN%d\n" , +INTEL_INFO (ring->dev)->gen); +/* fall through */ +case 9 : + indirect_ctx_offset = +GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; +case 8 : + indirect_ctx_offset = +GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; + } + reg_state[CTX_RCS_INDIRECT_CTX_OFFSET +1 ] = -CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT <<6 ; + indirect_ctx_offset <<6 ; reg_state[CTX_BB_PER_CTX_PTR +1 ] = (ggtt_offset + wa_ctx->per_ctx.offset * sizeof(uint32_t)) |
Signature · 6 lines
2.7.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Michel Thierry
The cache line offset for the Indirect CS context (
0x21C8) varies from gen to gen.Cc Arun Siluvery <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +3
-1@@ -226,7 +226,8 @@ enum {FAULT_AND_CONTINUE /* Unsupported */ };#define GEN8_CTX_ID_SHIFT 32 -#define CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26static int intel_lr_context_pin (struct drm_i915_gem_request *rq); static void lrc_setup_hardware_status_page(struct intel_engine_cs *ring,@@ -2330,13 +2331,29 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_oif (ring->wa_ctx.obj) {struct i915_ctx_workarounds *wa_ctx = &ring->wa_ctx;uint32_t ggtt_offset =i915_gem_obj_ggtt_offset (wa_ctx->obj); +uint32_t indirect_ctx_offset;
drivers/gpu/drm/i915/intel_lrc.c populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o · line 2344
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +5
-0reg_state[CTX_RCS_INDIRECT_CTX +1 ] = (ggtt_offset + wa_ctx->indirect_ctx.offset *sizeof (uint32_t )) | (wa_ctx->indirect_ctx.size /CACHELINE_DWORDS ); +switch (INTEL_INFO (ring->dev)->gen) { +default : +DRM_ERROR ("Unknown indirect ctx offset for GEN%d\n" , +INTEL_INFO (ring->dev)->gen); +/* fall through */
MISSING_CASE()
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/gen9: Set value of Indirect Context Offset based on gen version
In reply to Michel ThierryThe cache line offset for the Indirect CS context (0x21C8) varies from gen to gen.
v2: Move it into a function (Arun), use MISSING_CASE (Chris)
--- drivers/gpu/drm/i915/intel_lrc.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +24 -2
@@ -226,7 +226,8 @@ enum {FAULT_AND_CONTINUE /* Unsupported */ };#define GEN8_CTX_ID_SHIFT 32 -#define CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26static int intel_lr_context_pin (struct drm_i915_gem_request *rq); static void lrc_setup_hardware_status_page(struct intel_engine_cs *ring,
@@ -2264,6 +2265,27 @@ make_rpcs(struct drm_device *dev)return rpcs; } +static u32 intel_lr_indirect_ctx_offset (struct intel_engine_cs *ring) +{ +u32 indirect_ctx_offset; + +switch (INTEL_INFO (ring->dev)->gen) { +default : +MISSING_CASE (INTEL_INFO (ring->dev)->gen); +/* fall through */ +case 9 : + indirect_ctx_offset = +GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; +case 8 : + indirect_ctx_offset = +GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; + } + +return indirect_ctx_offset; +} +static int populate_lr_context (struct intel_context *ctx,struct drm_i915_gem_object *ctx_obj,struct intel_engine_cs *ring,struct intel_ringbuffer *ringbuf)
@@ -2336,7 +2358,7 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o (wa_ctx->indirect_ctx.size /CACHELINE_DWORDS ); reg_state[CTX_RCS_INDIRECT_CTX_OFFSET +1 ] = -CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT <<6 ; +intel_lr_indirect_ctx_offset (ring) <<6 ; reg_state[CTX_BB_PER_CTX_PTR +1 ] = (ggtt_offset + wa_ctx->per_ctx.offset * sizeof(uint32_t)) |
Signature · 6 lines
2.7.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 56 lines · Michel Thierry
The cache line offset for the Indirect CS context (
0x21C8) varies from gen to gen.v2: Move it into a function (Arun), use
MISSING_CASE(Chris)Cc Arun Siluvery <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +23
-1@@ -226,7 +226,8 @@ enum {FAULT_AND_CONTINUE /* Unsupported */ };#define GEN8_CTX_ID_SHIFT 32 -#define CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26static int intel_lr_context_pin (struct drm_i915_gem_request *rq); static void lrc_setup_hardware_status_page(struct intel_engine_cs *ring,@@ -2264,6 +2265,27 @@ make_rpcs(struct drm_device *dev)return rpcs; } +static u32 intel_lr_indirect_ctx_offset (struct intel_engine_cs *ring) +{ +u32 indirect_ctx_offset; + +switch (INTEL_INFO (ring->dev)->gen) { +default : +MISSING_CASE (INTEL_INFO (ring->dev)->gen); +/* fall through */ +case 9 : + indirect_ctx_offset = +GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; +case 8 : + indirect_ctx_offset = +GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; + } + +return indirect_ctx_offset; +} +static int populate_lr_context (struct intel_context *ctx,struct drm_i915_gem_object *ctx_obj,struct intel_engine_cs *ring,struct intel_ringbuffer *ringbuf)
drivers/gpu/drm/i915/intel_lrc.c populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o · line 2364
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -2336,7 +2358,7 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o (wa_ctx->indirect_ctx.size /CACHELINE_DWORDS ); reg_state[CTX_RCS_INDIRECT_CTX_OFFSET +1 ] = -CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT <<6 ; +intel_lr_indirect_ctx_offset (ring) <<6 ; reg_state[CTX_BB_PER_CTX_PTR +1 ] = (ggtt_offset + wa_ctx->per_ctx.offset * sizeof(uint32_t)) |
Agrees with spec, looks good to me,
regards
Arun
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/gen9: Set value of Indirect Context Offset based on gen version (rev2)
In reply to Michel Thierry== Summary ==
== Summary ==
Series 3629v2 drm/i915/gen9: Set value of Indirect Context Offset based on gen version
2016-02-19T14:57:22.102741 http://patchwork.freedesktop.org/api/1.0/series/3629/revisions/2/mbox/
Applying: drm/i915/gen9: Set value of Indirect Context Offset based on gen version Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 drm/i915/gen9: Set value of Indirect Context Offset based on gen version
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/gen9: Set value of Indirect Context Offset based on gen version
In reply to Michel ThierryThe cache line offset for the Indirect CS context (0x21C8) varies from gen to gen.
v2: Move it into a function (Arun), use MISSING_CASE (Chris)
v3: Rebased (catched by ci bat)
--- drivers/gpu/drm/i915/intel_lrc.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +24 -2
@@ -223,7 +223,8 @@ enum { FAULT_AND_CONTINUE /* Unsupported */ };#define GEN8_CTX_ID_SHIFT 32 -#define CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17 +#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26static int intel_lr_context_pin (struct intel_context *ctx,struct intel_engine_cs *engine);
@@ -2317,6 +2318,27 @@ make_rpcs(struct drm_device *dev)return rpcs; } +static u32 intel_lr_indirect_ctx_offset (struct intel_engine_cs *ring) +{ +u32 indirect_ctx_offset; + +switch (INTEL_INFO (ring->dev)->gen) { +default : +MISSING_CASE (INTEL_INFO (ring->dev)->gen); +/* fall through */ +case 9 : + indirect_ctx_offset = +GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; +case 8 : + indirect_ctx_offset = +GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT ; +break ; + } + +return indirect_ctx_offset; +} +static int populate_lr_context (struct intel_context *ctx,struct drm_i915_gem_object *ctx_obj,struct intel_engine_cs *ring,struct intel_ringbuffer *ringbuf)
@@ -2389,7 +2411,7 @@ populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_o (wa_ctx->indirect_ctx.size /CACHELINE_DWORDS ); reg_state[CTX_RCS_INDIRECT_CTX_OFFSET +1 ] = -CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT <<6 ; +intel_lr_indirect_ctx_offset (ring) <<6 ; reg_state[CTX_BB_PER_CTX_PTR +1 ] = (ggtt_offset + wa_ctx->per_ctx.offset * sizeof(uint32_t)) |
Signature · 6 lines
2.7.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx