Refactor HW workaround code
Subsystems (2)
v6 cover Refactor HW workaround code
Until we agree on a design, I have removed all new code to save the actual list of WAs and dump it in debugfs. For the moment, only shuffle things arounds until most WAs are in the same file (and classified correctly according to the type of WA).
From previous versions of these series:
Currently, deciding how/where to apply new workarounds is challenging. Often, workarounds end up applied incorrectly and get lost under certain circumstances (e.g. a context switch or a GPU reset). This is a proposal to attempt to eliminate some of this pain, by clarifying the current classification of workarounds (context saved/restored, global registers, whitelisting, BB), putting them together on the same file, and improving the existing validation infrastructure (debugfs/i-g-t).
Oscar Mateo (6):
drm/i915: Remove Gen9 WAs with no effect
drm/i915: Move a bunch of workaround-related code to its own file drm/i915: Split out functions for different kinds of workarounds drm/i915: Move WA BB stuff to the workarounds file as well drm/i915: Create a new category of display WAs drm/i915: Classify GT & Display WAs correctly
drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_gem.c | 3 + drivers/gpu/drm/i915/i915_gem_context.c | 5 + drivers/gpu/drm/i915/i915_reg.h | 3 - drivers/gpu/drm/i915/intel_engine_cs.c | 682 -------------- drivers/gpu/drm/i915/intel_lrc.c | 264 +----- drivers/gpu/drm/i915/intel_pm.c | 312 +------ drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 - drivers/gpu/drm/i915/intel_workarounds.c | 1432 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 40 + 11 files changed, 1503 insertions(+), 1249 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_workarounds.c create mode 100644 drivers/gpu/drm/i915/intel_workarounds.h
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH v6 1/6 drm/i915: Remove Gen9 WAs with no effect
GEN8_CONFIG0 (0xD00) is a protected by a lock (bit 31) which is set by the BIOS, so there is no way we can enable the three chicken bits mandated by the WA (the BIOS should be doing it instead).
v2: Rebased
v3: Standalone patch
--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 3 --- 2 files changed, 6 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +0 -3
@@ -355,9 +355,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ECOCHK_PPGTT_WT_HSW (0x2<<3)#define ECOCHK_PPGTT_WB_HSW (0x3<<3) -#define GEN8_CONFIG0 _MMIO(0xD00) -#define GEN9_DEFAULT_FIXES (1 << 3 | 1 << 2 | 1 << 1) -#define GAC_ECO_BITS _MMIO(0x14090)#define ECOBITS_SNB_BIT (1<<13)#define ECOBITS_PPGTT_CACHE64B (3<<8)
drivers/gpu/drm/i915/intel_pm.c +0 -3
@@ -75,9 +75,6 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP ); -I915_WRITE (GEN8_CONFIG0 , -I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES ); -/* WaEnableChickenDCPR:skl,bxt,kbl,glk,cfl */ I915_WRITE (GEN8_CHICKEN_DCPR_1 ,I915_READ (GEN8_CHICKEN_DCPR_1 ) |MASK_WAKEMEM );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC PATCH 1/6] drm/i915: Remove Gen9 WAs with no effect
Quoted 34 lines · Oscar Mateo
GEN8_CONFIG0(0xD00) is a protected by a lock (bit 31) which is set by the BIOS, so there is no way we can enable the three chicken bits mandated by the WA (the BIOS should be doing it instead).v2: Rebased
v3: Standalone patchSigned-off-by Oscar Mateo <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 3 --- 2 files changed, 6 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-3@@ -355,9 +355,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ECOCHK_PPGTT_WT_HSW (0x2<<3)#define ECOCHK_PPGTT_WB_HSW (0x3<<3) -#define GEN8_CONFIG0 _MMIO(0xD00) -#define GEN9_DEFAULT_FIXES (1 << 3 | 1 << 2 | 1 << 1) -#define GAC_ECO_BITS _MMIO(0x14090)#define ECOBITS_SNB_BIT (1<<13)#define ECOBITS_PPGTT_CACHE64B (3<<8)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void gen9_init_clock_gating(struct drm_i915_private *dev_priv) · line 80
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +0
-3@@ -75,9 +75,6 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP ); -I915_WRITE (GEN8_CONFIG0 , -I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES ); -
I am pondering if we should do a verifying read for workarounds and chickens in general.
Also my kbl bios seem to omit all of these with lock being on :P
Patch is,
-Mika
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0/* WaEnableChickenDCPR:skl,bxt,kbl,glk,cfl */ I915_WRITE (GEN8_CHICKEN_DCPR_1 ,I915_READ (GEN8_CHICKEN_DCPR_1 ) |MASK_WAKEMEM );Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC PATCH 1/6] drm/i915: Remove Gen9 WAs with no effect
Quoting Mika Kuoppala (2017-11-09 11:42:45)
Quoted 39 lines
Quoted 37 lines · Oscar Mateo
GEN8_CONFIG0(0xD00) is a protected by a lock (bit 31) which is set by the BIOS, so there is no way we can enable the three chicken bits mandated by the WA (the BIOS should be doing it instead).v2: Rebased
v3: Standalone patchSigned-off-by Oscar Mateo <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 3 --- 2 files changed, 6 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-3@@ -355,9 +355,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ECOCHK_PPGTT_WT_HSW (0x2<<3)#define ECOCHK_PPGTT_WB_HSW (0x3<<3) -#define GEN8_CONFIG0 _MMIO(0xD00) -#define GEN9_DEFAULT_FIXES (1 << 3 | 1 << 2 | 1 << 1) -#define GAC_ECO_BITS _MMIO(0x14090)#define ECOBITS_SNB_BIT (1<<13)#define ECOBITS_PPGTT_CACHE64B (3<<8)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -75,9 +75,6 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP );
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c static void gen9_init_clock_gating(struct drm_i915_private *dev_priv) · line 80
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +0
-3-I915_WRITE (GEN8_CONFIG0 , -I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES ); -I am pondering if we should do a verifying read for workarounds and chickens in general.
We are getting into the igt/tools/intel_workarounds territory. i.e. not the regression checker, but a tool that checks that all known workarounds are applied for the platform. The debate is whether such a tool should be entirely independent of the kernel (carrying its own w/a db) or if we put the entire db into the kernel. I can see arguments in favour of both...
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC PATCH 1/6] drm/i915: Remove Gen9 WAs with no effect
In reply to Mika KuoppalaQuoting Mika Kuoppala (2017-11-09 11:42:45)
Quoted 46 lines
Quoted 34 lines · Oscar Mateo
GEN8_CONFIG0(0xD00) is a protected by a lock (bit 31) which is set by the BIOS, so there is no way we can enable the three chicken bits mandated by the WA (the BIOS should be doing it instead).v2: Rebased
v3: Standalone patchSigned-off-by Oscar Mateo <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 --- drivers/gpu/drm/i915/intel_pm.c | 3 --- 2 files changed, 6 deletions(-)drivers/gpu/drm/i915/i915_reg.h +0
-3@@ -355,9 +355,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ECOCHK_PPGTT_WT_HSW (0x2<<3)#define ECOCHK_PPGTT_WB_HSW (0x3<<3) -#define GEN8_CONFIG0 _MMIO(0xD00) -#define GEN9_DEFAULT_FIXES (1 << 3 | 1 << 2 | 1 << 1) -#define GAC_ECO_BITS _MMIO(0x14090)#define ECOBITS_SNB_BIT (1<<13)#define ECOBITS_PPGTT_CACHE64B (3<<8)drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void gen9_init_clock_gating(struct drm_i915_private *dev_priv) · line 80
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +0
-3@@ -75,9 +75,6 @@ static void gen9_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP ); -I915_WRITE (GEN8_CONFIG0 , -I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES ); -I am pondering if we should do a verifying read for workarounds and chickens in general.
Quoted 4 lines
Also my kbl bios seem to omit all of these with lock being on :P
Patch is,
Reviewed-by Mika Kuoppala <[email protected]>
Added
References: b033bb6d5d3a ("drm/i915/gen9: Enable must set chicken bits in config0 reg")
and pushed. Thanks for the patch,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH v6 2/6 drm/i915: Move a bunch of workaround-related code to its own file
In reply to Oscar MateoThis has grown to be a sizable amount of code, so move it to its own file before we try to refactor anything. For the moment, we are leaving behind the WA BB code and the WAs that get applied (incorrectly) in init_clock_gating, but we will deal with it later.
v2: Use intel_ prefix for code that deals with the hardware (Chris)
v3: Rebased
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/intel_engine_cs.c | 682 ----------------------------- drivers/gpu/drm/i915/intel_lrc.c | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + drivers/gpu/drm/i915/intel_ringbuffer.h | 3 - drivers/gpu/drm/i915/intel_workarounds.c | 708 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 31 ++ 7 files changed, 743 insertions(+), 686 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_workarounds.c create mode 100644 drivers/gpu/drm/i915/intel_workarounds.h
drivers/gpu/drm/i915/Makefile +2 -1
@@ -42,7 +42,8 @@ i915-y := i915_drv.o \ intel_csr.o \ intel_device_info.o \ intel_pm.o \ - intel_runtime_pm.o + intel_runtime_pm.o \ + intel_workarounds.o i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o
drivers/gpu/drm/i915/intel_engine_cs.c +0 -682
688 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.c +1 -0
@@ -137,6 +137,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" #include "intel_mocs.h" +#include "intel_workarounds.h" #define RING_EXECLIST_QFULL (1 << 0x2)#define RING_EXECLIST1_VALID (1 << 0x3)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -0
@@ -33,6 +33,7 @@#include <drm/i915_drm.h> #include "i915_trace.h" #include "intel_drv.h" +#include "intel_workarounds.h" /* Rough estimate of the typical request size, performing a flush, * set-context and then emitting the batch.
drivers/gpu/drm/i915/intel_ringbuffer.h +0 -3
@@ -767,9 +767,6 @@ static inline u32 intel_engine_last_submit(struct intel_engine_cs *engine)return READ_ONCE (engine->timeline->seqno); } -int init_workarounds_ring (struct intel_engine_cs *engine); -int intel_ring_workarounds_emit (struct drm_i915_gem_request *req); -void intel_engine_get_instdone (struct intel_engine_cs *engine,struct intel_instdone *instdone);
drivers/gpu/drm/i915/intel_workarounds.c new file +708 -0
708 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ + +#ifndef _I915_WORKAROUNDS_H_ +#define _I915_WORKAROUNDS_H_ + +int init_workarounds_ring (struct intel_engine_cs *engine); +int intel_ring_workarounds_emit (struct drm_i915_gem_request *req); + +#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH v6 3/6 drm/i915: Split out functions for different kinds of workarounds
In reply to Oscar MateoThere are different kind of workarounds (those that modify registers that live in the context image, those that modify global registers, those that whitelist registers, etc...) and they have different requirements in terms of where they are applied and how. Also, by splitting them apart, it should be easier to decide where a new workaround should go.
v2:
- Add multiple MISSING_CASE
- Rebased
v3:
- Rename mmio_workarounds to gt_workarounds (Chris, Mika)
- Create empty placeholders for BDW and CHV GT WAs
- Rebased
--- drivers/gpu/drm/i915/i915_gem.c | 3 + drivers/gpu/drm/i915/i915_gem_context.c | 5 + drivers/gpu/drm/i915/intel_lrc.c | 10 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +- drivers/gpu/drm/i915/intel_workarounds.c | 714 +++++++++++++++++++------------ drivers/gpu/drm/i915/intel_workarounds.h | 8 +- 6 files changed, 458 insertions(+), 286 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +3 -0
@@ -35,6 +35,7 @@#include "intel_drv.h" #include "intel_frontbuffer.h" #include "intel_mocs.h" +#include "intel_workarounds.h" #include "i915_gemfs.h" #include <linux/dma-fence-array.h> #include <linux/kthread.h>
@@ -4915,6 +4916,8 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) } } +intel_gt_workarounds_apply (dev_priv); +i915_gem_init_swizzling (dev_priv);/*
drivers/gpu/drm/i915/i915_gem_context.c +5 -0
@@ -90,6 +90,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" +#include "intel_workarounds.h" #define ALL_L3_SLICES (dev) (1 << NUM_L3_SLICES(dev)) - 1
@@ -456,6 +457,10 @@ int i915_gem_contexts_init(struct drm_i915_private *dev_priv)GEM_BUG_ON (dev_priv->kernel_context); + err =intel_ctx_workarounds_init (dev_priv); +if (err) + goto err; +INIT_LIST_HEAD (&dev_priv->contexts.list);INIT_WORK (&dev_priv->contexts.free_work, contexts_free_worker);init_llist_head (&dev_priv->contexts.free_list);
drivers/gpu/drm/i915/intel_lrc.c +7 -3
@@ -1503,7 +1503,7 @@ static int gen8_init_render_ring(struct intel_engine_cs *engine)I915_WRITE (INSTPM ,_MASKED_BIT_ENABLE (INSTPM_FORCE_ORDERING )); -return init_workarounds_ring (engine); +return 0 ; }static int gen9_init_render_ring (struct intel_engine_cs *engine)
@@ -1514,7 +1514,11 @@ static int gen9_init_render_ring(struct intel_engine_cs *engine)if (ret)return ret; -return init_workarounds_ring (engine); + ret =intel_whitelist_workarounds_apply (engine); +if (ret) +return ret; + +return 0 ; } static void reset_common_ring(struct intel_engine_cs *engine,
@@ -1830,7 +1834,7 @@ static int gen8_init_rcs_context(struct drm_i915_gem_request *req) {int ret; - ret =intel_ring_workarounds_emit (req); + ret =intel_ctx_workarounds_emit (req);if (ret)return ret;
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -2
@@ -649,7 +649,7 @@ static int intel_rcs_ctx_init(struct drm_i915_gem_request *req) {int ret; - ret =intel_ring_workarounds_emit (req); + ret =intel_ctx_workarounds_emit (req);if (ret !=0 )return ret;
@@ -708,7 +708,7 @@ static int init_render_ring(struct intel_engine_cs *engine)if (INTEL_INFO (dev_priv)->gen >=6 )I915_WRITE_IMR (engine, ~engine->irq_keep_mask); -return init_workarounds_ring (engine); +return 0 ; }static void render_ring_cleanup (struct intel_engine_cs *engine)
drivers/gpu/drm/i915/intel_workarounds.c +435 -279
867 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +6 -2
@@ -25,7 +25,11 @@#ifndef _I915_WORKAROUNDS_H_#define _I915_WORKAROUNDS_H_ -int init_workarounds_ring (struct intel_engine_cs *engine); -int intel_ring_workarounds_emit (struct drm_i915_gem_request *req); +int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv); +int intel_ctx_workarounds_emit (struct drm_i915_gem_request *req); + +void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv); + +int intel_whitelist_workarounds_apply (struct intel_engine_cs *engine);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH v6 4/6 drm/i915: Move WA BB stuff to the workarounds file as well
In reply to Oscar MateoSince we are trying to put all WA stuff together, do not forget about the BB WAs.
v2: s/intel_bb_workarounds_init/intel_engine_init_bb_workarounds (Chris)
v3: Rebased to before the WAs are stored
--- drivers/gpu/drm/i915/intel_lrc.c | 253 +----------------------------- drivers/gpu/drm/i915/intel_workarounds.c | 254 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 3 + 3 files changed, 259 insertions(+), 251 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +2 -251
@@ -1181,255 +1181,6 @@ static int execlists_request_alloc(struct drm_i915_gem_request *request)return 0 ; } -/* -* In this WA we need to set GEN8_L3SQCREG4[21:21] and reset it after -* PIPE_CONTROL instruction. This is required for the flush to happen correctly -* but there is a slight complication as this is applied in WA batch where the -* values are only initialized once so we cannot take register value at the -* beginning and reuse it further; hence we save its value to memory, upload a -* constant value with bit21 set and then we restore it back with the saved value. -* To simplify the WA, a constant value is formed by using the default value -* of this register. This shouldn't be a problem because we are only modifying -* it for a short period and this batch in non-premptible. We can ofcourse -* use additional instructions that read the actual value of the register -* at that time and set our bit of interest but it makes the WA complicated. -* -* This WA is also required for Gen9 so extracting as a function avoids -* code duplication. -*/ -static u32 * -gen8_emit_flush_coherentl3_wa (struct intel_engine_cs *engine,u32 *batch) -{ - *batch++ =MI_STORE_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ; - *batch++ =i915_mmio_reg_offset (GEN8_L3SQCREG4 ); - *batch++ =i915_ggtt_offset (engine->scratch) +256 ; - *batch++ =0 ; - - *batch++ =MI_LOAD_REGISTER_IMM (1 ); - *batch++ =i915_mmio_reg_offset (GEN8_L3SQCREG4 ); - *batch++ =0x40400000 |GEN8_LQSC_FLUSH_COHERENT_LINES ; - - batch =gen8_emit_pipe_control (batch, -PIPE_CONTROL_CS_STALL | -PIPE_CONTROL_DC_FLUSH_ENABLE , -0 ); - - *batch++ =MI_LOAD_REGISTER_MEM_GEN8 |MI_SRM_LRM_GLOBAL_GTT ; - *batch++ =i915_mmio_reg_offset (GEN8_L3SQCREG4 ); - *batch++ =i915_ggtt_offset (engine->scratch) +256 ; - *batch++ =0 ; - -return batch; -} - -/* -* Typically we only have one indirect_ctx and per_ctx batch buffer which are -* initialized at the beginning and shared across all contexts but this field -* helps us to have multiple batches at different offsets and select them based -* on a criteria. At the moment this batch always start at the beginning of the page -* and at this point we don't have multiple wa_ctx batch buffers. -* -* The number of WA applied are not known at the beginning; we use this field -* to return the no of DWORDS written. -* -* It is to be noted that this batch does not contain MI_BATCH_BUFFER_END -* so it adds NOOPs as padding to make it cacheline aligned. -* MI_BATCH_BUFFER_END will be added to perctx batch and both of them together -* makes a complete batch buffer. -*/ -static u32 *gen8_init_indirectctx_bb (struct intel_engine_cs *engine,u32 *batch) -{ -/* WaDisableCtxRestoreArbitration:bdw,chv */ - *batch++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; - -/* WaFlushCoherentL3CacheLinesAtContextSwitch:bdw */ -if (IS_BROADWELL (engine->i915)) - batch =gen8_emit_flush_coherentl3_wa (engine, batch); - -/* WaClearSlmSpaceAtContextSwitch:bdw,chv */ -/* Actual scratch location is at 128 bytes offset */ - batch =gen8_emit_pipe_control (batch, -PIPE_CONTROL_FLUSH_L3 | -PIPE_CONTROL_GLOBAL_GTT_IVB | -PIPE_CONTROL_CS_STALL | -PIPE_CONTROL_QW_WRITE , -i915_ggtt_offset (engine->scratch) + -2 *CACHELINE_BYTES ); - - *batch++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; - -/* Pad to end of cacheline */ -while ((unsigned long )batch %CACHELINE_BYTES ) - *batch++ =MI_NOOP ; - -/* -* MI_BATCH_BUFFER_END is not required in Indirect ctx BB because -* execution depends on the length specified in terms of cache lines -* in the register CTX_RCS_INDIRECT_CTX -*/ - -return batch; -} - -static u32 *gen9_init_indirectctx_bb (struct intel_engine_cs *engine,u32 *batch) -{ - *batch++ =MI_ARB_ON_OFF |MI_ARB_DISABLE ; - -/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt,glk */ - batch =gen8_emit_flush_coherentl3_wa (engine, batch); - -/* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl,glk */ - *batch++ =MI_LOAD_REGISTER_IMM (1 ); - *batch++ =i915_mmio_reg_offset (COMMON_SLICE_CHICKEN2 ); - *batch++ =_MASKED_BIT_DISABLE ( -GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE ); - *batch++ =MI_NOOP ; - -/* WaClearSlmSpaceAtContextSwitch:kbl */ -/* Actual scratch location is at 128 bytes offset */ -if (IS_KBL_REVID (engine->i915,0 ,KBL_REVID_A0 )) { - batch =gen8_emit_pipe_control (batch, -PIPE_CONTROL_FLUSH_L3 | -PIPE_CONTROL_GLOBAL_GTT_IVB | -PIPE_CONTROL_CS_STALL | -PIPE_CONTROL_QW_WRITE , -i915_ggtt_offset (engine->scratch) - +2 *CACHELINE_BYTES ); - } - -/* WaMediaPoolStateCmdInWABB:bxt,glk */ -if (HAS_POOLED_EU (engine->i915)) { -/* -* EU pool configuration is setup along with golden context -* during context initialization. This value depends on -* device type (2x6 or 3x6) and needs to be updated based -* on which subslice is disabled especially for 2x6 -* devices, however it is safe to load default -* configuration of 3x6 device instead of masking off -* corresponding bits because HW ignores bits of a disabled -* subslice and drops down to appropriate config. Please -* see render_state_setup() in i915_gem_render_state.c for -* possible configurations, to avoid duplication they are -* not shown here again. -*/ - *batch++ =GEN9_MEDIA_POOL_STATE ; - *batch++ =GEN9_MEDIA_POOL_ENABLE ; - *batch++ =0x00777000 ; - *batch++ =0 ; - *batch++ =0 ; - *batch++ =0 ; - } - - *batch++ =MI_ARB_ON_OFF |MI_ARB_ENABLE ; - -/* Pad to end of cacheline */ -while ((unsigned long )batch %CACHELINE_BYTES ) - *batch++ =MI_NOOP ; - -return batch; -} - -#define CTX_WA_BB_OBJ_SIZE (PAGE_SIZE) - -static int lrc_setup_wa_ctx (struct intel_engine_cs *engine) -{ -struct drm_i915_gem_object *obj; -struct i915_vma *vma; -int err; - - obj =i915_gem_object_create (engine->i915,CTX_WA_BB_OBJ_SIZE ); -if (IS_ERR (obj)) -return PTR_ERR (obj); - - vma =i915_vma_instance (obj, &engine->i915->ggtt.base,NULL ); -if (IS_ERR (vma)) { - err =PTR_ERR (vma); - goto err; - } - - err =i915_vma_pin (vma,0 ,PAGE_SIZE ,PIN_GLOBAL |PIN_HIGH ); -if (err) - goto err; - - engine->wa_ctx.vma = vma; -return 0 ; - -err: -i915_gem_object_put (obj); -return err; -} - -static void lrc_destroy_wa_ctx (struct intel_engine_cs *engine) -{ -i915_vma_unpin_and_release (&engine->wa_ctx.vma); -} - -typedef u32 *(*wa_bb_func_t )(struct intel_engine_cs *engine,u32 *batch); - -static int intel_init_workaround_bb (struct intel_engine_cs *engine) -{ -struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx; -struct i915_wa_ctx_bb *wa_bb[2 ] = { &wa_ctx->indirect_ctx, - &wa_ctx->per_ctx }; -wa_bb_func_t wa_bb_fn[2 ]; -struct page *page; -void *batch, *batch_ptr; -unsigned int i; -int ret; - -if (WARN_ON (engine->id !=RCS || !engine->scratch)) -return -EINVAL ; - -switch (INTEL_GEN (engine->i915)) { -case 10 : -return 0 ; -case 9 : - wa_bb_fn[0 ] = gen9_init_indirectctx_bb; - wa_bb_fn[1 ] =NULL ; -break ; -case 8 : - wa_bb_fn[0 ] = gen8_init_indirectctx_bb; - wa_bb_fn[1 ] =NULL ; -break ; -default : -MISSING_CASE (INTEL_GEN (engine->i915)); -return 0 ; - } - - ret =lrc_setup_wa_ctx (engine); -if (ret) { -DRM_DEBUG_DRIVER ("Failed to setup context WA page: %d\n" , ret); -return ret; - } - - page =i915_gem_object_get_dirty_page (wa_ctx->vma->obj,0 ); - batch = batch_ptr =kmap_atomic (page); - -/* -* Emit the two workaround batch buffers, recording the offset from the -* start of the workaround batch buffer object for each and their -* respective sizes. -*/ -for (i =0 ; i <ARRAY_SIZE (wa_bb_fn); i++) { - wa_bb[i]->offset = batch_ptr - batch; -if (WARN_ON (!IS_ALIGNED (wa_bb[i]->offset,CACHELINE_BYTES ))) { - ret = -EINVAL ; -break ; - } -if (wa_bb_fn[i]) - batch_ptr = wa_bb_fn[i](engine, batch_ptr); - wa_bb[i]->size = batch_ptr - (batch + wa_bb[i]->offset); - } - -BUG_ON (batch_ptr - batch >CTX_WA_BB_OBJ_SIZE ); - -kunmap_atomic (batch); -if (ret) -lrc_destroy_wa_ctx (engine); - -return ret; -} -static u8 gtiir[] = { [RCS ] =0 , [BCS ] =0 ,
@@ -1875,7 +1626,7 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *engine)intel_engine_cleanup_common (engine); -lrc_destroy_wa_ctx (engine); +intel_engine_fini_bb_workarounds (engine); engine->i915 =NULL ; dev_priv->engine[engine->id] =NULL ;kfree (engine);
@@ -1994,7 +1745,7 @@ int logical_render_ring_init(struct intel_engine_cs *engine)if (ret)return ret; - ret =intel_init_workaround_bb (engine); + ret =intel_engine_init_bb_workarounds (engine);if (ret) {/* * We continue even if we fail to initialize WA batch
drivers/gpu/drm/i915/intel_workarounds.c +254 -0
257 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +3 -0
@@ -32,4 +32,7 @@int intel_whitelist_workarounds_apply (struct intel_engine_cs *engine); +int intel_engine_init_bb_workarounds (struct intel_engine_cs *engine); +void intel_engine_fini_bb_workarounds (struct intel_engine_cs *engine); +#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH v6 5/6 drm/i915: Create a new category of display WAs
In reply to Oscar MateoDisplay workarounds do not need to be re-applied on a GPU reset (this is, in Ville's words: "at the very least wasted effort [...] and could even be actively harmful in case we end up clobbering something the current display configuration depends on"). Therefore, they have to be applied in a different place that GT ones so they deserve their own category.
Initially, populate this with the WAs that were being applied in init_clock_gating. Actually discriminating which of these WAS is a real display WA, a GT WA or a context WA is left for the next patch (as it requires a good deal of careful review).
v2: Rebased to carry the init_early nomenclature over (Chris) v3:
- Rebased to before the WAs are stored
- Initially populate with all WAs in init_clock_gating
--- drivers/gpu/drm/i915/intel_pm.c | 309 +----------------------------- drivers/gpu/drm/i915/intel_workarounds.c | 315 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 2 + 3 files changed, 325 insertions(+), 301 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +8 -301
@@ -29,6 +29,7 @@#include <drm/drm_plane_helper.h> #include "i915_drv.h" #include "intel_drv.h" +#include "intel_workarounds.h" #include "../../../platform/x86/intel_ips.h" #include <linux/module.h> #include <drm/drm_atomic_helper.h>
@@ -56,98 +57,6 @@#define INTEL_RC6p_ENABLE (1<<1)#define INTEL_RC6pp_ENABLE (1<<2) -static void gen9_init_clock_gating (struct drm_i915_private *dev_priv) -{ -if (HAS_LLC (dev_priv)) { -/* -* WaCompressedResourceDisplayNewHashMode:skl,kbl -* Display WA#0390: skl,kbl -* -* Must match Sampler, Pixel Back End, and Media. See -* WaCompressedResourceSamplerPbeMediaNewHashMode. -*/ -I915_WRITE (CHICKEN_PAR1_1 , -I915_READ (CHICKEN_PAR1_1 ) | -SKL_DE_COMPRESSED_HASH_MODE ); - } - -/* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl,cfl */ -I915_WRITE (CHICKEN_PAR1_1 , -I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP ); - -/* WaEnableChickenDCPR:skl,bxt,kbl,glk,cfl */ -I915_WRITE (GEN8_CHICKEN_DCPR_1 , -I915_READ (GEN8_CHICKEN_DCPR_1 ) |MASK_WAKEMEM ); - -/* WaFbcTurnOffFbcWatermark:skl,bxt,kbl,cfl */ -/* WaFbcWakeMemOn:skl,bxt,kbl,glk,cfl */ -I915_WRITE (DISP_ARB_CTL ,I915_READ (DISP_ARB_CTL ) | -DISP_FBC_WM_DIS | -DISP_FBC_MEMORY_WAKE ); - -/* WaFbcHighMemBwCorruptionAvoidance:skl,bxt,kbl,cfl */ -I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) | -ILK_DPFC_DISABLE_DUMMY0 ); - -if (IS_SKYLAKE (dev_priv)) { -/* WaDisableDopClockGating */ -I915_WRITE (GEN7_MISCCPCTL ,I915_READ (GEN7_MISCCPCTL ) - & ~GEN7_DOP_CLOCK_GATE_ENABLE ); - } -} - -static void bxt_init_clock_gating (struct drm_i915_private *dev_priv) -{ -gen9_init_clock_gating (dev_priv); - -/* 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. -*/ -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ ); - -/* -* Wa: Backlight PWM may stop in the asserted state, causing backlight -* to stay fully on. -*/ -I915_WRITE (GEN9_CLKGATE_DIS_0 ,I915_READ (GEN9_CLKGATE_DIS_0 ) | -PWM1_GATING_DIS |PWM2_GATING_DIS ); -} - -static void glk_init_clock_gating (struct drm_i915_private *dev_priv) -{ -u32 val; -gen9_init_clock_gating (dev_priv); - -/* -* WaDisablePWMClockGating:glk -* Backlight PWM may stop in the asserted state, causing backlight -* to stay fully on. -*/ -I915_WRITE (GEN9_CLKGATE_DIS_0 ,I915_READ (GEN9_CLKGATE_DIS_0 ) | -PWM1_GATING_DIS |PWM2_GATING_DIS ); - -/* WaDDIIOTimeout:glk */ -if (IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A1 )) { -u32 val =I915_READ (CHICKEN_MISC_2 ); - val &= ~(GLK_CL0_PWR_DOWN | -GLK_CL1_PWR_DOWN | -GLK_CL2_PWR_DOWN ); -I915_WRITE (CHICKEN_MISC_2 , val); - } - -/* Display WA #1133: WaFbcSkipSegments:glk */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); -} -static void i915_pineview_get_mem_freq (struct drm_i915_private *dev_priv) {u32 tmp;
@@ -8484,167 +8393,9 @@ static void lpt_suspend_hw(struct drm_i915_private *dev_priv) } } -static void gen8_set_l3sqc_credits (struct drm_i915_private *dev_priv, -int general_prio_credits, -int high_prio_credits) -{ -u32 misccpctl; -u32 val; - -/* WaTempDisableDOPClkGating:bdw */ - misccpctl =I915_READ (GEN7_MISCCPCTL ); -I915_WRITE (GEN7_MISCCPCTL , misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE ); - - val =I915_READ (GEN8_L3SQCREG1 ); - val &= ~L3_PRIO_CREDITS_MASK ; - val |=L3_GENERAL_PRIO_CREDITS (general_prio_credits); - val |=L3_HIGH_PRIO_CREDITS (high_prio_credits); -I915_WRITE (GEN8_L3SQCREG1 , val); - -/* -* Wait at least 100 clocks before re-enabling clock gating. -* See the definition of L3SQCREG1 in BSpec. -*/ -POSTING_READ (GEN8_L3SQCREG1 ); -udelay (1 ); -I915_WRITE (GEN7_MISCCPCTL , misccpctl); -} - -static void cnp_init_clock_gating (struct drm_i915_private *dev_priv) -{ -if (!HAS_PCH_CNP (dev_priv)) -return ; - -/* Wa #1181 */ -I915_WRITE (SOUTH_DSPCLK_GATE_D ,I915_READ (SOUTH_DSPCLK_GATE_D ) | -CNP_PWM_CGE_GATING_DISABLE ); -} - -static void cnl_init_clock_gating (struct drm_i915_private *dev_priv) -{ -u32 val; -cnp_init_clock_gating (dev_priv); - -/* This is not an Wa. Enable for better image quality */ -I915_WRITE (_3D_CHICKEN3, -_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE)); - -/* WaEnableChickenDCPR:cnl */ -I915_WRITE (GEN8_CHICKEN_DCPR_1 , -I915_READ (GEN8_CHICKEN_DCPR_1 ) |MASK_WAKEMEM ); - -/* WaFbcWakeMemOn:cnl */ -I915_WRITE (DISP_ARB_CTL ,I915_READ (DISP_ARB_CTL ) | -DISP_FBC_MEMORY_WAKE ); - -/* WaSarbUnitClockGatingDisable:cnl (pre-prod) */ -if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) -I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , -I915_READ (SLICE_UNIT_LEVEL_CLKGATE ) | -SARBUNIT_CLKGATE_DIS ); - -/* Display WA #1133: WaFbcSkipSegments:cnl */ - val =I915_READ (ILK_DPFC_CHICKEN ); - val &= ~GLK_SKIP_SEG_COUNT_MASK ; - val |=GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 ); -I915_WRITE (ILK_DPFC_CHICKEN , val); -} - -static void cfl_init_clock_gating (struct drm_i915_private *dev_priv) -{ -cnp_init_clock_gating (dev_priv); -gen9_init_clock_gating (dev_priv); - -/* WaFbcNukeOnHostModify:cfl */ -I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) | -ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); -} - -static void kbl_init_clock_gating (struct drm_i915_private *dev_priv) -{ -gen9_init_clock_gating (dev_priv); - -/* WaDisableSDEUnitClockGating:kbl */ -if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableGamClockGating:kbl */ -if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_GAMUNIT_CLOCK_GATE_DISABLE ); - -/* WaFbcNukeOnHostModify:kbl */ -I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) | -ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); -} - -static void skl_init_clock_gating (struct drm_i915_private *dev_priv) -{ -gen9_init_clock_gating (dev_priv); - -/* WAC6entrylatency:skl */ -I915_WRITE (FBC_LLC_READ_CTRL ,I915_READ (FBC_LLC_READ_CTRL ) | -FBC_LLC_FULLY_OPEN ); - -/* WaFbcNukeOnHostModify:skl */ -I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) | -ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); -} -static void bdw_init_clock_gating (struct drm_i915_private *dev_priv) { -/* The GTT cache must be disabled if the system is using 2M pages. */ -bool can_use_gtt_cache = !HAS_PAGE_SIZES (dev_priv, -I915_GTT_PAGE_SIZE_2M ); -enum pipe pipe; - -/* 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 (dev_priv, pipe) { -I915_WRITE (CHICKEN_PIPESL_1 (pipe), -I915_READ (CHICKEN_PIPESL_1 (pipe)) | -BDW_DPRS_MASK_VBLANK_SRD ); - } - -/* 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 )); - -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 ); - -/* WaProgramL3SqcReg1Default:bdw */ -gen8_set_l3sqc_credits (dev_priv,30 ,2 ); - -/* WaGttCachingOffByDefault:bdw */ -I915_WRITE (HSW_GTT_CACHE_EN , can_use_gtt_cache ?GTT_CACHE_EN_ALL :0 ); - -/* WaKVMNotificationOnConfigChange:bdw */ -I915_WRITE (CHICKEN_PAR2_1 ,I915_READ (CHICKEN_PAR2_1 ) - |KVM_CONFIG_CHANGE_NOTIFICATION_SELECT ); -lpt_init_clock_gating (dev_priv); - -/* WaDisableDopClockGating:bdw -* -* Also see the CHICKEN2 write in bdw_init_workarounds() to disable DOP -* clock gating. -*/ -I915_WRITE (GEN6_UCGCTL1 , -I915_READ (GEN6_UCGCTL1 ) |GEN6_EU_TCUNIT_CLOCK_GATE_DISABLE ); }static void hsw_init_clock_gating (struct drm_i915_private *dev_priv)
@@ -8870,40 +8621,6 @@ static void vlv_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (VLV_GUNIT_CLOCK_GATE ,GCFG_DIS ); } -static void chv_init_clock_gating (struct drm_i915_private *dev_priv) -{ -/* WaVSRefCountFullforceMissDisable:chv */ -/* WaDSRefCountFullforceMissDisable:chv */ -I915_WRITE (GEN7_FF_THREAD_MODE , -I915_READ (GEN7_FF_THREAD_MODE ) & - ~(GEN8_FF_DS_REF_CNT_FFME |GEN7_FF_VS_REF_CNT_FFME )); - -/* WaDisableSemaphoreAndSyncFlipWait:chv */ -I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , -_MASKED_BIT_ENABLE (GEN8_RC_SEMA_IDLE_MSG_DISABLE )); - -/* WaDisableCSUnitClockGating:chv */ -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_CSUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableSDEUnitClockGating:chv */ -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* -* WaProgramL3SqcReg1Default:chv -* See gfxspecs/Related Documents/Performance Guide/ -* LSQC Setting Recommendations. -*/ -gen8_set_l3sqc_credits (dev_priv,38 ,2 ); - -/* -* GTT cache may not work with big pages, so if those -* are ever enabled GTT cache may need to be disabled. -*/ -I915_WRITE (HSW_GTT_CACHE_EN ,GTT_CACHE_EN_ALL ); -} -static void g4x_init_clock_gating (struct drm_i915_private *dev_priv) {uint32_t dspclk_gate;
@@ -9005,6 +8722,7 @@ static void i830_init_clock_gating(struct drm_i915_private *dev_priv)void intel_init_clock_gating (struct drm_i915_private *dev_priv) { dev_priv->display.init_clock_gating (dev_priv); +intel_disp_workarounds_apply (dev_priv); }void intel_suspend_hw (struct drm_i915_private *dev_priv)
@@ -9023,28 +8741,17 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)* @dev_priv: device private * * Setup the hooks that configure which clocks of a given platform can be -* gated and also apply various GT and display specific workarounds for these -* platforms. Note that some GT specific workarounds are applied separately -* when GPU contexts or batchbuffers start their execution. +* gated. */ void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) { -if (IS_CANNONLAKE (dev_priv)) - dev_priv->display.init_clock_gating = cnl_init_clock_gating; -else if (IS_COFFEELAKE (dev_priv)) - dev_priv->display.init_clock_gating = cfl_init_clock_gating; -else if (IS_SKYLAKE (dev_priv)) - dev_priv->display.init_clock_gating = skl_init_clock_gating; -else if (IS_KABYLAKE (dev_priv)) - dev_priv->display.init_clock_gating = kbl_init_clock_gating; -else if (IS_BROXTON (dev_priv)) - dev_priv->display.init_clock_gating = bxt_init_clock_gating; -else if (IS_GEMINILAKE (dev_priv)) - dev_priv->display.init_clock_gating = glk_init_clock_gating; +if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv) || +IS_GEMINILAKE (dev_priv) ||IS_KABYLAKE (dev_priv) || +IS_BROXTON (dev_priv) ||IS_SKYLAKE (dev_priv) || +IS_CHERRYVIEW (dev_priv)) + dev_priv->display.init_clock_gating = nop_init_clock_gating;else if (IS_BROADWELL (dev_priv)) dev_priv->display.init_clock_gating = bdw_init_clock_gating; -else if (IS_CHERRYVIEW (dev_priv)) - dev_priv->display.init_clock_gating = chv_init_clock_gating;else if (IS_HASWELL (dev_priv)) dev_priv->display.init_clock_gating = hsw_init_clock_gating;else if (IS_IVYBRIDGE (dev_priv))
drivers/gpu/drm/i915/intel_workarounds.c +315 -0
321 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +2 -0
@@ -30,6 +30,8 @@void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv); +void intel_disp_workarounds_apply (struct drm_i915_private *dev_priv); +int intel_whitelist_workarounds_apply (struct intel_engine_cs *engine);int intel_engine_init_bb_workarounds (struct intel_engine_cs *engine);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC PATCH v6 6/6 drm/i915: Classify GT & Display WAs correctly
In reply to Oscar MateoMove GT WAs appropiately from the current xxx_disp_workarounds_apply function to the corresponding xxx_gt_workarounds_apply one.
FIXME: It looks like Chris has found some WAs that actually live in the context image. We need to move these to their rightful
xxx_workarounds_init function.
--- drivers/gpu/drm/i915/intel_workarounds.c | 213 +++++++++++++++---------------- 1 file changed, 106 insertions(+), 107 deletions(-)
drivers/gpu/drm/i915/intel_workarounds.c +106 -107
@@ -513,12 +513,94 @@ int intel_ctx_workarounds_emit(struct drm_i915_gem_request *req)return 0 ; } +static void gen8_set_l3sqc_credits (struct drm_i915_private *dev_priv, +int general_prio_credits, +int high_prio_credits) +{ +u32 misccpctl; +u32 val; + +/* WaTempDisableDOPClkGating:bdw */ + misccpctl =I915_READ (GEN7_MISCCPCTL ); +I915_WRITE (GEN7_MISCCPCTL , misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE ); + + val =I915_READ (GEN8_L3SQCREG1 ); + val &= ~L3_PRIO_CREDITS_MASK ; + val |=L3_GENERAL_PRIO_CREDITS (general_prio_credits); + val |=L3_HIGH_PRIO_CREDITS (high_prio_credits); +I915_WRITE (GEN8_L3SQCREG1 , val); + +/* +* Wait at least 100 clocks before re-enabling clock gating. +* See the definition of L3SQCREG1 in BSpec. +*/ +POSTING_READ (GEN8_L3SQCREG1 ); +udelay (1 ); +I915_WRITE (GEN7_MISCCPCTL , misccpctl); +} +static void bdw_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* The GTT cache must be disabled if the system is using 2M pages. */ +bool can_use_gtt_cache = !HAS_PAGE_SIZES (dev_priv, +I915_GTT_PAGE_SIZE_2M ); +/* WaSwitchSolVfFArbitrationPriority:bdw */ +I915_WRITE (GAM_ECOCHK ,I915_READ (GAM_ECOCHK ) |HSW_ECOCHK_ARB_PRIO_SOL ); +/* 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 )); + + +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 ); + + +/* WaProgramL3SqcReg1Default:bdw */ +gen8_set_l3sqc_credits (dev_priv,30 ,2 ); + +/* WaGttCachingOffByDefault:bdw */ +I915_WRITE (HSW_GTT_CACHE_EN , can_use_gtt_cache ?GTT_CACHE_EN_ALL :0 ); }static void chv_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaVSRefCountFullforceMissDisable:chv */ +/* WaDSRefCountFullforceMissDisable:chv */ +I915_WRITE (GEN7_FF_THREAD_MODE , +I915_READ (GEN7_FF_THREAD_MODE ) & + ~(GEN8_FF_DS_REF_CNT_FFME |GEN7_FF_VS_REF_CNT_FFME )); + +/* WaDisableSemaphoreAndSyncFlipWait:chv */ +I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , +_MASKED_BIT_ENABLE (GEN8_RC_SEMA_IDLE_MSG_DISABLE )); + +/* WaDisableCSUnitClockGating:chv */ +I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | +GEN6_CSUNIT_CLOCK_GATE_DISABLE ); + +/* WaDisableSDEUnitClockGating:chv */ +I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | +GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); + +/* +* WaProgramL3SqcReg1Default:chv +* See gfxspecs/Related Documents/Performance Guide/ +* LSQC Setting Recommendations. +*/ +gen8_set_l3sqc_credits (dev_priv,38 ,2 ); + +/* +* GTT cache may not work with big pages, so if those +* are ever enabled GTT cache may need to be disabled. +*/ +I915_WRITE (HSW_GTT_CACHE_EN ,GTT_CACHE_EN_ALL ); }static void gen9_gt_workarounds_apply (struct drm_i915_private *dev_priv)
@@ -614,6 +696,10 @@ static void bxt_gt_workarounds_apply(struct drm_i915_private *dev_priv)I915_WRITE (GEN9_GAMT_ECO_REG_RW_IA , (I915_READ (GEN9_GAMT_ECO_REG_RW_IA ) |GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS )); + +/* WaDisableSDEUnitClockGating:bxt */ +I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | +GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); }static void kbl_gt_workarounds_apply (struct drm_i915_private *dev_priv)
@@ -638,6 +724,16 @@ static void kbl_gt_workarounds_apply(struct drm_i915_private *dev_priv)I915_WRITE (GEN9_GAMT_ECO_REG_RW_IA , (I915_READ (GEN9_GAMT_ECO_REG_RW_IA ) |GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS )); + +/* WaDisableSDEUnitClockGating:kbl */ +if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) +I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | +GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); + +/* WaDisableGamClockGating:kbl */ +if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) +I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | +GEN6_GAMUNIT_CLOCK_GATE_DISABLE ); }static void glk_gt_workarounds_apply (struct drm_i915_private *dev_priv)
@@ -679,6 +775,16 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)/* WaEnablePreemptionGranularityControlByUMD:cnl */ I915_WRITE (GEN7_FF_SLICE_CS_CHICKEN1 ,_MASKED_BIT_ENABLE (GEN9_FFSC_PERCTX_PREEMPT_CTRL )); + +/* This is not an Wa. Enable for better image quality */ +I915_WRITE (_3D_CHICKEN3, +_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE)); + +/* WaSarbUnitClockGatingDisable:cnl (pre-prod) */ +if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) +I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , +I915_READ (SLICE_UNIT_LEVEL_CLKGATE ) | +SARBUNIT_CLKGATE_DIS ); }void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv)
@@ -705,42 +811,10 @@ void intel_gt_workarounds_apply(struct drm_i915_private *dev_priv)MISSING_CASE (INTEL_GEN (dev_priv)); } -static void gen8_set_l3sqc_credits (struct drm_i915_private *dev_priv, -int general_prio_credits, -int high_prio_credits) -{ -u32 misccpctl; -u32 val; - -/* WaTempDisableDOPClkGating:bdw */ - misccpctl =I915_READ (GEN7_MISCCPCTL ); -I915_WRITE (GEN7_MISCCPCTL , misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE ); - - val =I915_READ (GEN8_L3SQCREG1 ); - val &= ~L3_PRIO_CREDITS_MASK ; - val |=L3_GENERAL_PRIO_CREDITS (general_prio_credits); - val |=L3_HIGH_PRIO_CREDITS (high_prio_credits); -I915_WRITE (GEN8_L3SQCREG1 , val); - -/* -* Wait at least 100 clocks before re-enabling clock gating. -* See the definition of L3SQCREG1 in BSpec. -*/ -POSTING_READ (GEN8_L3SQCREG1 ); -udelay (1 ); -I915_WRITE (GEN7_MISCCPCTL , misccpctl); -} -static void bdw_disp_workarounds_apply (struct drm_i915_private *dev_priv) { -/* The GTT cache must be disabled if the system is using 2M pages. */ -bool can_use_gtt_cache = !HAS_PAGE_SIZES (dev_priv, -I915_GTT_PAGE_SIZE_2M );enum pipe pipe; -/* 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 );
@@ -752,25 +826,6 @@ static void bdw_disp_workarounds_apply(struct drm_i915_private *dev_priv) BDW_DPRS_MASK_VBLANK_SRD); } -/* 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 )); - -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 ); - -/* WaProgramL3SqcReg1Default:bdw */ -gen8_set_l3sqc_credits (dev_priv,30 ,2 ); - -/* WaGttCachingOffByDefault:bdw */ -I915_WRITE (HSW_GTT_CACHE_EN , can_use_gtt_cache ?GTT_CACHE_EN_ALL :0 ); -/* WaKVMNotificationOnConfigChange:bdw */ I915_WRITE (CHICKEN_PAR2_1 ,I915_READ (CHICKEN_PAR2_1 ) |KVM_CONFIG_CHANGE_NOTIFICATION_SELECT );
@@ -786,36 +841,6 @@ static void bdw_disp_workarounds_apply(struct drm_i915_private *dev_priv)static void chv_disp_workarounds_apply (struct drm_i915_private *dev_priv) { -/* WaVSRefCountFullforceMissDisable:chv */ -/* WaDSRefCountFullforceMissDisable:chv */ -I915_WRITE (GEN7_FF_THREAD_MODE , -I915_READ (GEN7_FF_THREAD_MODE ) & - ~(GEN8_FF_DS_REF_CNT_FFME |GEN7_FF_VS_REF_CNT_FFME )); - -/* WaDisableSemaphoreAndSyncFlipWait:chv */ -I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , -_MASKED_BIT_ENABLE (GEN8_RC_SEMA_IDLE_MSG_DISABLE )); - -/* WaDisableCSUnitClockGating:chv */ -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_CSUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableSDEUnitClockGating:chv */ -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* -* WaProgramL3SqcReg1Default:chv -* See gfxspecs/Related Documents/Performance Guide/ -* LSQC Setting Recommendations. -*/ -gen8_set_l3sqc_credits (dev_priv,38 ,2 ); - -/* -* GTT cache may not work with big pages, so if those -* are ever enabled GTT cache may need to be disabled. -*/ -I915_WRITE (HSW_GTT_CACHE_EN ,GTT_CACHE_EN_ALL ); }static void gen9_disp_workarounds_apply (struct drm_i915_private *dev_priv)
@@ -875,10 +900,6 @@ static void bxt_disp_workarounds_apply(struct drm_i915_private *dev_priv) {gen9_disp_workarounds_apply (dev_priv); -/* 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.
@@ -898,16 +919,6 @@ static void kbl_disp_workarounds_apply(struct drm_i915_private *dev_priv) {gen9_disp_workarounds_apply (dev_priv); -/* WaDisableSDEUnitClockGating:kbl */ -if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) -I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | -GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); - -/* WaDisableGamClockGating:kbl */ -if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) -I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) | -GEN6_GAMUNIT_CLOCK_GATE_DISABLE ); -/* WaFbcNukeOnHostModify:kbl */ I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) |ILK_DPFC_NUKE_ON_ANY_MODIFICATION );
@@ -967,9 +978,6 @@ static void cnl_disp_workarounds_apply(struct drm_i915_private *dev_priv)u32 val;cnp_disp_workarounds_apply (dev_priv); -/* This is not an Wa. Enable for better image quality */ -I915_WRITE (_3D_CHICKEN3, -_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));/* WaEnableChickenDCPR:cnl */ I915_WRITE(GEN8_CHICKEN_DCPR_1,
@@ -979,11 +987,6 @@ static void cnl_disp_workarounds_apply(struct drm_i915_private *dev_priv)I915_WRITE (DISP_ARB_CTL ,I915_READ (DISP_ARB_CTL ) |DISP_FBC_MEMORY_WAKE ); -/* WaSarbUnitClockGatingDisable:cnl (pre-prod) */ -if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) -I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , -I915_READ (SLICE_UNIT_LEVEL_CLKGATE ) | -SARBUNIT_CLKGATE_DIS );/* Display WA #1133: WaFbcSkipSegments:cnl */ val =I915_READ (ILK_DPFC_CHICKEN );
@@ -992,10 +995,6 @@ static void cnl_disp_workarounds_apply(struct drm_i915_private *dev_priv)I915_WRITE (ILK_DPFC_CHICKEN , val); } -/* -* FIXME: Some of the WAs applied here are incorrectly classified as Display -* WAs. We still need to go through them and apply them in the right place. -*/ void intel_disp_workarounds_apply (struct drm_i915_private *dev_priv) {if (INTEL_GEN (dev_priv) <8 )
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Refactor HW workaround code (rev7)
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: Refactor HW workaround code (rev7)
URL : https://patchwork.freedesktop.org/series/31611/
State : success
== Summary ==
Series 31611v7 Refactor HW workaround code
https://patchwork.freedesktop.org/api/1.0/series/31611/revisions/7/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> PASS (fi-gdg-551) fdo#102618fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:447s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:454s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:382s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:533s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:273s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:501s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:500s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:492s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:428s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:542s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:430s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:439s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:433s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:461s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:487s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:520s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:474s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:536s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:570s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:542s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:572s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:496s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:459s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:555s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:421s Blacklisted hosts: fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:518s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:569s
fi-byt-n2820 failed to connect after reboot
d284738777d7fd37505baef575e8229dee710deb drm-tip: 2017y-11m-08d-17h-36m-01s UTC integration manifest 6052388586fc drm/i915: Classify GT & Display WAs correctly67977fdb07ee drm/i915: Create a new category of display WAs370e187f9cca drm/i915: Move WA BB stuff to the workarounds file as well
647909874729 drm/i915: Split out functions for different kinds of workarounds 47b4507c0c60 drm/i915: Move a bunch of workaround-related code to its own file 4fc0e8027ca0 drm/i915: Remove Gen9 WAs with no effect
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7021/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Refactor HW workaround code (rev7)
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: Refactor HW workaround code (rev7)
URL : https://patchwork.freedesktop.org/series/31611/
State : success
== Summary ==
Test kms_busy:
Subgroup extended-modeset-hang-oldfb-with-reset-render-a:
pass -> DMESG-WARN (shard-hsw) fdo#102249
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (shard-hsw) fdo#100368 +1fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
shard-hsw total:2540 pass:1431 dwarn:1 dfail:0 fail:11 skip:1097 time:9222s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7021/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 23 lines · Oscar Mateo
Until we agree on a design, I have removed all new code to save the actual list of WAs and dump it in debugfs. For the moment, only shuffle things arounds until most WAs are in the same file (and classified correctly according to the type of WA).
From previous versions of these series:
Currently, deciding how/where to apply new workarounds is challenging. Often, workarounds end up applied incorrectly and get lost under certain circumstances (e.g. a context switch or a GPU reset). This is a proposal to attempt to eliminate some of this pain, by clarifying the current classification of workarounds (context saved/restored, global registers, whitelisting, BB), putting them together on the same file, and improving the existing validation infrastructure (debugfs/i-g-t).
Oscar Mateo (6):
drm/i915: Remove Gen9 WAs with no effect
drm/i915: Move a bunch of workaround-related code to its own file drm/i915: Split out functions for different kinds of workarounds drm/i915: Move WA BB stuff to the workarounds file as well drm/i915: Create a new category of display WAs drm/i915: Classify GT & Display WAs correctly
Quoted 11 lines
drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_gem.c | 3 + drivers/gpu/drm/i915/i915_gem_context.c | 5 + drivers/gpu/drm/i915/i915_reg.h | 3 - drivers/gpu/drm/i915/intel_engine_cs.c | 682 -------------- drivers/gpu/drm/i915/intel_lrc.c | 264 +----- drivers/gpu/drm/i915/intel_pm.c | 312 +------ drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 - drivers/gpu/drm/i915/intel_workarounds.c | 1432 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 40 +
Maybe we should call that intel_gt_workarounds.c? Or i915_something_workarounds.c? We could then add a separate intel_display_workarounds.c for the display stuff.
Quoted 11 lines
11 files changed, 1503 insertions(+), 1249 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_workarounds.c create mode 100644 drivers/gpu/drm/i915/intel_workarounds.hSignature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 35 lines · Ville Syrjälä
Quoted 23 lines · Oscar Mateo
Until we agree on a design, I have removed all new code to save the actual list of WAs and dump it in debugfs. For the moment, only shuffle things arounds until most WAs are in the same file (and classified correctly according to the type of WA).
From previous versions of these series:
Currently, deciding how/where to apply new workarounds is challenging. Often, workarounds end up applied incorrectly and get lost under certain circumstances (e.g. a context switch or a GPU reset). This is a proposal to attempt to eliminate some of this pain, by clarifying the current classification of workarounds (context saved/restored, global registers, whitelisting, BB), putting them together on the same file, and improving the existing validation infrastructure (debugfs/i-g-t).
Oscar Mateo (6):
drm/i915: Remove Gen9 WAs with no effect
drm/i915: Move a bunch of workaround-related code to its own file drm/i915: Split out functions for different kinds of workarounds drm/i915: Move WA BB stuff to the workarounds file as well drm/i915: Create a new category of display WAs drm/i915: Classify GT & Display WAs correctlyQuoted 11 lines
drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_gem.c | 3 + drivers/gpu/drm/i915/i915_gem_context.c | 5 + drivers/gpu/drm/i915/i915_reg.h | 3 - drivers/gpu/drm/i915/intel_engine_cs.c | 682 -------------- drivers/gpu/drm/i915/intel_lrc.c | 264 +----- drivers/gpu/drm/i915/intel_pm.c | 312 +------ drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 - drivers/gpu/drm/i915/intel_workarounds.c | 1432 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 40 +
Quoted 3 lines
Maybe we should call that
intel_gt_workarounds.c? Ori915_something_workarounds.c? We could then add a separateintel_display_workarounds.cfor the display stuff.
Maybe after we agree on a design for improving the way the WAs are initialized and applied we can move them to separate files? (e.g. the static WA table each go into a intel_xxx_workarounds.c while the common functions for applying them remain in intel_workarounds.c)
Quoted 11 lines
Quoted 11 lines
11 files changed, 1503 insertions(+), 1249 deletions(-)create mode 100644
drivers/gpu/drm/i915/intel_workarounds.ccreate mode 100644drivers/gpu/drm/i915/intel_workarounds.hSignature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Oscar Mateo (2017-11-08 23:59:43)
Quoted 4 lines
Until we agree on a design, I have removed all new code to save the actual list of WAs and dump it in debugfs. For the moment, only shuffle things arounds until most WAs are in the same file (and classified correctly according to the type of WA).
I would still very much like to land the GT workarounds migration, especially separating out the context w/a from the GT mmio ones. (If only to reduce the debug spam ;)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx