drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk
Subsystems (2)
Factor in clear values wherever required while updating destination min/max.
References: HSDES#1604444184
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -7326,6 +7326,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)
drivers/gpu/drm/i915/intel_engine_cs.c +4 -0
@@ -1149,6 +1149,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)WA_SET_FIELD_MASKED (GEN8_CS_CHICKEN1 ,GEN9_PREEMPT_GPGPU_LEVEL_MASK ,GEN9_PREEMPT_GPGPU_COMMAND_LEVEL ); +/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ ret =wa_ring_whitelist_reg (engine,GEN9_CTX_PREEMPT_REG );if (ret)
Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk (rev2)
URL : https://patchwork.freedesktop.org/series/43024/
State : failure
== Summary ==
Applying: drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_reg.h
M drivers/gpu/drm/i915/intel_engine_cs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c Patch failed at 0001 drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 2 lines · Michel Thierry
Factor in clear values wherever required while updating destination min/max.
Hi Michel, please elaborate what the intention here is.
BR,
Jani.
Quoted 45 lines
References: HSDES#1604444184
Signed-off-by Michel Thierry <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Oscar Mateo <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Signed-off-by Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -7326,6 +7326,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)drivers/gpu/drm/i915/intel_engine_cs.c +4
-0@@ -1149,6 +1149,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)WA_SET_FIELD_MASKED (GEN8_CS_CHICKEN1 ,GEN9_PREEMPT_GPGPU_LEVEL_MASK ,GEN9_PREEMPT_GPGPU_COMMAND_LEVEL ); +/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ ret =wa_ring_whitelist_reg (engine,GEN9_CTX_PREEMPT_REG );if (ret)
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Jani Nikula
Quoted 2 lines · Michel Thierry
Factor in clear values wherever required while updating destination min/max.
Hi Michel, please elaborate what the intention here is.
Hi Jani, isn't the intention of all the workarounds to prevent gpu hangs?
Quoted 43 lines
BR,
Jani.Quoted 38 lines
References: HSDES#1604444184
Signed-off-by Michel Thierry <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Oscar Mateo <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Signed-off-by Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -7326,6 +7326,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)drivers/gpu/drm/i915/intel_engine_cs.c +0
-0@@ -1149,6 +1149,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)WA_SET_FIELD_MASKED (GEN8_CS_CHICKEN1 ,GEN9_PREEMPT_GPGPU_LEVEL_MASK ,GEN9_PREEMPT_GPGPU_COMMAND_LEVEL );
Quoted 8 lines
drivers/gpu/drm/i915/intel_engine_cs.c static int gen9_init_workarounds(struct intel_engine_cs *engine) · line 1158
Quoted 7 lines
drivers/gpu/drm/i915/intel_engine_cs.c +4
-0+/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ ret =wa_ring_whitelist_reg (engine,GEN9_CTX_PREEMPT_REG );if (ret)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 10 lines · Michel Thierry
Quoted 6 lines · Jani Nikula
Quoted 2 lines · Michel Thierry
Factor in clear values wherever required while updating destination min/max.
Hi Michel, please elaborate what the intention here is.
Hi Jani, isn't the intention of all the workarounds to prevent gpu hangs?
Err, sorry for the riddles, I meant with [BACKPORT v4.17-rc5] etc. :)
Is this in dinq already? Commit id?
BR,
Jani.
Quoted 52 lines
Quoted 52 lines
BR,
Jani.Quoted 45 lines
References: HSDES#1604444184
Signed-off-by Michel Thierry <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Oscar Mateo <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Signed-off-by Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -7326,6 +7326,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)drivers/gpu/drm/i915/intel_engine_cs.c +4
-0@@ -1149,6 +1149,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)WA_SET_FIELD_MASKED (GEN8_CS_CHICKEN1 ,GEN9_PREEMPT_GPGPU_LEVEL_MASK ,GEN9_PREEMPT_GPGPU_COMMAND_LEVEL ); +/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ ret =wa_ring_whitelist_reg (engine,GEN9_CTX_PREEMPT_REG );if (ret)
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Jani Nikula
Quoted 5 lines · Michel Thierry
Quoted 4 lines · Jani Nikula
Quoted 2 lines · Michel Thierry
Factor in clear values wherever required while updating destination min/max.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Hi Michel, please elaborate what the intention here is.
Hi Jani, isn't the intention of all the workarounds to prevent gpu hangs?
Err, sorry for the riddles, I meant with [BACKPORT v4.17-rc5] etc. :)
No worries,
Quoted 1 line
Is this in dinq already? Commit id?
It was merged only a couple of days ago,
https://cgit.freedesktop.org/drm-tip/commit/?id=0c79f9cb77eae28d48a4f9fc1b3341aacbbd260c
Joonas asked me to backport it (stable doesn't have the intel_workarounds refactor yet).
Quoted 59 lines
BR,
Jani.Quoted 52 lines
Quoted 52 lines
BR,
Jani.Quoted 45 lines
References: HSDES#1604444184
Signed-off-by Michel Thierry <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Oscar Mateo <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Signed-off-by Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 4 ++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -7326,6 +7326,9 @@ enum {#define SLICE_ECO_CHICKEN0 _MMIO(0x7308)#define PIXEL_MASK_CAMMING_DISABLE (1 << 14) +#define GEN9_WM_CHICKEN3 _MMIO(0x5588) +#define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) +/* WaCatErrorRejectionIssue */ #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030)#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11)drivers/gpu/drm/i915/intel_engine_cs.c +4
-0@@ -1149,6 +1149,10 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)WA_SET_FIELD_MASKED (GEN8_CS_CHICKEN1 ,GEN9_PREEMPT_GPGPU_LEVEL_MASK ,GEN9_PREEMPT_GPGPU_COMMAND_LEVEL ); +/* WaClearHIZ_WM_CHICKEN3:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) +WA_SET_BIT_MASKED (GEN9_WM_CHICKEN3 ,GEN9_FACTOR_IN_CLR_VAL_HIZ ); +/* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ ret =wa_ring_whitelist_reg (engine,GEN9_CTX_PREEMPT_REG );if (ret)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx