drm/i915: Change SRM, LRM instructions to use correct length
Subsystems (2)
PATCH 1/1 drm/i915: Change SRM, LRM instructions to use correct length
MI_STORE_REGISTER_MEM, MI_LOAD_REGISTER_MEM instructions are not really variable length instructions unlike MI_LOAD_REGISTER_IMM where it expects (reg, addr) pairs so use fixed length for these instructions.
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_cmd_parser.c +4 -4
@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = { CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ), CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W, .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ), - CMD( MI_STORE_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0, .mask = MI_GLOBAL_GTT, .expected = 0, }}, ), - CMD( MI_LOAD_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0,
@@ -1021,7 +1021,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr ==OACONTROL ) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to OACONTROL\n" );return false; }
@@ -1035,7 +1035,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false;
drivers/gpu/drm/i915/i915_reg.h +4 -4
@@ -342,8 +342,8 @@*/ #define MI_LOAD_REGISTER_IMM (x) MI_INSTR(0x22, 2*(x)-1)#define MI_LRI_FORCE_POSTED (1<<12) -#define MI_STORE_REGISTER_MEM (x) MI_INSTR(0x24, 2*(x)-1) -#define MI_STORE_REGISTER_MEM_GEN8 (x) MI_INSTR(0x24, 3*(x)-1) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)#define MI_SRM_LRM_GLOBAL_GTT (1<<22)#define MI_FLUSH_DW MI_INSTR(0x26, 1)/* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21)
@@ -354,8 +354,8 @@#define MI_INVALIDATE_BSD (1<<7)#define MI_FLUSH_DW_USE_GTT (1<<2)#define MI_FLUSH_DW_USE_PPGTT (0<<2) -#define MI_LOAD_REGISTER_MEM (x) MI_INSTR(0x29, 2*(x)-1) -#define MI_LOAD_REGISTER_MEM_GEN8 (x) MI_INSTR(0x29, 3*(x)-1) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)#define MI_BATCH_NON_SECURE (1)/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -11053,10 +11053,10 @@ static int intel_gen7_queue_flip(struct drm_device *dev,DERRMR_PIPEB_PRI_FLIP_DONE | DERRMR_PIPEC_PRI_FLIP_DONE));if (IS_GEN8 (dev)) -intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT );else -intel_ring_emit (ring,MI_STORE_REGISTER_MEM (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM |MI_SRM_LRM_GLOBAL_GTT );intel_ring_emit (ring,DERRMR );intel_ring_emit (ring, ring->scratch.gtt_offset +256 );
drivers/gpu/drm/i915/intel_lrc.c +2 -2
@@ -1097,7 +1097,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, {uint32_t l3sqc4_flush = (0x40400000 |GEN8_LQSC_FLUSH_COHERENT_LINES ); -wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );
@@ -1115,7 +1115,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,wa_ctx_emit (batch, index,0 );wa_ctx_emit (batch, index,0 ); -wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Arun Siluvery
MI_STORE_REGISTER_MEM,MI_LOAD_REGISTER_MEMinstructions are not really variable length instructions unlikeMI_LOAD_REGISTER_IMMwhere it expects (reg, addr) pairs so use fixed length for these instructions.Cc Dave Gordon <[email protected]>Signed-off-by Arun Siluvery <[email protected]>---
ping? to any reviewers?
regards
Arun
Quoted 103 lines
drivers/gpu/drm/i915/i915_cmd_parser.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/i915_cmd_parser.c +4
-4@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = { CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ), CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W, .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ), - CMD( MI_STORE_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0, .mask = MI_GLOBAL_GTT, .expected = 0, }}, ), - CMD( MI_LOAD_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0,@@ -1021,7 +1021,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr ==OACONTROL ) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to OACONTROL\n" );return false; }@@ -1035,7 +1035,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false;drivers/gpu/drm/i915/i915_reg.h +4
-4@@ -342,8 +342,8 @@*/ #define MI_LOAD_REGISTER_IMM (x) MI_INSTR(0x22, 2*(x)-1)#define MI_LRI_FORCE_POSTED (1<<12) -#define MI_STORE_REGISTER_MEM (x) MI_INSTR(0x24, 2*(x)-1) -#define MI_STORE_REGISTER_MEM_GEN8 (x) MI_INSTR(0x24, 3*(x)-1) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)#define MI_SRM_LRM_GLOBAL_GTT (1<<22)#define MI_FLUSH_DW MI_INSTR(0x26, 1)/* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21)@@ -354,8 +354,8 @@#define MI_INVALIDATE_BSD (1<<7)#define MI_FLUSH_DW_USE_GTT (1<<2)#define MI_FLUSH_DW_USE_PPGTT (0<<2) -#define MI_LOAD_REGISTER_MEM (x) MI_INSTR(0x29, 2*(x)-1) -#define MI_LOAD_REGISTER_MEM_GEN8 (x) MI_INSTR(0x29, 3*(x)-1) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)#define MI_BATCH_NON_SECURE (1)/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ drivers/gpu/drm/i915/intel_display.c +2
-2@@ -11053,10 +11053,10 @@ static int intel_gen7_queue_flip(struct drm_device *dev,DERRMR_PIPEB_PRI_FLIP_DONE | DERRMR_PIPEC_PRI_FLIP_DONE));if (IS_GEN8 (dev)) -intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT );else -intel_ring_emit (ring,MI_STORE_REGISTER_MEM (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM |MI_SRM_LRM_GLOBAL_GTT );intel_ring_emit (ring,DERRMR );intel_ring_emit (ring, ring->scratch.gtt_offset +256 );drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -1097,7 +1097,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, {uint32_t l3sqc4_flush = (0x40400000 |GEN8_LQSC_FLUSH_COHERENT_LINES ); -wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );
drivers/gpu/drm/i915/intel_lrc.c static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, · line 1121
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -1115,7 +1115,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,wa_ctx_emit (batch, index,0 );wa_ctx_emit (batch, index,0 ); -wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Arun
Quoted 7 lines · Arun Siluvery
MI_STORE_REGISTER_MEM,MI_LOAD_REGISTER_MEMinstructions are not really variable length instructions unlikeMI_LOAD_REGISTER_IMMwhere it expects (reg, addr) pairs so use fixed length for these instructions.Cc Dave Gordon <[email protected]>Signed-off-by Arun Siluvery <[email protected]>---
ping? to any reviewers?
Needs rebasing due to changes in intel_lrc.c
-Mika
Quoted 108 lines
regards
ArunQuoted 105 lines
drivers/gpu/drm/i915/i915_cmd_parser.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/i915_cmd_parser.c +4
-4@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = { CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ), CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W, .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ), - CMD( MI_STORE_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0, .mask = MI_GLOBAL_GTT, .expected = 0, }}, ), - CMD( MI_LOAD_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0,@@ -1021,7 +1021,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr ==OACONTROL ) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to OACONTROL\n" );return false; }@@ -1035,7 +1035,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false;drivers/gpu/drm/i915/i915_reg.h +4
-4@@ -342,8 +342,8 @@*/ #define MI_LOAD_REGISTER_IMM (x) MI_INSTR(0x22, 2*(x)-1)#define MI_LRI_FORCE_POSTED (1<<12) -#define MI_STORE_REGISTER_MEM (x) MI_INSTR(0x24, 2*(x)-1) -#define MI_STORE_REGISTER_MEM_GEN8 (x) MI_INSTR(0x24, 3*(x)-1) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)#define MI_SRM_LRM_GLOBAL_GTT (1<<22)#define MI_FLUSH_DW MI_INSTR(0x26, 1)/* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21)@@ -354,8 +354,8 @@#define MI_INVALIDATE_BSD (1<<7)#define MI_FLUSH_DW_USE_GTT (1<<2)#define MI_FLUSH_DW_USE_PPGTT (0<<2) -#define MI_LOAD_REGISTER_MEM (x) MI_INSTR(0x29, 2*(x)-1) -#define MI_LOAD_REGISTER_MEM_GEN8 (x) MI_INSTR(0x29, 3*(x)-1) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)#define MI_BATCH_NON_SECURE (1)/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ drivers/gpu/drm/i915/intel_display.c +2
-2@@ -11053,10 +11053,10 @@ static int intel_gen7_queue_flip(struct drm_device *dev,DERRMR_PIPEB_PRI_FLIP_DONE | DERRMR_PIPEC_PRI_FLIP_DONE));if (IS_GEN8 (dev)) -intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT );else -intel_ring_emit (ring,MI_STORE_REGISTER_MEM (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM |MI_SRM_LRM_GLOBAL_GTT );intel_ring_emit (ring,DERRMR );intel_ring_emit (ring, ring->scratch.gtt_offset +256 );drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -1097,7 +1097,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, {uint32_t l3sqc4_flush = (0x40400000 |GEN8_LQSC_FLUSH_COHERENT_LINES ); -wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );@@ -1115,7 +1115,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,wa_ctx_emit (batch, index,0 );wa_ctx_emit (batch, index,0 );
Quoted 11 lines
drivers/gpu/drm/i915/intel_lrc.c static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, · line 1121
Quoted 6 lines
drivers/gpu/drm/i915/intel_lrc.c +1
-1-wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );_______________________________________________
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
PATCH v2 1/1 drm/i915: Change SRM, LRM instructions to use correct length
In reply to Arun SiluveryMI_STORE_REGISTER_MEM, MI_LOAD_REGISTER_MEM instructions are not really variable length instructions unlike MI_LOAD_REGISTER_IMM where it expects (reg, addr) pairs so use fixed length for these instructions.
v2: rebase
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_cmd_parser.c +4 -4
@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = { CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ), CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W, .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ), - CMD( MI_STORE_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0, .mask = MI_GLOBAL_GTT, .expected = 0, }}, ), - CMD( MI_LOAD_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0,
@@ -1021,7 +1021,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr ==OACONTROL ) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to OACONTROL\n" );return false; }
@@ -1035,7 +1035,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false;
drivers/gpu/drm/i915/i915_reg.h +4 -4
@@ -343,8 +343,8 @@*/ #define MI_LOAD_REGISTER_IMM (x) MI_INSTR(0x22, 2*(x)-1)#define MI_LRI_FORCE_POSTED (1<<12) -#define MI_STORE_REGISTER_MEM (x) MI_INSTR(0x24, 2*(x)-1) -#define MI_STORE_REGISTER_MEM_GEN8 (x) MI_INSTR(0x24, 3*(x)-1) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)#define MI_SRM_LRM_GLOBAL_GTT (1<<22)#define MI_FLUSH_DW MI_INSTR(0x26, 1)/* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21)
@@ -355,8 +355,8 @@#define MI_INVALIDATE_BSD (1<<7)#define MI_FLUSH_DW_USE_GTT (1<<2)#define MI_FLUSH_DW_USE_PPGTT (0<<2) -#define MI_LOAD_REGISTER_MEM (x) MI_INSTR(0x29, 2*(x)-1) -#define MI_LOAD_REGISTER_MEM_GEN8 (x) MI_INSTR(0x29, 3*(x)-1) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)#define MI_BATCH_NON_SECURE (1)/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -11123,10 +11123,10 @@ static int intel_gen7_queue_flip(struct drm_device *dev,DERRMR_PIPEB_PRI_FLIP_DONE | DERRMR_PIPEC_PRI_FLIP_DONE));if (IS_GEN8 (dev)) -intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT );else -intel_ring_emit (ring,MI_STORE_REGISTER_MEM (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM |MI_SRM_LRM_GLOBAL_GTT );intel_ring_emit (ring,DERRMR );intel_ring_emit (ring, ring->scratch.gtt_offset +256 );
drivers/gpu/drm/i915/intel_lrc.c +2 -2
@@ -1106,7 +1106,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,if (IS_SKYLAKE (ring->dev) &&INTEL_REVID (ring->dev) <=SKL_REVID_E0 ) l3sqc4_flush |=GEN8_LQSC_RO_PERF_DIS ; -wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );
@@ -1124,7 +1124,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,wa_ctx_emit (batch, index,0 );wa_ctx_emit (batch, index,0 ); -wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 7001 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -1 302/302 301/302
SNB 315/315 315/315 IVB 336/336 336/336
BYT -1 283/283 282/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@wf_vblank-vs-modeset-interruptible PASS(1) DMESG_WARN(1)
*BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
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
Quoted 70 lines · Arun Siluvery
MI_STORE_REGISTER_MEM,MI_LOAD_REGISTER_MEMinstructions are not really variable length instructions unlikeMI_LOAD_REGISTER_IMMwhere it expects (reg, addr) pairs so use fixed length for these instructions.v2: rebase
Cc Dave Gordon <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_cmd_parser.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/i915_cmd_parser.c +4
-4@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = { CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ), CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W, .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ), - CMD( MI_STORE_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0, .mask = MI_GLOBAL_GTT, .expected = 0, }}, ), - CMD( MI_LOAD_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0,@@ -1021,7 +1021,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr ==OACONTROL ) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to OACONTROL\n" );return false; }@@ -1035,7 +1035,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false;drivers/gpu/drm/i915/i915_reg.h +2
-2@@ -343,8 +343,8 @@*/ #define MI_LOAD_REGISTER_IMM (x) MI_INSTR(0x22, 2*(x)-1)#define MI_LRI_FORCE_POSTED (1<<12) -#define MI_STORE_REGISTER_MEM (x) MI_INSTR(0x24, 2*(x)-1) -#define MI_STORE_REGISTER_MEM_GEN8 (x) MI_INSTR(0x24, 3*(x)-1) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)#define MI_SRM_LRM_GLOBAL_GTT (1<<22)#define MI_FLUSH_DW MI_INSTR(0x26, 1)/* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21)
drivers/gpu/drm/i915/i915_reg.h line 359
Quoted 7 lines
drivers/gpu/drm/i915/i915_reg.h +2
-2@@ -355,8 +355,8 @@#define MI_INVALIDATE_BSD (1<<7)#define MI_FLUSH_DW_USE_GTT (1<<2)#define MI_FLUSH_DW_USE_PPGTT (0<<2) -#define MI_LOAD_REGISTER_MEM (x) MI_INSTR(0x29, 2*(x)-1) -#define MI_LOAD_REGISTER_MEM_GEN8 (x) MI_INSTR(0x29, 3*(x)-1) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)
Minor nitpick: checkpatch complained about there being space before tab in here.
Quoted 44 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)#define MI_BATCH_NON_SECURE (1)/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ drivers/gpu/drm/i915/intel_display.c +2
-2@@ -11123,10 +11123,10 @@ static int intel_gen7_queue_flip(struct drm_device *dev,DERRMR_PIPEB_PRI_FLIP_DONE | DERRMR_PIPEC_PRI_FLIP_DONE));if (IS_GEN8 (dev)) -intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT );else -intel_ring_emit (ring,MI_STORE_REGISTER_MEM (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM |MI_SRM_LRM_GLOBAL_GTT );intel_ring_emit (ring,DERRMR );intel_ring_emit (ring, ring->scratch.gtt_offset +256 );drivers/gpu/drm/i915/intel_lrc.c +2
-2@@ -1106,7 +1106,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,if (IS_SKYLAKE (ring->dev) &&INTEL_REVID (ring->dev) <=SKL_REVID_E0 ) l3sqc4_flush |=GEN8_LQSC_RO_PERF_DIS ; -wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );@@ -1124,7 +1124,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,wa_ctx_emit (batch, index,0 );wa_ctx_emit (batch, index,0 ); -wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 74 lines · Mika Kuoppala
Quoted 72 lines · Arun Siluvery
MI_STORE_REGISTER_MEM,MI_LOAD_REGISTER_MEMinstructions are not really variable length instructions unlikeMI_LOAD_REGISTER_IMMwhere it expects (reg, addr) pairs so use fixed length for these instructions.v2: rebase
Cc Dave Gordon <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_cmd_parser.c | 8 ++++---- drivers/gpu/drm/i915/i915_reg.h | 8 ++++---- drivers/gpu/drm/i915/intel_display.c | 4 ++-- drivers/gpu/drm/i915/intel_lrc.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/i915_cmd_parser.c +4
-4@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = { CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ), CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W, .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ), - CMD( MI_STORE_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0, .mask = MI_GLOBAL_GTT, .expected = 0, }}, ), - CMD( MI_LOAD_REGISTER_MEM(1), SMI, !F, 0xFF, W | B, + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B, .reg = { .offset = 1, .mask = 0x007FFFFC }, .bits = {{ .offset = 0,@@ -1021,7 +1021,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr ==OACONTROL ) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to OACONTROL\n" );return false; }@@ -1035,7 +1035,7 @@ static bool check_cmd(const struct intel_engine_cs *ring,* allowed mask/value pair given in the whitelist entry. */ if (reg->mask) { -if (desc->cmd.value ==MI_LOAD_REGISTER_MEM (1 )) { +if (desc->cmd.value ==MI_LOAD_REGISTER_MEM ) {DRM_DEBUG_DRIVER ("CMD: Rejected LRM to masked register 0x%08X\n" , reg_addr);return false;drivers/gpu/drm/i915/i915_reg.h +2
-2@@ -343,8 +343,8 @@*/ #define MI_LOAD_REGISTER_IMM (x) MI_INSTR(0x22, 2*(x)-1)#define MI_LRI_FORCE_POSTED (1<<12) -#define MI_STORE_REGISTER_MEM (x) MI_INSTR(0x24, 2*(x)-1) -#define MI_STORE_REGISTER_MEM_GEN8 (x) MI_INSTR(0x24, 3*(x)-1) +#define MI_STORE_REGISTER_MEM MI_INSTR(0x24, 1) +#define MI_STORE_REGISTER_MEM_GEN8 MI_INSTR(0x24, 2)#define MI_SRM_LRM_GLOBAL_GTT (1<<22)#define MI_FLUSH_DW MI_INSTR(0x26, 1)/* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21)@@ -355,8 +355,8 @@#define MI_INVALIDATE_BSD (1<<7)#define MI_FLUSH_DW_USE_GTT (1<<2)
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h line 359
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-2#define MI_FLUSH_DW_USE_PPGTT (0<<2) -#define MI_LOAD_REGISTER_MEM (x) MI_INSTR(0x29, 2*(x)-1) -#define MI_LOAD_REGISTER_MEM_GEN8 (x) MI_INSTR(0x29, 3*(x)-1) +#define MI_LOAD_REGISTER_MEM MI_INSTR(0x29, 1) +#define MI_LOAD_REGISTER_MEM_GEN8 MI_INSTR(0x29, 2)Minor nitpick: checkpatch complained about there being space before tab in here.
Fixed and applied. Aside: i915_cmd_parser.c makes checkpatch fairly unhappy, might be worth fixing.
-Daniel
Quoted 50 lines
Reviewed-by Mika Kuoppala <[email protected]>Quoted 44 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define MI_BATCH_BUFFER MI_INSTR(0x30, 1)#define MI_BATCH_NON_SECURE (1)/* for snb/ivb/vlv this also means "batch in ppgtt" when ppgtt is enabled. */ drivers/gpu/drm/i915/intel_display.c +2
-2@@ -11123,10 +11123,10 @@ static int intel_gen7_queue_flip(struct drm_device *dev,DERRMR_PIPEB_PRI_FLIP_DONE | DERRMR_PIPEC_PRI_FLIP_DONE));if (IS_GEN8 (dev)) -intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT );else -intel_ring_emit (ring,MI_STORE_REGISTER_MEM (1 ) | +intel_ring_emit (ring,MI_STORE_REGISTER_MEM |MI_SRM_LRM_GLOBAL_GTT );intel_ring_emit (ring,DERRMR );intel_ring_emit (ring, ring->scratch.gtt_offset +256 );drivers/gpu/drm/i915/intel_lrc.c +2
-2@@ -1106,7 +1106,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,if (IS_SKYLAKE (ring->dev) &&INTEL_REVID (ring->dev) <=SKL_REVID_E0 ) l3sqc4_flush |=GEN8_LQSC_RO_PERF_DIS ; -wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );@@ -1124,7 +1124,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring,wa_ctx_emit (batch, index,0 );wa_ctx_emit (batch, index,0 ); -wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 (1 ) | +wa_ctx_emit (batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ));wa_ctx_emit (batch, index,GEN8_L3SQCREG4 );wa_ctx_emit (batch, index, ring->scratch.gtt_offset +256 );Signature · 1 line
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
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