drm/i915/gen9: Add WaDisableSamplerPowerBypassForSOPingPong
Subsystems (2)
PATCH 1/6 drm/i915/gen9: Add WaDisableSamplerPowerBypassForSOPingPong
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_ringbuffer.c +7 -0
@@ -983,6 +983,13 @@ 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); +/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt */ +if (IS_SKYLAKE (dev) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_B0 )) { +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , +GEN8_SAMPLER_POWER_BYPASS_DIS ); + } +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/6 drm/i915/bxt: Add WaSetClckGatingDisableMedia
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -6894,6 +6894,7 @@ enum skl_disp_power_wells {#define GEN7_DOP_CLOCK_GATE_ENABLE (1<<0)#define GEN8_DOP_CLOCK_GATE_CFCLK_ENABLE (1<<2)#define GEN8_DOP_CLOCK_GATE_GUC_ENABLE (1<<4) +#define GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE (1<<6)#define GEN8_GARBCNTL 0xB004#define GEN9_GAPS_TSV_CREDIT_DISABLE (1<<7)
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -134,6 +134,12 @@ static void bxt_init_clock_gating(struct drm_device *dev)*/ I915_WRITE (TILECTL ,I915_READ (TILECTL ) |TILECTL_TLBPF ); } + +/* WaSetClckGatingDisableMedia:bxt */ +if (INTEL_REVID (dev) ==BXT_REVID_A0 ) { +I915_WRITE (GEN7_MISCCPCTL , (I915_READ (GEN7_MISCCPCTL ) & + ~GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE )); + } }static void i915_pineview_get_mem_freq (struct drm_device *dev)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/6] drm/i915/bxt: Add WaSetClckGatingDisableMedia
Quoted 25 lines · Arun Siluvery
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 6 ++++++ 2 files changed, 7 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6894,6 +6894,7 @@ enum skl_disp_power_wells {#define GEN7_DOP_CLOCK_GATE_ENABLE (1<<0)#define GEN8_DOP_CLOCK_GATE_CFCLK_ENABLE (1<<2)#define GEN8_DOP_CLOCK_GATE_GUC_ENABLE (1<<4) +#define GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE (1<<6)#define GEN8_GARBCNTL 0xB004#define GEN9_GAPS_TSV_CREDIT_DISABLE (1<<7)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -134,6 +134,12 @@ static void bxt_init_clock_gating(struct drm_device *dev)*/ I915_WRITE (TILECTL ,I915_READ (TILECTL ) |TILECTL_TLBPF );
drivers/gpu/drm/i915/intel_pm.c static void bxt_init_clock_gating(struct drm_device *dev) · line 145
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +6
-0} + +/* WaSetClckGatingDisableMedia:bxt */ +if (INTEL_REVID (dev) ==BXT_REVID_A0 ) { +I915_WRITE (GEN7_MISCCPCTL , (I915_READ (GEN7_MISCCPCTL ) & + ~GEN8_DOP_CLOCK_GATE_MEDIA_ENABLE )); + } }static void i915_pineview_get_mem_freq (struct drm_device *dev)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/6 drm/i915/gen9: Update WaDisableSDEUnitClockGating
In reply to Arun SiluveryApply in common gen9_init_clock_gating() fn and add revid check for bxt.
--- drivers/gpu/drm/i915/intel_pm.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +10 -11
@@ -63,6 +63,13 @@ static void gen9_init_clock_gating(struct drm_device *dev)/* WaDisableKillLogic:bxt,skl */ I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |ECOCHK_DIS_TLB ); + +/* WaDisableSDEUnitClockGating:skl,bxt */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +I915_WRITE (GEN8_UCGCTL6 , (I915_READ (GEN8_UCGCTL6 ) | +GEN8_SDEUNIT_CLOCK_GATE_DISABLE )); + } }static void skl_init_clock_gating (struct drm_device *dev)
@@ -72,13 +79,9 @@ static void skl_init_clock_gating(struct drm_device *dev)gen9_init_clock_gating (dev);if (INTEL_REVID (dev) <=SKL_REVID_B0 ) { -/* -* WaDisableSDEUnitClockGating:skl -* WaSetGAPSunitClckGateDisable:skl -*/ -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_GAPSUNIT_CLOCK_GATE_DISABLE | -GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); +/* WaSetGAPSunitClckGateDisable:skl */ +I915_WRITE (GEN8_UCGCTL6 , (I915_READ (GEN8_UCGCTL6 ) | +GEN8_GAPSUNIT_CLOCK_GATE_DISABLE ));/* WaDisableVFUnitClockGating:skl */ I915_WRITE(GEN6_UCGCTL2, I915_READ(GEN6_UCGCTL2) |
@@ -116,10 +119,6 @@ static void bxt_init_clock_gating(struct drm_device *dev)gen9_init_clock_gating (dev); -/* WaDisableSDEUnitClockGating:bxt */ -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); -/* * FIXME: * GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ applies on 3x6 GT SKUs only.
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/6 drm/i915/bxt: Update WaSetHDCunitClckGatingDisable
In reply to Arun SiluveryAs per spec this is applicable to 3x6 SKUs only, add condition to check the same.
--- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -119,12 +119,12 @@ static void bxt_init_clock_gating(struct drm_device *dev)gen9_init_clock_gating (dev); -/* -* FIXME: -* GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ applies on 3x6 GT SKUs only. -*/ -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ ); +/* WaSetHDCunitClckGatingDisable:bxt */ +/* as per spec this is applicable to 3x6 GT SKUs only */ +if (INTEL_INFO (dev)->subslice_total ==3 ) { +I915_WRITE (GEN8_UCGCTL6 , (I915_READ (GEN8_UCGCTL6 ) | +GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ )); + }if (INTEL_REVID (dev) ==BXT_REVID_A0 ) {/*
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/6 drm/i915/gen9: WA ST Unit Power Optimization Disable
In reply to Arun SiluveryFrom: Robert Beckett <[email protected]>
WaDisableSTUnitPowerOptimization:skl,bxt
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -6940,6 +6940,9 @@ enum skl_disp_power_wells {#define HSW_ROW_CHICKEN3 0xe49c#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) +#define HALF_SLICE_CHICKEN2 0xe180 +#define GEN8_ST_PO_DISABLE (1<<13) +#define HALF_SLICE_CHICKEN3 0xe184#define HSW_SAMPLE_C_PERFORMANCE (1<<9)#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -0
@@ -990,6 +990,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN8_SAMPLER_POWER_BYPASS_DIS); } +/* WaDisableSTUnitPowerOptimization:skl,bxt */ +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/6] drm/i915/gen9: WA ST Unit Power Optimization Disable
Quoted 16 lines · Arun Siluvery
From: Robert Beckett <[email protected]>
WaDisableSTUnitPowerOptimization:skl,bxt
Signed-off-by Robert Beckett <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ 2 files changed, 6 insertions(+)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 6944
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6940,6 +6940,9 @@ enum skl_disp_power_wells {#define HSW_ROW_CHICKEN3 0xe49c#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) +#define HALF_SLICE_CHICKEN2 0xe180 +#define GEN8_ST_PO_DISABLE (1<<13)
Can we name this as GEN9_STUNIT_PO_DISABLE, since this does not apply on GEN8? With that: Reviewed-by: Sagar Arun Kamble <[email protected]>
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define HALF_SLICE_CHICKEN3 0xe184#define HSW_SAMPLE_C_PERFORMANCE (1<<9)#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 998
Quoted 9 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-0@@ -990,6 +990,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN8_SAMPLER_POWER_BYPASS_DIS); } +/* WaDisableSTUnitPowerOptimization:skl,bxt */ +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/6] drm/i915/gen9: WA ST Unit Power Optimization Disable
Quoted 14 lines · Sagar A
Quoted 11 lines · Arun Siluvery
From: Robert Beckett <[email protected]>
WaDisableSTUnitPowerOptimization:skl,bxt
Signed-off-by Robert Beckett <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ 2 files changed, 6 insertions(+)
Quoted 12 lines
drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 6943
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6940,6 +6940,9 @@ enum skl_disp_power_wells {#define HSW_ROW_CHICKEN3 0xe49c#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) +#define HALF_SLICE_CHICKEN2 0xe180 +#define GEN8_ST_PO_DISABLE (1<<13)Can we name this as
GEN9_STUNIT_PO_DISABLE, since this does not apply on GEN8?
According to the spec this bit is applicable for BDW also so Gen8 should be ok.
regards
Arun
Quoted 11 lines
With that: Reviewed-by: Sagar Arun Kamble <[email protected]>
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define HALF_SLICE_CHICKEN3 0xe184#define HSW_SAMPLE_C_PERFORMANCE (1<<9)#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -990,6 +990,9 @@ static int gen9_init_workarounds(struct
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 997
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-0intel_engine_cs *ring) GEN8_SAMPLER_POWER_BYPASS_DIS); } +/* WaDisableSTUnitPowerOptimization:skl,bxt */ +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Kamble, Sagar A
Reviewed-byRe: [PATCH 5/6] drm/i915/gen9: WA ST Unit Power Optimization Disable
Quoted 28 lines · Arun Siluvery
Quoted 14 lines · Sagar A
Quoted 11 lines · Arun Siluvery
From: Robert Beckett <[email protected]>
WaDisableSTUnitPowerOptimization:skl,bxt
Signed-off-by Robert Beckett <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ 2 files changed, 6 insertions(+)Quoted 12 lines
drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 6943
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6940,6 +6940,9 @@ enum skl_disp_power_wells {#define HSW_ROW_CHICKEN3 0xe49c#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) +#define HALF_SLICE_CHICKEN2 0xe180 +#define GEN8_ST_PO_DISABLE (1<<13)Can we name this as
GEN9_STUNIT_PO_DISABLE, since this does not apply on GEN8?
Quoted 27 lines
According to the spec this bit is applicable for BDW also so Gen8 should be ok.
regards
ArunQuoted 21 lines
With that: Reviewed-by: Sagar Arun Kamble <[email protected]>
Quoted 18 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define HALF_SLICE_CHICKEN3 0xe184#define HSW_SAMPLE_C_PERFORMANCE (1<<9)#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)drivers/gpu/drm/i915/intel_ringbuffer.c +3
-0@@ -990,6 +990,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN8_SAMPLER_POWER_BYPASS_DIS); } +/* WaDisableSTUnitPowerOptimization:skl,bxt */ +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedRe: [PATCH 5/6] drm/i915/gen9: WA ST Unit Power Optimization Disable
Quoted 1 line · Sagar A
Reviewed-by Sagar Arun Kamble <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 63 lines · Arun Siluvery
Quoted 28 lines · Sagar A
Quoted 14 lines · Arun Siluvery
Quoted 11 lines
From: Robert Beckett <[email protected]>
WaDisableSTUnitPowerOptimization:skl,bxt
Signed-off-by Robert Beckett <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ 2 files changed, 6 insertions(+)Quoted 12 lines
drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 6943
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -6940,6 +6940,9 @@ enum skl_disp_power_wells {#define HSW_ROW_CHICKEN3 0xe49c#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6) +#define HALF_SLICE_CHICKEN2 0xe180 +#define GEN8_ST_PO_DISABLE (1<<13)Can we name this as
GEN9_STUNIT_PO_DISABLE, since this does not apply on GEN8?Quoted 28 lines
According to the spec this bit is applicable for BDW also so Gen8 should be ok.
regards
ArunQuoted 21 lines
With that: Reviewed-by: Sagar Arun Kamble <[email protected]>
Quoted 18 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+#define HALF_SLICE_CHICKEN3 0xe184#define HSW_SAMPLE_C_PERFORMANCE (1<<9)#define GEN8_CENTROID_PIXEL_OPT_DIS (1<<8)drivers/gpu/drm/i915/intel_ringbuffer.c +3
-0@@ -990,6 +990,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) GEN8_SAMPLER_POWER_BYPASS_DIS); } +/* WaDisableSTUnitPowerOptimization:skl,bxt */ +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +return 0 ; }_______________________________________________
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
PATCH 6/6 drm/i915/gen9: Add WaDisableMinuteIaClockGating
In reply to Arun SiluveryFrom: Nick Hoath <[email protected]>
--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
@@ -330,6 +330,13 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)/* Enable MIA caching. GuC clock gating is disabled. */ I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE ); +/* WaDisableMinuteIaClockGating:skl,bxt */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +I915_WRITE (GUC_SHIM_CONTROL , (I915_READ (GUC_SHIM_CONTROL ) & + ~GUC_ENABLE_MIA_CLOCK_GATING )); + } +/* WaC6DisallowByGfxPause*/ I915_WRITE (GEN6_GFXPAUSE ,0x30FFF );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
This is applicable to SKL GT3 and GT4.
Can you add that check as well?
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Arun Siluvery
Sent: Tuesday, September 8, 2015 3:02 PM
To: [email protected]
Cc: Kuoppala, Mika <[email protected]>
Subject: [Intel-gfx] [PATCH 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
From: Nick Hoath <[email protected]>
--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
@@ -330,6 +330,13 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)/* Enable MIA caching. GuC clock gating is disabled. */ I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE ); +/* WaDisableMinuteIaClockGating:skl,bxt */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +I915_WRITE (GUC_SHIM_CONTROL , (I915_READ (GUC_SHIM_CONTROL ) & + ~GUC_ENABLE_MIA_CLOCK_GATING )); + } +/* WaC6DisallowByGfxPause*/ I915_WRITE (GEN6_GFXPAUSE ,0x30FFF );
Signature · 10 lines
1.9.1 _______________________________________________ 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 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
In reply to Arun SiluveryIgnore the comment. I thought about CPG.
Sorry.
-----Original Message-----
From: Kamble, Sagar A
Sent: Tuesday, September 8, 2015 3:44 PM
To: 'Arun Siluvery' <[email protected]>; [email protected]
Cc: Kuoppala, Mika <[email protected]>
Subject: RE: [Intel-gfx] [PATCH 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
This is applicable to SKL GT3 and GT4.
Can you add that check as well?
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Arun Siluvery
Sent: Tuesday, September 8, 2015 3:02 PM
To: [email protected]
Cc: Kuoppala, Mika <[email protected]>
Subject: [Intel-gfx] [PATCH 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
From: Nick Hoath <[email protected]>
--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
@@ -330,6 +330,13 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)/* Enable MIA caching. GuC clock gating is disabled. */ I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE ); +/* WaDisableMinuteIaClockGating:skl,bxt */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +I915_WRITE (GUC_SHIM_CONTROL , (I915_READ (GUC_SHIM_CONTROL ) & + ~GUC_ENABLE_MIA_CLOCK_GATING )); + } +/* WaC6DisallowByGfxPause*/ I915_WRITE (GEN6_GFXPAUSE ,0x30FFF );
Signature · 10 lines
1.9.1 _______________________________________________ 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 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
In reply to Arun SiluveryQuoted 16 lines · Arun Siluvery
From: Nick Hoath <[email protected]>
Signed-off-by Nick Hoath <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -330,6 +330,13 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)/* Enable MIA caching. GuC clock gating is disabled. */ I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE );
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private *dev_priv) · line 342
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +7
-0+/* WaDisableMinuteIaClockGating:skl,bxt */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +I915_WRITE (GUC_SHIM_CONTROL , (I915_READ (GUC_SHIM_CONTROL ) & + ~GUC_ENABLE_MIA_CLOCK_GATING )); + } +/* WaC6DisallowByGfxPause*/ I915_WRITE (GEN6_GFXPAUSE ,0x30FFF );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915/gen9: Add WaDisableMinuteIaClockGating
Quoted 7 lines · Sagar A
Reviewed-by Sagar Arun Kamble <[email protected]>Quoted 4 lines · Arun Siluvery
From: Nick Hoath <[email protected]>
Signed-off-by Nick Hoath <[email protected]>Signed-off-by Arun Siluvery <[email protected]>
Applied 3 patches from this series with Sagar's review-by.
Thanks, Daniel
Quoted 25 lines
Quoted 10 lines
--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -330,6 +330,13 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)/* Enable MIA caching. GuC clock gating is disabled. */ drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private *dev_priv) · line 340
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +7
-0I915_WRITE (GUC_SHIM_CONTROL ,GUC_SHIM_CONTROL_VALUE ); +/* WaDisableMinuteIaClockGating:skl,bxt */ +if ((IS_SKYLAKE (dev) &&INTEL_REVID (dev) <=SKL_REVID_B0 ) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) ==BXT_REVID_A0 )) { +I915_WRITE (GUC_SHIM_CONTROL , (I915_READ (GUC_SHIM_CONTROL ) & + ~GUC_ENABLE_MIA_CLOCK_GATING )); + } +/* WaC6DisallowByGfxPause*/ I915_WRITE (GEN6_GFXPAUSE ,0x30FFF );_______________________________________________
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
Quoted 13 lines · Arun Siluvery
Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0@@ -983,6 +983,13 @@ 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);
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen9_init_workarounds(struct intel_engine_cs *ring) · line 995
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +7
-0+/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt */ +if (IS_SKYLAKE (dev) || + (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_B0 )) { +WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN3 , +GEN8_SAMPLER_POWER_BYPASS_DIS ); + } +return 0 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx