Re: [Intel-gfx] [PATCH] drm/i915: Add Wa_14019877138
On 12/11/2023 9:26 PM, Matt Roper wrote: On Mon, Dec 11, 2023 at 05:08:48PM +0530, Kalvala, Haridhar wrote: On 12/6/2023 1:54 AM, Matt Roper wrote: On Tue, Dec 05, 2023 at 02:41:05PM +0530, Haridhar Kalvala wrote: Enable Force Dispatch Ends Collection for DG2. BSpec: 46001 Signed-off-by: Haridhar Kalvala --- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +++ drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h index 9de41703fae5..85ba62639807 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h @@ -469,6 +469,9 @@ #define XEHP_PSS_MODE2 MCR_REG(0x703c) #define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5) +#defineXEHP_PSS_CHICKENMCR_REG(0x7044) +#define FD_END_COLLECTREG_BIT(5) Looks like the whitespace between '#define' and the names isn't correct here. Aside from that, Reviewed-by: Matt Roper Hi Matt, Thank you. I verified with checkpatch and it did not shown any warning. I will check again. Checkpatch won't care since this isn't related to kernel coding style, just to consistency within the header. You should make these definitions use the same whitespace format as all the other ones in the file. Matt Hi Matt, Done. Thanks & regards, Haridhar Kalvala Thanks & regards, Haridhar Kalvala + #define GEN7_SC_INSTDONE _MMIO(0x7100) #define GEN12_SC_INSTDONE_EXTRA _MMIO(0x7104) #define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 4cbf9e512645..3eacbc50caf8 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -777,6 +777,9 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine, /* Wa_18019271663:dg2 */ wa_masked_en(wal, CACHE_MODE_1, MSAA_OPTIMIZATION_REDUC_DISABLE); + + /* Wa_14019877138:dg2 */ + wa_mcr_masked_en(wal, XEHP_PSS_CHICKEN, FD_END_COLLECT); } static void xelpg_ctx_gt_tuning_init(struct intel_engine_cs *engine, -- 2.25.1 -- Regards, Haridhar Kalvala -- Regards, Haridhar Kalvala
Re: [Intel-gfx] [PATCH] drm/i915: Add Wa_14019877138
On Mon, Dec 11, 2023 at 05:08:48PM +0530, Kalvala, Haridhar wrote: > > On 12/6/2023 1:54 AM, Matt Roper wrote: > > On Tue, Dec 05, 2023 at 02:41:05PM +0530, Haridhar Kalvala wrote: > > > Enable Force Dispatch Ends Collection for DG2. > > > > > > BSpec: 46001 > > > > > > Signed-off-by: Haridhar Kalvala > > > --- > > > drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +++ > > > drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ > > > 2 files changed, 6 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h > > > b/drivers/gpu/drm/i915/gt/intel_gt_regs.h > > > index 9de41703fae5..85ba62639807 100644 > > > --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h > > > +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h > > > @@ -469,6 +469,9 @@ > > > #define XEHP_PSS_MODE2 MCR_REG(0x703c) > > > #define SCOREBOARD_STALL_FLUSH_CONTROLREG_BIT(5) > > > +#define XEHP_PSS_CHICKENMCR_REG(0x7044) > > > +#defineFD_END_COLLECTREG_BIT(5) > > Looks like the whitespace between '#define' and the names isn't correct > > here. > > > > Aside from that, > > > > Reviewed-by: Matt Roper > > > Hi Matt, > > Thank you. I verified with checkpatch and it did not shown any warning. I > will check again. Checkpatch won't care since this isn't related to kernel coding style, just to consistency within the header. You should make these definitions use the same whitespace format as all the other ones in the file. Matt > > Thanks & regards, > > Haridhar Kalvala > > > > + > > > #define GEN7_SC_INSTDONE_MMIO(0x7100) > > > #define GEN12_SC_INSTDONE_EXTRA _MMIO(0x7104) > > > #define GEN12_SC_INSTDONE_EXTRA2_MMIO(0x7108) > > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c > > > b/drivers/gpu/drm/i915/gt/intel_workarounds.c > > > index 4cbf9e512645..3eacbc50caf8 100644 > > > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > > > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > > > @@ -777,6 +777,9 @@ static void dg2_ctx_workarounds_init(struct > > > intel_engine_cs *engine, > > > /* Wa_18019271663:dg2 */ > > > wa_masked_en(wal, CACHE_MODE_1, > > > MSAA_OPTIMIZATION_REDUC_DISABLE); > > > + > > > + /* Wa_14019877138:dg2 */ > > > + wa_mcr_masked_en(wal, XEHP_PSS_CHICKEN, FD_END_COLLECT); > > > } > > > static void xelpg_ctx_gt_tuning_init(struct intel_engine_cs *engine, > > > -- > > > 2.25.1 > > > > -- > Regards, > Haridhar Kalvala > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
Re: [Intel-gfx] [PATCH] drm/i915: Add Wa_14019877138
On 12/6/2023 1:54 AM, Matt Roper wrote: On Tue, Dec 05, 2023 at 02:41:05PM +0530, Haridhar Kalvala wrote: Enable Force Dispatch Ends Collection for DG2. BSpec: 46001 Signed-off-by: Haridhar Kalvala --- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +++ drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h index 9de41703fae5..85ba62639807 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h @@ -469,6 +469,9 @@ #define XEHP_PSS_MODE2MCR_REG(0x703c) #define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5) +#define XEHP_PSS_CHICKEN MCR_REG(0x7044) +#define FD_END_COLLECTREG_BIT(5) Looks like the whitespace between '#define' and the names isn't correct here. Aside from that, Reviewed-by: Matt Roper Hi Matt, Thank you. I verified with checkpatch and it did not shown any warning. I will check again. Thanks & regards, Haridhar Kalvala + #define GEN7_SC_INSTDONE _MMIO(0x7100) #define GEN12_SC_INSTDONE_EXTRA _MMIO(0x7104) #define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 4cbf9e512645..3eacbc50caf8 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -777,6 +777,9 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine, /* Wa_18019271663:dg2 */ wa_masked_en(wal, CACHE_MODE_1, MSAA_OPTIMIZATION_REDUC_DISABLE); + + /* Wa_14019877138:dg2 */ + wa_mcr_masked_en(wal, XEHP_PSS_CHICKEN, FD_END_COLLECT); } static void xelpg_ctx_gt_tuning_init(struct intel_engine_cs *engine, -- 2.25.1 -- Regards, Haridhar Kalvala
Re: [Intel-gfx] [PATCH] drm/i915: Add Wa_14019877138
On Tue, Dec 05, 2023 at 02:41:05PM +0530, Haridhar Kalvala wrote: > Enable Force Dispatch Ends Collection for DG2. > > BSpec: 46001 > > Signed-off-by: Haridhar Kalvala > --- > drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +++ > drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h > b/drivers/gpu/drm/i915/gt/intel_gt_regs.h > index 9de41703fae5..85ba62639807 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h > @@ -469,6 +469,9 @@ > #define XEHP_PSS_MODE2 MCR_REG(0x703c) > #define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5) > > +#define XEHP_PSS_CHICKENMCR_REG(0x7044) > +#defineFD_END_COLLECTREG_BIT(5) Looks like the whitespace between '#define' and the names isn't correct here. Aside from that, Reviewed-by: Matt Roper > + > #define GEN7_SC_INSTDONE _MMIO(0x7100) > #define GEN12_SC_INSTDONE_EXTRA _MMIO(0x7104) > #define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108) > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c > b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 4cbf9e512645..3eacbc50caf8 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -777,6 +777,9 @@ static void dg2_ctx_workarounds_init(struct > intel_engine_cs *engine, > > /* Wa_18019271663:dg2 */ > wa_masked_en(wal, CACHE_MODE_1, MSAA_OPTIMIZATION_REDUC_DISABLE); > + > + /* Wa_14019877138:dg2 */ > + wa_mcr_masked_en(wal, XEHP_PSS_CHICKEN, FD_END_COLLECT); > } > > static void xelpg_ctx_gt_tuning_init(struct intel_engine_cs *engine, > -- > 2.25.1 > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
[Intel-gfx] [PATCH] drm/i915: Add Wa_14019877138
Enable Force Dispatch Ends Collection for DG2. BSpec: 46001 Signed-off-by: Haridhar Kalvala --- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +++ drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h index 9de41703fae5..85ba62639807 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h @@ -469,6 +469,9 @@ #define XEHP_PSS_MODE2 MCR_REG(0x703c) #define SCOREBOARD_STALL_FLUSH_CONTROL REG_BIT(5) +#defineXEHP_PSS_CHICKENMCR_REG(0x7044) +#define FD_END_COLLECTREG_BIT(5) + #define GEN7_SC_INSTDONE _MMIO(0x7100) #define GEN12_SC_INSTDONE_EXTRA_MMIO(0x7104) #define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 4cbf9e512645..3eacbc50caf8 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -777,6 +777,9 @@ static void dg2_ctx_workarounds_init(struct intel_engine_cs *engine, /* Wa_18019271663:dg2 */ wa_masked_en(wal, CACHE_MODE_1, MSAA_OPTIMIZATION_REDUC_DISABLE); + + /* Wa_14019877138:dg2 */ + wa_mcr_masked_en(wal, XEHP_PSS_CHICKEN, FD_END_COLLECT); } static void xelpg_ctx_gt_tuning_init(struct intel_engine_cs *engine, -- 2.25.1
