Add BDW workarounds using golden render state
Subsystems (2)
cover Add BDW workarounds using golden render state
In this patch workarounds for BDW are applied using golden render state. Only those registers that are part of register state are added to this batch. Remaining workarounds are still in its current place init_clock_gating() which are not affected by a gpu reset. I can send another patch where they can be moved to render ring init function but during testing I found their state doesn't change after reset.
Arun Siluvery (2):
drm/i915/bdw: Apply workarounds using the golden render state drm/i915/bdw: Extract workaround registers data from golden render
state
drivers/gpu/drm/i915/i915_debugfs.c | 35 ++++++++++ drivers/gpu/drm/i915/i915_drv.h | 14 ++++ drivers/gpu/drm/i915/i915_gem_render_state.c | 51 ++++++++++++++ drivers/gpu/drm/i915/intel_pm.c | 49 -------------- drivers/gpu/drm/i915/intel_renderstate_gen8.c | 95 ++++++++++++++++++++------- 5 files changed, 172 insertions(+), 72 deletions(-)
Signature · 1 line
2.0.4
PATCH 1/2 drm/i915/bdw: Apply workarounds using the golden render state
Workarounds for bdw are currently applied in init_clock_gating() but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.
v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
--- drivers/gpu/drm/i915/intel_pm.c | 49 -------------- drivers/gpu/drm/i915/intel_renderstate_gen8.c | 95 ++++++++++++++++++++------- 2 files changed, 72 insertions(+), 72 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -49
@@ -5507,101 +5507,52 @@ static void gen8_init_clock_gating(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;enum pipe pipe;I915_WRITE (WM3_LP_ILK ,0 );I915_WRITE (WM2_LP_ILK ,0 );I915_WRITE (WM1_LP_ILK ,0 );/* FIXME(BDW): Check all the w/a, some might only apply to * pre-production hw. */ -/* WaDisablePartialInstShootdown:bdw */ -I915_WRITE (GEN8_ROW_CHICKEN , -_MASKED_BIT_ENABLE (PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE )); - -/* WaDisableThreadStallDopClockGating:bdw */ -/* FIXME: Unclear whether we really need this on production bdw. */ -I915_WRITE (GEN8_ROW_CHICKEN , -_MASKED_BIT_ENABLE (STALL_DOP_GATING_DISABLE )); - -/* -* This GEN8_CENTROID_PIXEL_OPT_DIS W/A is only needed for -* pre-production hardware -*/ -I915_WRITE (HALF_SLICE_CHICKEN3 , -_MASKED_BIT_ENABLE (GEN8_CENTROID_PIXEL_OPT_DIS )); -I915_WRITE (HALF_SLICE_CHICKEN3 , -_MASKED_BIT_ENABLE (GEN8_SAMPLER_POWER_BYPASS_DIS ));I915_WRITE (GAMTARBMODE ,_MASKED_BIT_ENABLE (ARB_MODE_BWGTLB_DISABLE ));I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN_SDE_LIMIT_FIFO_POLY_DEPTH (2 ))); -I915_WRITE (COMMON_SLICE_CHICKEN2 , -_MASKED_BIT_ENABLE (GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE )); - -I915_WRITE (GEN7_HALF_SLICE_CHICKEN1 , -_MASKED_BIT_ENABLE (GEN7_SINGLE_SUBSCAN_DISPATCH_ENABLE )); - -/* WaDisableDopClockGating:bdw May not be needed for production */ -I915_WRITE (GEN7_ROW_CHICKEN2 , -_MASKED_BIT_ENABLE (DOP_CLOCK_GATING_DISABLE )); -/* WaSwitchSolVfFArbitrationPriority:bdw */ I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |HSW_ECOCHK_ARB_PRIO_SOL );/* WaPsrDPAMaskVBlankInSRD:bdw */ I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |DPA_MASK_VBLANK_SRD );/* WaPsrDPRSUnmaskVBlankInSRD:bdw */ for_each_pipe (pipe) {I915_WRITE (CHICKEN_PIPESL_1 (pipe),I915_READ (CHICKEN_PIPESL_1 (pipe)) |BDW_DPRS_MASK_VBLANK_SRD ); } -/* Use Force Non-Coherent whenever executing a 3D context. This is a -* workaround for for a possible hang in the unlikely event a TLB -* invalidation occurs during a PSD flush. -*/ -I915_WRITE (HDC_CHICKEN0 , -I915_READ (HDC_CHICKEN0 ) | -_MASKED_BIT_ENABLE (HDC_FORCE_NON_COHERENT )); -/* WaVSRefCountFullforceMissDisable:bdw */ /* WaDSRefCountFullforceMissDisable:bdw */ I915_WRITE (GEN7_FF_THREAD_MODE ,I915_READ (GEN7_FF_THREAD_MODE ) & ~(GEN8_FF_DS_REF_CNT_FFME |GEN7_FF_VS_REF_CNT_FFME )); -/* -* BSpec recommends 8x4 when MSAA is used, -* however in practice 16x4 seems fastest. -* -* Note that PS/WM thread counts depend on the WIZ hashing -* disable bit, which we don't touch here, but it's good -* to keep in mind (see 3DSTATE_PS and 3DSTATE_WM). -*/ -I915_WRITE (GEN7_GT_MODE , -GEN6_WIZ_HASHING_MASK | GEN6_WIZ_HASHING_16x4);I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL ,_MASKED_BIT_ENABLE (GEN8_RC_SEMA_IDLE_MSG_DISABLE ));/* WaDisableSDEUnitClockGating:bdw */ I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) |GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* Wa4x4STCOptimizationDisable:bdw */ -I915_WRITE (CACHE_MODE_1 , -_MASKED_BIT_ENABLE (GEN8_4x4_STC_OPTIMIZATION_DISABLE)); }static void haswell_init_clock_gating (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;ilk_init_lp_watermarks (dev);/* L3 caching of data atomics doesn't work -- disable it. */ I915_WRITE (HSW_SCRATCH1 ,HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE );
drivers/gpu/drm/i915/intel_renderstate_gen8.c +72 -23
233 lines not on this page · raw message
Signature · 1 line
2.0.4
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
Quoted 11 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
So far we have put those wa into the render ring init. -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
In reply to Arun SiluveryQuoted 11 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
I'd still prefer just emitting the LRIs from code rather tha mucking about with null batch. Less hoops to jump through when adding a new w/a.
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.
Quoted 8 lines
Quoted 5 lines
v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
I'd still prefer just emitting the LRIs from code rather tha mucking about with null batch. Less hoops to jump through when adding a new w/a.
I agree with this. We should aim to keep null state as per gen. Workaround set is different for gtX inside particular gen so we would need then multiple null states per gen.
After brief chat with Ville, I think that the correct
spot to init the context specific workarounds is after MI_SET_CONTEXT to default and right before null batch is run. If we do these with emitting LRIs to ring, we should be safe as they are then saved with default ctx.
The default ctx is then used as a 'parent' for newly created contexts. Ofcource if registers get globbered, then we inherit crap.
If we have the per gen null state and the ring is initializing workarounds for the default context, then in future we can save this state as 'read only golden context'. And use it as the initial state for all newly created contexts.
Then the full plan how to init would look like this:
#1 reset the gpu (on driver load, on resume or on hang recovery) #2 if we have 'read only golden context', copy it to default ctx #3 switch to default context
#4 if we had 'read only golden context' we are done with the init.
---
#5 if this is driver load thus there is no 'read only golden context' yet. #6 init workarounds through ring LRIs
#7 run null/golden state batch
#8 save this state as a 'read only golden context'
---
#9 for each new context, initialize ctx obj with 'read only golden
context' (either by memcpy or restoring from it when switching to new)
-Mika
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
Quoted 51 lines · Mika Kuoppala
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.Quoted 8 lines
Quoted 5 lines
v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
I'd still prefer just emitting the LRIs from code rather tha mucking about with null batch. Less hoops to jump through when adding a new w/a.
I agree with this. We should aim to keep null state as per gen. Workaround set is different for gtX inside particular gen so we would need then multiple null states per gen.
After brief chat with Ville, I think that the correct
spot to init the context specific workarounds is afterMI_SET_CONTEXTto default and right before null batch is run. If we do these with emitting LRIs to ring, we should be safe as they are then saved with default ctx.The default ctx is then used as a 'parent' for newly created contexts. Ofcource if registers get globbered, then we inherit crap.
If we have the per gen null state and the ring is initializing workarounds for the default context, then in future we can save this state as 'read only golden context'. And use it as the initial state for all newly created contexts.
Then the full plan how to init would look like this:
#1 reset the gpu (on driver load, on resume or on hang recovery) #2 if we have 'read only golden context', copy it to default ctx #3 switch to default context
#4 if we had 'read only golden context' we are done with the init.---
#5 if this is driver load thus there is no 'read only golden context' yet. #6 init workarounds through ring LRIs
#7 run null/golden state batch
#8 save this state as a 'read only golden context'
Quoted 5 lines
---
#9 for each new context, initialize ctx obj with 'read only golden
context' (either by memcpy or restoring from it when switching to new)
I understand applying WAs using null batch has its issues but as I mentioned in the commit msg I will fix this as a follow up patch. It is going to take some time though to change the patch as per the new sequence.
The patch in its current state helps fix WA issues after reset; so it can only be accepted if it is updated as per the new sequence?
regards
Arun
Quoted 3 lines
-Mika
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
Quoted 57 lines · Arun
Quoted 51 lines · Mika Kuoppala
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.Quoted 8 lines
Quoted 5 lines
v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
I'd still prefer just emitting the LRIs from code rather tha mucking about with null batch. Less hoops to jump through when adding a new w/a.
I agree with this. We should aim to keep null state as per gen. Workaround set is different for gtX inside particular gen so we would need then multiple null states per gen.
After brief chat with Ville, I think that the correct
spot to init the context specific workarounds is afterMI_SET_CONTEXTto default and right before null batch is run. If we do these with emitting LRIs to ring, we should be safe as they are then saved with default ctx.The default ctx is then used as a 'parent' for newly created contexts. Ofcource if registers get globbered, then we inherit crap.
If we have the per gen null state and the ring is initializing workarounds for the default context, then in future we can save this state as 'read only golden context'. And use it as the initial state for all newly created contexts.
Then the full plan how to init would look like this:
#1 reset the gpu (on driver load, on resume or on hang recovery) #2 if we have 'read only golden context', copy it to default ctx #3 switch to default context
#4 if we had 'read only golden context' we are done with the init.---
#5 if this is driver load thus there is no 'read only golden context' yet. #6 init workarounds through ring LRIs
#7 run null/golden state batch
#8 save this state as a 'read only golden context'Quoted 5 lines
---
#9 for each new context, initialize ctx obj with 'read only golden
context' (either by memcpy or restoring from it when switching to new)
Quoted 6 lines
I understand applying WAs using null batch has its issues but as I mentioned in the commit msg I will fix this as a follow up patch.
It is going to take some time though to change the patch as per the new sequence.
The patch in its current state helps fix WA issues after reset; so it can only be accepted if it is updated as per the new sequence?
We already have a lot of "let's fix it later" experiments running, so I don't want to overload the ship. So I highly prefer to merge the revised version directly.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
Quoted 65 lines · Daniel Vetter
Quoted 57 lines · Arun
Quoted 51 lines · Mika Kuoppala
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.Quoted 8 lines
Quoted 5 lines
v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
I'd still prefer just emitting the LRIs from code rather tha mucking about with null batch. Less hoops to jump through when adding a new w/a.
I agree with this. We should aim to keep null state as per gen. Workaround set is different for gtX inside particular gen so we would need then multiple null states per gen.
After brief chat with Ville, I think that the correct
spot to init the context specific workarounds is afterMI_SET_CONTEXTto default and right before null batch is run. If we do these with emitting LRIs to ring, we should be safe as they are then saved with default ctx.The default ctx is then used as a 'parent' for newly created contexts. Ofcource if registers get globbered, then we inherit crap.
If we have the per gen null state and the ring is initializing workarounds for the default context, then in future we can save this state as 'read only golden context'. And use it as the initial state for all newly created contexts.
Then the full plan how to init would look like this:
#1 reset the gpu (on driver load, on resume or on hang recovery) #2 if we have 'read only golden context', copy it to default ctx #3 switch to default context
#4 if we had 'read only golden context' we are done with the init.---
#5 if this is driver load thus there is no 'read only golden context' yet. #6 init workarounds through ring LRIs
#7 run null/golden state batch
#8 save this state as a 'read only golden context'Quoted 5 lines
---
#9 for each new context, initialize ctx obj with 'read only golden
context' (either by memcpy or restoring from it when switching to new)Quoted 6 lines
I understand applying WAs using null batch has its issues but as I mentioned in the commit msg I will fix this as a follow up patch.
It is going to take some time though to change the patch as per the new sequence.
The patch in its current state helps fix WA issues after reset; so it can only be accepted if it is updated as per the new sequence?
Quoted 5 lines
We already have a lot of "let's fix it later" experiments running, so I don't want to overload the ship. So I highly prefer to merge the revised version directly.
-Daniel
I understand, a revised version with LRIs emitting from the driver is already submitted and is being reviewed.
regards
Arun
Re: [PATCH 1/2] drm/i915/bdw: Apply workarounds using the golden render state
Quoted 66 lines · Arun
Quoted 65 lines · Daniel Vetter
Quoted 63 lines · Arun
Quoted 51 lines · Mika Kuoppala
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Arun Siluvery
Workarounds for bdw are currently applied in
init_clock_gating()but they are lost following a gpu reset. Some of the WA registers are part of register state context and they are restored with every context switch so initializing them in golden render state ensures that they are applied even when we start with an uninitialized context or during hw initlialization followed by a reset.Quoted 8 lines
Quoted 5 lines
v2: Add comments corresponding to WAs in golden render state (Chris).
The generation of render state is not a straighforward process, it would be ideal to augment WA values from during the setup state as opposed to using a tool but that would be a follow up patch.
I'd still prefer just emitting the LRIs from code rather tha mucking about with null batch. Less hoops to jump through when adding a new w/a.
I agree with this. We should aim to keep null state as per gen. Workaround set is different for gtX inside particular gen so we would need then multiple null states per gen.
After brief chat with Ville, I think that the correct
spot to init the context specific workarounds is afterMI_SET_CONTEXTto default and right before null batch is run. If we do these with emitting LRIs to ring, we should be safe as they are then saved with default ctx.The default ctx is then used as a 'parent' for newly created contexts. Ofcource if registers get globbered, then we inherit crap.
If we have the per gen null state and the ring is initializing workarounds for the default context, then in future we can save this state as 'read only golden context'. And use it as the initial state for all newly created contexts.
Then the full plan how to init would look like this:
#1 reset the gpu (on driver load, on resume or on hang recovery) #2 if we have 'read only golden context', copy it to default ctx #3 switch to default context
#4 if we had 'read only golden context' we are done with the init.---
#5 if this is driver load thus there is no 'read only golden context' yet. #6 init workarounds through ring LRIs
#7 run null/golden state batch
#8 save this state as a 'read only golden context'Quoted 5 lines
---
#9 for each new context, initialize ctx obj with 'read only golden
context' (either by memcpy or restoring from it when switching to new)I understand applying WAs using null batch has its issues but as I mentioned in the commit msg I will fix this as a follow up patch.
It is going to take some time though to change the patch as per the new sequence.
The patch in its current state helps fix WA issues after reset; so it can only be accepted if it is updated as per the new sequence?
Quoted 7 lines
Quoted 5 lines
We already have a lot of "let's fix it later" experiments running, so I don't want to overload the ship. So I highly prefer to merge the revised version directly.
-DanielI understand, a revised version with LRIs emitting from the driver is already submitted and is being reviewed.
Ah, still catching up from my unusable network connection from last week. Please ignore me ;-)
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 2/2 drm/i915/bdw: Extract workaround registers data from golden render state
In reply to Arun SiluveryWorkarounds are applied using golden render state and they are placed at the beginning of this batch buffer. They are essentially register updates and we use this fact to extract them and generate a list of WAs applied. This list is also exported via debugfs file and it is used to validate their status before and after a test condition (eg reset, suspend/resume etc) This patch is only required to support testing.
--- drivers/gpu/drm/i915/i915_debugfs.c | 35 +++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 14 ++++++++ drivers/gpu/drm/i915/i915_gem_render_state.c | 51 ++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +35 -0
@@ -2451,20 +2451,54 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)seq_printf (m," dpll_md: 0x%08x\n" , pll->hw_state.dpll_md);seq_printf (m," fp0: 0x%08x\n" , pll->hw_state.fp0);seq_printf (m," fp1: 0x%08x\n" , pll->hw_state.fp1);seq_printf (m," wrpll: 0x%08x\n" , pll->hw_state.wrpll); }drm_modeset_unlock_all (dev);return 0 ; } +static int intel_wa_registers (struct seq_file *m,void *unused) +{ +struct drm_info_node *node = (struct drm_info_node *) m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +int i; +int ret; + +if (!IS_BROADWELL (dev)) { +DRM_DEBUG_DRIVER ("Workaround table not available\n" ); +return -EINVAL ; + } + + ret =mutex_lock_interruptible (&dev->struct_mutex); +if (ret) +return ret; + +intel_runtime_pm_get (dev_priv); + +seq_printf (m,"Workarounds applied: %d\n" , dev_priv->num_wa_regs); +for (i =0 ; i < dev_priv->num_wa_regs; ++i) { +if (dev_priv->intel_wa_regs[i].addr) +seq_printf (m,"0x%X: 0x%08X, mask: 0x%08X\n" , + dev_priv->intel_wa_regs[i].addr, + dev_priv->intel_wa_regs[i].value, + dev_priv->intel_wa_regs[i].mask); + } + +intel_runtime_pm_put (dev_priv); +mutex_unlock (&dev->struct_mutex); + +return 0 ; +} +struct pipe_crc_info {const char *name;struct drm_device *dev;enum pipe pipe; };static int i915_dp_mst_info (struct seq_file *m,void *unused) {struct drm_info_node *node = (struct drm_info_node *) m->private;struct drm_device *dev = node->minor->dev;
@@ -3980,20 +4014,21 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_llc", i915_llc, 0}, {"i915_edp_psr_status", i915_edp_psr_status, 0}, {"i915_sink_crc_eDP1", i915_sink_crc, 0}, {"i915_energy_uJ", i915_energy_uJ, 0}, {"i915_pc8_status", i915_pc8_status, 0}, {"i915_power_domain_info", i915_power_domain_info, 0}, {"i915_display_info", i915_display_info, 0}, {"i915_semaphore_status", i915_semaphore_status, 0}, {"i915_shared_dplls_info", i915_shared_dplls_info, 0}, {"i915_dp_mst_info", i915_dp_mst_info, 0}, + {"intel_wa_registers", intel_wa_registers, 0}, };#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)static const struct i915_debugfs_files {const char *name;const struct file_operations *fops; } i915_debugfs_files[] = { {"i915_wedged" , &i915_wedged_fops}, {"i915_max_freq" , &i915_max_freq_fops}, {"i915_min_freq", &i915_min_freq_fops},
drivers/gpu/drm/i915/i915_drv.h +14 -0
@@ -1546,20 +1546,34 @@ struct drm_i915_private {wait_queue_head_t pending_flip_queue;#ifdef CONFIG_DEBUG_FS struct intel_pipe_crc pipe_crc[I915_MAX_PIPES ];#endif int num_shared_dpll;struct intel_shared_dpll shared_dplls[I915_NUM_PLLS ];int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ]; +/* +* workarounds are currently applied using golden render state +* and the exact count is known only after parsing its content; +* this patch is mainly for i-g-t so use a fixed number for now. +*/ +#define I915_MAX_WA_REGS 16 +struct { +u32 addr; +u32 value; +/* bitmask representing WA bits */ +u32 mask; + } intel_wa_regs[I915_MAX_WA_REGS ]; +u32 num_wa_regs; +/* Reclocking support */ bool render_reclock_avail;bool lvds_downclock_avail;/* indicates the reduced downclock for LVDS*/ int lvds_downclock;struct i915_frontbuffer_tracking fb_tracking;u16 orig_clock;
drivers/gpu/drm/i915/i915_gem_render_state.c +51 -0
85 lines not on this page · raw message
Signature · 1 line
2.0.4