drm/i915/gen9: Add framework to whitelist specific GPU registers
Subsystems (2)
PATCH 1/2 drm/i915/gen9: Add framework to whitelist specific GPU registers
Some of the HW registers are privileged and cannot be written to from a non-privileged batch buffers coming from userspace unless they are on whitelist. Userspace need write access to them to implement mainly preemption related WA and also some general WA.
The reason for using this approach is, the register bits that control preemption granularity at the HW level are not context save/restored; so even if we set these bits always in kernel they are going to change once the context is switched out. We can consider making them non-privileged by default but these registers also contain other chicken bits which should not be allowed to be modified.
In the later revisions controlling bits are save/restored at context level but in the existing revisions these are exported via other debug registers and should be on the whitelist. This patch adds changes to provide HW with a list of registers to be whitelisted. HW checks this list during execution and provides access accordingly.
HW imposes a limit on the number of registers on whitelist and it is per-engine. At this point we are only enabling whitelist for RCS and we don't foresee any requirement for other engines.
The registers to be whitelisted are added using generic workaround list mechanism, even these are only enablers for userspace workarounds. But by sharing this mechanism we get some test assets without additional cost (Mika).
--- drivers/gpu/drm/i915/i915_drv.h | 9 ++++++++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +8 -1
@@ -1674,11 +1674,18 @@ struct i915_wa_reg {u32 mask; }; -#define I915_MAX_WA_REGS 16 +/* +* RING_MAX_NONPRIV_SLOTS is per-engine but at this point we are only +* allowing it for RCS as we don't foresee any requirement of having +* a whitelist for other engines. When it is really required for +* other engines then the limit need to be increased. +*/ +#define I915_MAX_WA_REGS (16 + RING_MAX_NONPRIV_SLOTS)struct i915_workarounds {struct i915_wa_reg reg[I915_MAX_WA_REGS ];u32 count; +u32 hw_whitelist_index[I915_NUM_RINGS ]; };struct i915_virtual_gpu {
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -1578,6 +1578,8 @@ enum skl_disp_power_wells {#define RING_WAIT_I8XX (1<<0)/* gen2, PRBx_HEAD */ #define RING_WAIT (1<<11)/* gen3+, PRBx_CTL */ #define RING_WAIT_SEMAPHORE (1<<10)/* gen6+ */ +#define RING_FORCE_TO_NONPRIV (base) ((base)+0x4D0) +#define RING_MAX_NONPRIV_SLOTS 12#define GEN7_TLB_RD_ADDR 0x4700
drivers/gpu/drm/i915/intel_ringbuffer.c +17 -0
@@ -800,6 +800,22 @@ static int wa_add(struct drm_i915_private *dev_priv,#define WA_WRITE (addr, val) WA_REG(addr, 0xffffffff, val) +static inline int wa_ring_whitelist_reg (struct intel_engine_cs *ring, +uint32_t reg_addr) +{ +struct drm_i915_private *dev_priv = ring->dev->dev_private; +struct i915_workarounds *wa = &dev_priv->workarounds; +const uint32_t index = wa->hw_whitelist_index[ring->id]; + +if (WARN_ON (index >=RING_MAX_NONPRIV_SLOTS )) +return -EINVAL ; + +WA_WRITE (RING_FORCE_TO_NONPRIV (ring->mmio_base) + index *4 , reg_addr); + wa->hw_whitelist_index[ring->id]++; + +return 0 ; +} +static int gen8_init_workarounds (struct intel_engine_cs *ring) {struct drm_device *dev = ring->dev;
@@ -1094,6 +1110,7 @@ int init_workarounds_ring(struct intel_engine_cs *ring)WARN_ON (ring->id !=RCS ); dev_priv->workarounds.count =0 ; + dev_priv->workarounds.hw_whitelist_index[ring->id] =0 ;if (IS_BROADWELL (dev))return bdw_init_workarounds (ring);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/gen9: Add HDC_CHICKEN1 to HW whitelist
Required for WaAllowUMDToModifyHDCChicken1:skl,bxt
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -5937,6 +5937,8 @@ enum skl_disp_power_wells {#define HDC_FORCE_NON_COHERENT (1<<4)#define HDC_BARRIER_PERFORMANCE_DISABLE (1<<10) +#define HDC_CHICKEN1 0x7304 +/* GEN9 chicken */ #define SLICE_ECO_CHICKEN0 0x7308#define PIXEL_MASK_CAMMING_DISABLE (1 << 14)
drivers/gpu/drm/i915/intel_ringbuffer.c +6 -0
@@ -921,6 +921,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)struct drm_device *dev = ring->dev;struct drm_i915_private *dev_priv = dev->dev_private;uint32_t tmp; +int ret;/* WaDisablePartialInstShootdown:skl,bxt */ WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
@@ -979,6 +980,11 @@ 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); +/* WaAllowUMDToModifyHDCChicken1:skl,bxt */ + ret =wa_ring_whitelist_reg (ring,HDC_CHICKEN1 ); +if (ret) +return ret; +/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt */ if (IS_SKYLAKE (dev) || (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_B0 )) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/gen9: Add HDC_CHICKEN1 to HW whitelist
Quoted 5 lines · Arun Siluvery
Required for WaAllowUMDToModifyHDCChicken1:skl,bxt
Cc Mika Kuoppala <[email protected]>Cc Nick Hoath <[email protected]>Signed-off-by Arun Siluvery <[email protected]>
Usual maintainer request: Needs the corresponding mesa patches reviewed before I can pull this in.
-Daniel
Quoted 49 lines
--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++++ 2 files changed, 8 insertions(+)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5937,6 +5937,8 @@ enum skl_disp_power_wells {#define HDC_FORCE_NON_COHERENT (1<<4)#define HDC_BARRIER_PERFORMANCE_DISABLE (1<<10) +#define HDC_CHICKEN1 0x7304 +/* GEN9 chicken */ #define SLICE_ECO_CHICKEN0 0x7308#define PIXEL_MASK_CAMMING_DISABLE (1 << 14)drivers/gpu/drm/i915/intel_ringbuffer.c +6
-0@@ -921,6 +921,7 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)struct drm_device *dev = ring->dev;struct drm_i915_private *dev_priv = dev->dev_private;uint32_t tmp; +int ret;/* WaDisablePartialInstShootdown:skl,bxt */ WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,@@ -979,6 +980,11 @@ 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); +/* WaAllowUMDToModifyHDCChicken1:skl,bxt */ + ret =wa_ring_whitelist_reg (ring,HDC_CHICKEN1 ); +if (ret) +return ret; +/* WaDisableSamplerPowerBypassForSOPingPong:skl,bxt */ if (IS_SKYLAKE (dev) || (IS_BROXTON (dev) &&INTEL_REVID (dev) <=BXT_REVID_B0 )) {Signature · 6 lines
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
Quoted 46 lines · Arun Siluvery
Some of the HW registers are privileged and cannot be written to from a non-privileged batch buffers coming from userspace unless they are on whitelist. Userspace need write access to them to implement mainly preemption related WA and also some general WA.
The reason for using this approach is, the register bits that control preemption granularity at the HW level are not context save/restored; so even if we set these bits always in kernel they are going to change once the context is switched out. We can consider making them non-privileged by default but these registers also contain other chicken bits which should not be allowed to be modified.
In the later revisions controlling bits are save/restored at context level but in the existing revisions these are exported via other debug registers and should be on the whitelist. This patch adds changes to provide HW with a list of registers to be whitelisted. HW checks this list during execution and provides access accordingly.
HW imposes a limit on the number of registers on whitelist and it is per-engine. At this point we are only enabling whitelist for RCS and we don't foresee any requirement for other engines.
The registers to be whitelisted are added using generic workaround list mechanism, even these are only enablers for userspace workarounds. But by sharing this mechanism we get some test assets without additional cost (Mika).
Cc Mika Kuoppala <[email protected]>Cc Nick Hoath <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 9 ++++++++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_ringbuffer.c | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +4
-1@@ -1674,11 +1674,18 @@ struct i915_wa_reg {u32 mask; }; -#define I915_MAX_WA_REGS 16 +/* +* RING_MAX_NONPRIV_SLOTS is per-engine but at this point we are only +* allowing it for RCS as we don't foresee any requirement of having +* a whitelist for other engines. When it is really required for
drivers/gpu/drm/i915/i915_drv.h struct i915_wa_reg { · line 1690
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +4
-0+* other engines then the limit need to be increased. +*/ +#define I915_MAX_WA_REGS (16 + RING_MAX_NONPRIV_SLOTS)struct i915_workarounds {struct i915_wa_reg reg[I915_MAX_WA_REGS ];u32 count; +u32 hw_whitelist_index[I915_NUM_RINGS ]; };
I have plans to allow multiple workaround lists. So we could then have dedicated one for whitelists too, simplifying this.
Quoted 56 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0struct i915_virtual_gpu {drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -1578,6 +1578,8 @@ enum skl_disp_power_wells {#define RING_WAIT_I8XX (1<<0)/* gen2, PRBx_HEAD */ #define RING_WAIT (1<<11)/* gen3+, PRBx_CTL */ #define RING_WAIT_SEMAPHORE (1<<10)/* gen6+ */ +#define RING_FORCE_TO_NONPRIV (base) ((base)+0x4D0) +#define RING_MAX_NONPRIV_SLOTS 12#define GEN7_TLB_RD_ADDR 0x4700drivers/gpu/drm/i915/intel_ringbuffer.c +17
-0@@ -800,6 +800,22 @@ static int wa_add(struct drm_i915_private *dev_priv,#define WA_WRITE (addr, val) WA_REG(addr, 0xffffffff, val) +static inline int wa_ring_whitelist_reg (struct intel_engine_cs *ring, +uint32_t reg_addr) +{ +struct drm_i915_private *dev_priv = ring->dev->dev_private; +struct i915_workarounds *wa = &dev_priv->workarounds; +const uint32_t index = wa->hw_whitelist_index[ring->id]; + +if (WARN_ON (index >=RING_MAX_NONPRIV_SLOTS )) +return -EINVAL ; + +WA_WRITE (RING_FORCE_TO_NONPRIV (ring->mmio_base) + index *4 , reg_addr); + wa->hw_whitelist_index[ring->id]++; + +return 0 ; +} +static int gen8_init_workarounds (struct intel_engine_cs *ring) {struct drm_device *dev = ring->dev;@@ -1094,6 +1110,7 @@ int init_workarounds_ring(struct intel_engine_cs *ring)WARN_ON (ring->id !=RCS ); dev_priv->workarounds.count =0 ; + dev_priv->workarounds.hw_whitelist_index[ring->id] =0 ;if (IS_BROADWELL (dev))return bdw_init_workarounds (ring);Signature · 6 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