Enable legacy behaviour for Push constants
Subsystems (2)
cover Enable legacy behaviour for Push constants
Patch1 fixes a simple compile error in Patch2
Patch2 fixes gpu hang observed with a subtest of gem_concurrent_blit.
Arun Siluvery (1):
drm/i915/gen9: Disable gather at set shader bit
Mika Kuoppala (1):
drm/i915: Contain the WA_REG macro
drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Contain the WA_REG macro
From: Mika Kuoppala <[email protected]>
Prevent leaking the if scoping by containing the WA_REG macro inside its own scope.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -2
@@ -780,11 +780,11 @@ static int wa_add(struct drm_i915_private *dev_priv,return 0 ; } -#define WA_REG (addr, mask, val) { \ +#define WA_REG (addr, mask, val) do { \ const int r = wa_add(dev_priv, (addr), (mask), (val)); \ if (r) \ return r; \ - } + } while(0)#define WA_SET_BIT_MASKED (addr, mask) \ WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask))
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v1 1/2] drm/i915: Contain the WA_REG macro
Quoted 19 lines · Arun Siluvery
From: Mika Kuoppala <[email protected]>
Prevent leaking the if scoping by containing the
WA_REGmacro inside its own scope.Reported-by Arun Siluvery <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -780,11 +780,11 @@ static int wa_add(struct drm_i915_private *dev_priv,return 0 ; }
drivers/gpu/drm/i915/intel_ringbuffer.c static int wa_add(struct drm_i915_private *dev_priv, · line 790
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-2-#define WA_REG (addr, mask, val) { \ +#define WA_REG (addr, mask, val) do { \ const int r = wa_add(dev_priv, (addr), (mask), (val)); \ if (r) \ return r; \ - } + } while(0)#define WA_SET_BIT_MASKED (addr, mask) \ WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask))
On the one hand, yes, this definitely needs the do-while wrapper.
OTOH, hiding a conditional 'return' inside a macro is an abomination :( At least it's only local to this file ...
So, on the grounds that this makes it more correct if no less ugly:
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH v1 1/2] drm/i915: Contain the WA_REG macro
Quoted 33 lines · Dave Gordon
Quoted 19 lines · Arun Siluvery
From: Mika Kuoppala <[email protected]>
Prevent leaking the if scoping by containing the
WA_REGmacro inside its own scope.Reported-by Arun Siluvery <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -780,11 +780,11 @@ static int wa_add(struct drm_i915_private *dev_priv,return 0 ; }drivers/gpu/drm/i915/intel_ringbuffer.c static int wa_add(struct drm_i915_private *dev_priv, · line 790
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-2-#define WA_REG (addr, mask, val) { \ +#define WA_REG (addr, mask, val) do { \ const int r = wa_add(dev_priv, (addr), (mask), (val)); \ if (r) \ return r; \ - } + } while(0)#define WA_SET_BIT_MASKED (addr, mask) \ WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask))On the one hand, yes, this definitely needs the do-while wrapper.
Quoted 6 lines
OTOH, hiding a conditional 'return' inside a macro is an abomination :( At least it's only local to this file ...
So, on the grounds that this makes it more correct if no less ugly:
Reviewed-by Dave Gordon <[email protected]>
Queued for -next, thanks for the patch. And I fixed the checkpatch ERROR, tsk ;-)
-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
PATCH 2/2 drm/i915/gen9: Disable gather at set shader bit
In reply to Arun SiluveryFrom Gen9, Push constant instruction parsing behaviour varies according to whether set shader is enabled or not. If we want legacy behaviour then it can be achieved by disabling set shader.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89959
--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++++++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -1720,6 +1720,10 @@ enum skl_disp_power_wells {#define FW_BLC 0x020d8#define FW_BLC2 0x020dc#define FW_BLC_SELF 0x020e0/* 915+ only */ +#define CS_RCS_BE 0x20D8 +#define CS_RCS_DISABLE_GATHER_AT_SHADER (1<<7) +#define RS_CHICKEN 0x20DC +#define RS_CHICKEN_DISABLE_GATHER_AT_SHADER (1<<2)#define FW_BLC_SELF_EN_MASK (1<<31)#define FW_BLC_SELF_FIFO_MASK (1<<16)/* 945 only */ #define FW_BLC_SELF_EN (1<<15)/* 945 only */
@@ -5834,6 +5838,7 @@ enum skl_disp_power_wells {# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)#define COMMON_SLICE_CHICKEN2 0x7014 +#define GEN9_DISABLE_GATHER_SET_SHADER_SLICE (1<<12)# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)#define HIZ_CHICKEN 0x7018
drivers/gpu/drm/i915/intel_ringbuffer.c +10 -0
@@ -983,6 +983,16 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) tmp |=HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE ;WA_SET_BIT_MASKED (HDC_CHICKEN0 , tmp); +/* Chicken bits to disable set shader is in multiple places, +* set bits in all required registers to disable it correctly +*/ +WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN9_DISABLE_GATHER_SET_SHADER_SLICE ); +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_D0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) +WA_SET_BIT_MASKED (RS_CHICKEN ,RS_CHICKEN_DISABLE_GATHER_AT_SHADER ); +else +WA_SET_BIT_MASKED (CS_RCS_BE ,CS_RCS_DISABLE_GATHER_AT_SHADER ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v1 2/2] drm/i915/gen9: Disable gather at set shader bit
Quoted 14 lines · Arun Siluvery
From Gen9, Push constant instruction parsing behaviour varies according to
whether set shader is enabled or not. If we want legacy behaviour then it can be achieved by disabling set shader.Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89959
Cc Ben Widawsky <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++++++ 2 files changed, 15 insertions(+)
[snip]
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-0@@ -983,6 +983,16 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) tmp |=HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE ;WA_SET_BIT_MASKED (HDC_CHICKEN0 , tmp); +/* Chicken bits to disable set shader is in multiple places, +* set bits in all required registers to disable it correctly
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 997
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +8
-0+*/ +WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN9_DISABLE_GATHER_SET_SHADER_SLICE ); +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_D0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) +WA_SET_BIT_MASKED (RS_CHICKEN ,RS_CHICKEN_DISABLE_GATHER_AT_SHADER ); +else +WA_SET_BIT_MASKED (CS_RCS_BE ,CS_RCS_DISABLE_GATHER_AT_SHADER ); +return 0 ; }
This workaround isn't tagged with a specific /* WaXyz:chip */ comment.
Also, the style isn't consistent with the other paragraphs earlier in this function: those have braces round the body part even when there's only one line of code, possibly to make it clear where the WA comment applies (of course, this is why the buggy WA_REG() macro wasn't spotted earlier).
So, maybe prettify this a bit, if possible? The code actually looks correct, just ugly.
Oh, and keep patch 1 even if you decide to abandon this one!
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v1 2/2] drm/i915/gen9: Disable gather at set shader bit
Quoted 51 lines · Dave Gordon
Quoted 15 lines · Arun Siluvery
From Gen9, Push constant instruction parsing behaviour varies
according to
whether set shader is enabled or not. If we want legacy behaviour then it can be achieved by disabling set shader.Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89959
Cc Ben Widawsky <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++++++ 2 files changed, 15 insertions(+)[snip]
Quoted 23 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0@@ -983,6 +983,16 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) tmp |= HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE;WA_SET_BIT_MASKED (HDC_CHICKEN0 , tmp); +/* Chicken bits to disable set shader is in multiple places, +* set bits in all required registers to disable it correctly +*/ +WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN9_DISABLE_GATHER_SET_SHADER_SLICE ); +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_D0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) +WA_SET_BIT_MASKED (RS_CHICKEN ,RS_CHICKEN_DISABLE_GATHER_AT_SHADER ); +else +WA_SET_BIT_MASKED (CS_RCS_BE ,CS_RCS_DISABLE_GATHER_AT_SHADER ); +return 0;Quoted 1 line
}
This workaround isn't tagged with a specific /* WaXyz:chip */ comment. Also, the style isn't consistent with the other paragraphs earlier in this function: those have braces round the body part even when there's only one line of code, possibly to make it clear where the WA comment applies (of course, this is why the buggy
WA_REG()macro wasn't spotted earlier).
Quoted 5 lines
So, maybe prettify this a bit, if possible? The code actually looks correct, just ugly.
Oh, and keep patch 1 even if you decide to abandon this one!
Hi Dave,
This patch can be ignored if we use below patch,
[Intel-gfx] [PATCH] lib/rendercopy_gen9: Setup Push constant pointer before sending BTP commands
http://lists.freedesktop.org/archives/intel-gfx/2015-August/073483.html
I think the correct option would be to ignore this patch.
regards
Arun
Quoted 3 lines
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v1 2/2] drm/i915/gen9: Disable gather at set shader bit
In reply to Dave GordonQuoted 37 lines · Dave Gordon
Quoted 14 lines · Arun Siluvery
From Gen9, Push constant instruction parsing behaviour varies according to whether set shader is enabled or not. If we want legacy behaviour then it can be achieved by disabling set shader.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89959
Cc Ben Widawsky <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++++++ 2 files changed, 15 insertions(+)[snip]
Quoted 19 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +10
-0@@ -983,6 +983,16 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) tmp |=HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE ;WA_SET_BIT_MASKED (HDC_CHICKEN0 , tmp); +/* Chicken bits to disable set shader is in multiple places, +* set bits in all required registers to disable it correctly +*/ +WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN9_DISABLE_GATHER_SET_SHADER_SLICE ); +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_D0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) +WA_SET_BIT_MASKED (RS_CHICKEN ,RS_CHICKEN_DISABLE_GATHER_AT_SHADER ); +else +WA_SET_BIT_MASKED (CS_RCS_BE ,CS_RCS_DISABLE_GATHER_AT_SHADER ); +return 0 ;
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 997
Quoted 1 line
drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0}This workaround isn't tagged with a specific /* WaXyz:chip */ comment. Also, the style isn't consistent with the other paragraphs earlier in this
function: those have braces round the body part even when there's only one line of code, possibly to make it clear where the WA comment applies (of course, this is why the buggyWA_REG()macro wasn't spotted earlier).
Imo if we want to bikeshed this is should be
/* * WaBlaFoo:pft * extended comment if need */ if (IS_FOO(dev)) WA_SET_();
i.e. follow the style in this patch here for all of them. -Daniel
Quoted 12 lines
So, maybe prettify this a bit, if possible? The code actually looks correct, just ugly.
Oh, and keep patch 1 even if you decide to abandon this one!
.Dave.
_______________________________________________
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
Re: [PATCH v1 2/2] drm/i915/gen9: Disable gather at set shader bit
In reply to Arun SiluveryTask id: 7150 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302 SNB 315/315 315/315 IVB 336/336 336/336
BYT -2 283/283 281/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_partial_pwrite_pread@reads-uncached PASS(1) FAIL(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 6 lines · Arun Siluvery
Patch1 fixes a simple compile error in Patch2
Patch2 fixes gpu hang observed with a subtest ofgem_concurrent_blit.Arun Siluvery (1):
drm/i915/gen9: Disable gather at set shader bit
Quoted 7 lines
Mika Kuoppala (1):
drm/i915: Contain theWA_REGmacrodrivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
prw-blt-overwrite-source-read-rcs-forked runs fine with these, tested on SKL-Y & -H
Signature · 5 lines
t _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Timo Aaltonen
Quoted 6 lines · Arun Siluvery
Patch1 fixes a simple compile error in Patch2
Patch2 fixes gpu hang observed with a subtest ofgem_concurrent_blit.Arun Siluvery (1):
drm/i915/gen9: Disable gather at set shader bitQuoted 7 lines
Mika Kuoppala (1):
drm/i915: Contain theWA_REGmacrodrivers/gpu/drm/i915/i915_reg.h | 5 +++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
Quoted 6 lines
prw-blt-overwrite-source-read-rcs-forked runs fine with these, tested on SKL-Y & -H
Tested-by Timo Aaltonen <[email protected]>
This patch can be ignored if the following patch is applied,
[Intel-gfx] [PATCH] lib/rendercopy_gen9: Setup Push constant pointer before sending BTP commands
http://lists.freedesktop.org/archives/intel-gfx/2015-August/073483.html
regards
Arun
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx