Refactor HW workaround code
Subsystems (2)
v4 cover Refactor HW workaround code
This v4 implements review comments from Chris and Ville and removes the early bug fixes that have already been upstreamed.
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 (20):
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: Rename saved workarounds to make it explicit that they are
context WAs
drm/i915: Save all GT WAs and apply them at a later time drm/i915: Save all Whitelist WAs and apply them at a later time drm/i915: Create a new category of display WAs
drm/i915: Print all workaround types correctly in debugfs drm/i915: Move WA BB stuff to the workarounds file as well drm/i915/cnl: Move GT and Display workarounds from init_clock_gating drm/i915/gen9: Move GT and Display workarounds from init_clock_gating drm/i915/cfl: Move GT and Display workarounds from init_clock_gating drm/i915/glk: Move GT and Display workarounds from init_clock_gating drm/i915/kbl: Move GT and Display workarounds from init_clock_gating drm/i915/bxt: Move GT and Display workarounds from init_clock_gating drm/i915/skl: Move GT and Display workarounds from init_clock_gating drm/i915/chv: Move GT and Display workarounds from init_clock_gating drm/i915/bdw: Move GT and Display workarounds from init_clock_gating drm/i915: Move WaProgramL3SqcReg1Default to the workarounds file drm/i915: Document the i915_workarounds file
drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 63 +- drivers/gpu/drm/i915/i915_drv.c | 5 + drivers/gpu/drm/i915/i915_drv.h | 27 +- 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 | 266 +---- 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 | 1622 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 41 + 14 files changed, 1771 insertions(+), 1269 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
PATCH v4 1/20 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
PATCH v4 2/20 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
@@ -41,7 +41,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
@@ -766,9 +766,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 · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/20 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>
@@ -4916,6 +4917,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
PATCH v4 4/20 drm/i915: Rename saved workarounds to make it explicit that they are context WAs
In reply to Oscar MateoSome WAs touch registers that get saved/restored together with the logical context. Make this very explicit by renaming a few things in the code.
v2:
- Improved naming
- Rebased
v3: Also rename I915_MAX_CTX_WA_REGS
--- drivers/gpu/drm/i915/i915_debugfs.c | 10 +- drivers/gpu/drm/i915/i915_drv.h | 7 +- drivers/gpu/drm/i915/intel_workarounds.c | 232 +++++++++++++++---------------- 3 files changed, 125 insertions(+), 124 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +5 -5
@@ -3371,18 +3371,18 @@ static int i915_wa_registers(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); -seq_printf (m,"Workarounds applied: %d\n" , workarounds->count); +seq_printf (m,"Context workarounds applied: %d\n" , workarounds->ctx_wa_count);for_each_engine (engine, dev_priv, id)seq_printf (m,"HW whitelist count for %s: %d\n" , engine->name, workarounds->hw_whitelist_count[id]); -for (i =0 ; i < workarounds->count; ++i) { +for (i =0 ; i < workarounds->ctx_wa_count; ++i) {i915_reg_t addr;u32 mask, value, read;bool ok; - addr = workarounds->reg[i].addr; - mask = workarounds->reg[i].mask; - value = workarounds->reg[i].value; + addr = workarounds->ctx_wa_reg[i].addr; + mask = workarounds->ctx_wa_reg[i].mask; + value = workarounds->ctx_wa_reg[i].value; read =I915_READ (addr); ok = (value & mask) == (read & mask); seq_printf(m, "0x%X: 0x%08X, mask: 0x%08X, read: 0x%08x, status: %s\n",
drivers/gpu/drm/i915/i915_drv.h +4 -3
@@ -1975,11 +1975,12 @@ struct i915_wa_reg {u32 mask; }; -#define I915_MAX_WA_REGS 16 +#define I915_MAX_CTX_WA_REGS 16struct i915_workarounds { -struct i915_wa_reg reg[I915_MAX_WA_REGS ]; -u32 count; +struct i915_wa_reg ctx_wa_reg[I915_MAX_CTX_WA_REGS ]; +u32 ctx_wa_count; +u32 hw_whitelist_count[I915_NUM_ENGINES ]; };
drivers/gpu/drm/i915/intel_workarounds.c +116 -116
454 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 5/20 drm/i915: Save all GT WAs and apply them at a later time
In reply to Oscar MateoBy doing this, we can dump these workarounds in debugfs for validation (which, at the moment, we are only able to do for the contexts WAs).
v2:
- Wrong macro used for MMIO set bit masked
- Improved naming
- Rebased
v3:
- GT instead of MMIO (Chris, Mika)
- Leave L3_PRIO_CREDITS_MASK for a separate patch
- Rebased
v4: Carry the init_early nomenclature over (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 5 + drivers/gpu/drm/i915/i915_drv.h | 4 + drivers/gpu/drm/i915/intel_workarounds.c | 247 ++++++++++++++++++++----------- drivers/gpu/drm/i915/intel_workarounds.h | 1 + 4 files changed, 170 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +5 -0
@@ -49,6 +49,7 @@#include "i915_drv.h" #include "i915_trace.h" #include "i915_vgpu.h" +#include "intel_workarounds.h" #include "intel_drv.h" #include "intel_uc.h"
@@ -886,6 +887,10 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,BUG_ON (device_info->gen >sizeof (device_info->gen_mask) *BITS_PER_BYTE ); device_info->gen_mask =BIT (device_info->gen -1 ); + ret =intel_gt_workarounds_init_early (dev_priv); +if (ret <0 ) +return ret; +spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);mutex_init (&dev_priv->backlight_lock);
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -1976,11 +1976,15 @@ struct i915_wa_reg { };#define I915_MAX_CTX_WA_REGS 16 +#define I915_MAX_MMIO_WA_REGS 32struct i915_workarounds {struct i915_wa_reg ctx_wa_reg[I915_MAX_CTX_WA_REGS ];u32 ctx_wa_count; +struct i915_wa_reg gt_wa_reg[I915_MAX_MMIO_WA_REGS ]; +u32 gt_wa_count; +u32 hw_whitelist_count[I915_NUM_ENGINES ]; };
drivers/gpu/drm/i915/intel_workarounds.c +160 -87
355 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +1 -0
@@ -28,6 +28,7 @@int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv);int intel_ctx_workarounds_emit (struct drm_i915_gem_request *req); +int intel_gt_workarounds_init_early (struct drm_i915_private *dev_priv);void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv);int intel_whitelist_workarounds_apply (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
Joonas Lahtinen
maintainerRe: [PATCH 05/20] drm/i915: Save all GT WAs and apply them at a later time
Quoted 13 lines · Oscar Mateo
By doing this, we can dump these workarounds in debugfs for validation (which, at the moment, we are only able to do for the contexts WAs).
v2:
- Wrong macro used for MMIO set bit masked
- Improved naming
- Rebasedv3:
- GT instead of MMIO (Chris, Mika)
- LeaveL3_PRIO_CREDITS_MASKfor a separate patch
- Rebased
Quoted 6 lines
v4: Carry the
init_earlynomenclature over (Chris)Signed-off-by Oscar Mateo <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Chris Wilson <[email protected]>
This and the following patch are still a no-go and won't be merged. The required changes for the series to be accepted (to make it more declarative) were clearly described previously. If there are further questions, we should discuss those instead wasting time looking at respins that do not address the input given.
Respins that ignore review are a waste of everyone's time. So, please react to the review instead of trying to brute force a series in as you see fit.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Save all GT WAs and apply them at a later time
Quoted 26 lines · Joonas Lahtinen
Quoted 13 lines · Oscar Mateo
By doing this, we can dump these workarounds in debugfs for validation (which, at the moment, we are only able to do for the contexts WAs).
v2:
- Wrong macro used for MMIO set bit masked
- Improved naming
- Rebasedv3:
- GT instead of MMIO (Chris, Mika)
- LeaveL3_PRIO_CREDITS_MASKfor a separate patch
- RebasedQuoted 6 lines
v4: Carry the
init_earlynomenclature over (Chris)Signed-off-by Oscar Mateo <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Chris Wilson <[email protected]>This and the following patch are still a no-go and won't be merged. The required changes for the series to be accepted (to make it more declarative) were clearly described previously. If there are further questions, we should discuss those instead wasting time looking at respins that do not address the input given.
Quoted 5 lines
Respins that ignore review are a waste of everyone's time. So, please react to the review instead of trying to brute force a series in as you see fit.
Regards, Joonas
My apologies, I wasn't trying to "brute force" anything. I haven't been able to work on this for the last two weeks and I didn't want the issue to go cold, so I sent a version to attend to Ville's and Chris' review comments (this is useful anyway, because the same comments apply whether you go with functions or with a static table). I am working on a version that implements your suggestions and I will send it as soon as it's ready.
-- Oscar
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Save all GT WAs and apply them at a later time
Quoted 33 lines · Oscar Mateo
Quoted 30 lines · Joonas Lahtinen
Quoted 13 lines · Oscar Mateo
By doing this, we can dump these workarounds in debugfs for validation (which, at the moment, we are only able to do for the contexts WAs).
v2:
- Wrong macro used for MMIO set bit masked
- Improved naming
- Rebasedv3:
- GT instead of MMIO (Chris, Mika)
- LeaveL3_PRIO_CREDITS_MASKfor a separate patch
- RebasedQuoted 6 lines
v4: Carry the
init_earlynomenclature over (Chris)Signed-off-by Oscar Mateo <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Chris Wilson <[email protected]>This and the following patch are still a no-go and won't be merged. The required changes for the series to be accepted (to make it more declarative) were clearly described previously. If there are further questions, we should discuss those instead wasting time looking at respins that do not address the input given.
Respins that ignore review are a waste of everyone's time. So, please react to the review instead of trying to brute force a series in as you see fit.
Quoted 8 lines
Quoted 1 line
Regards, Joonas
My apologies, I wasn't trying to "brute force" anything. I haven't been able to work on this for the last two weeks and I didn't want the issue to go cold, so I sent a version to attend to Ville's and Chris' review comments (this is useful anyway, because the same comments apply whether you go with functions or with a static table). I am working on a version that implements your suggestions and I will send it as soon as it's ready.
Typically when submitting a changeset that isn't ready to be merged, you'd tag it RFC or similar.
Kind regards, David Weinehall
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Save all GT WAs and apply them at a later time
In reply to Joonas LahtinenQuoting Joonas Lahtinen (2017-10-31 14:14:52)
Quoted 21 lines · Oscar Mateo
Quoted 13 lines
By doing this, we can dump these workarounds in debugfs for validation (which, at the moment, we are only able to do for the contexts WAs).
v2:
- Wrong macro used for MMIO set bit masked
- Improved naming
- Rebasedv3:
- GT instead of MMIO (Chris, Mika)
- LeaveL3_PRIO_CREDITS_MASKfor a separate patch
- RebasedQuoted 6 lines
v4: Carry the
init_earlynomenclature over (Chris)Signed-off-by Oscar Mateo <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Quoted 5 lines
This and the following patch are still a no-go and won't be merged. The required changes for the series to be accepted (to make it more declarative) were clearly described previously. If there are further questions, we should discuss those instead wasting time looking at respins that do not address the input given.
I would like draw everyone's attention to
https://bugs.freedesktop.org/show_bug.cgi?id=103549
As much as I don't like gem_workarounds for its incestrous relationship with the kernel it purports to be testing, that bug is exactly the type of regression it prevents. It could not find this regression because it requires us to be very formal in our w/a handling, i.e. we had not declared the w/a for it to check; such formality being sought after here.
Whatever the design outcome, a good test plan is essential. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/20 drm/i915: Save all Whitelist WAs and apply them at a later time
In reply to Oscar MateoSame as we have been doing for other types, this allow us to dump the whole list of workarounds to debugs, for validation purposes.
v2:
- Improved naming
- Rebased
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/intel_lrc.c | 8 ++- drivers/gpu/drm/i915/intel_workarounds.c | 113 ++++++++++++++++--------------- drivers/gpu/drm/i915/intel_workarounds.h | 3 +- 5 files changed, 67 insertions(+), 62 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -3374,7 +3374,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)seq_printf (m,"Context workarounds applied: %d\n" , workarounds->ctx_wa_count);for_each_engine (engine, dev_priv, id)seq_printf (m,"HW whitelist count for %s: %d\n" , - engine->name, workarounds->hw_whitelist_count[id]); + engine->name, workarounds->whitelist_wa_count[id]);for (i =0 ; i < workarounds->ctx_wa_count; ++i) {i915_reg_t addr;u32 mask, value, read;
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -1985,7 +1985,8 @@ struct i915_workarounds {struct i915_wa_reg gt_wa_reg[I915_MAX_MMIO_WA_REGS ];u32 gt_wa_count; -u32 hw_whitelist_count[I915_NUM_ENGINES ]; +struct i915_wa_reg whitelist_wa_reg[I915_NUM_ENGINES ][RING_MAX_NONPRIV_SLOTS ]; +u32 whitelist_wa_count[I915_NUM_ENGINES ]; };struct i915_virtual_gpu {
drivers/gpu/drm/i915/intel_lrc.c +5 -3
@@ -1514,9 +1514,7 @@ static int gen9_init_render_ring(struct intel_engine_cs *engine)if (ret)return ret; - ret =intel_whitelist_workarounds_apply (engine); -if (ret) -return ret; +intel_whitelist_workarounds_apply (engine);return 0 ; }
@@ -1994,6 +1992,10 @@ int logical_render_ring_init(struct intel_engine_cs *engine)if (ret)return ret; + ret =intel_whitelist_workarounds_init (engine); +if (ret) +return ret; + ret =intel_init_workaround_bb (engine);if (ret) {/*
drivers/gpu/drm/i915/intel_workarounds.c +57 -56
213 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +2 -1
@@ -31,6 +31,7 @@int intel_gt_workarounds_init_early (struct drm_i915_private *dev_priv);void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv); -int intel_whitelist_workarounds_apply (struct intel_engine_cs *engine); +int intel_whitelist_workarounds_init (struct intel_engine_cs *engine); +void 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
PATCH v4 7/20 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.
Actually populating this is left for future patches: we have to start moving WAs from init_clock_gating into either GT or Display functions, and this requires a good deal of careful code reviewing.
v2: Rebased to carry the init_early nomenclature over (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/intel_pm.c | 2 + drivers/gpu/drm/i915/intel_workarounds.c | 154 +++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_workarounds.h | 3 +- 5 files changed, 155 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -887,7 +887,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,BUG_ON (device_info->gen >sizeof (device_info->gen_mask) *BITS_PER_BYTE ); device_info->gen_mask =BIT (device_info->gen -1 ); - ret =intel_gt_workarounds_init_early (dev_priv); + ret =intel_mmio_workarounds_init_early (dev_priv);if (ret <0 )return ret;
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -1985,6 +1985,9 @@ struct i915_workarounds {struct i915_wa_reg gt_wa_reg[I915_MAX_MMIO_WA_REGS ];u32 gt_wa_count; +struct i915_wa_reg display_wa_reg[I915_MAX_MMIO_WA_REGS ]; +u32 display_wa_count; +struct i915_wa_reg whitelist_wa_reg[I915_NUM_ENGINES ][RING_MAX_NONPRIV_SLOTS ];u32 whitelist_wa_count[I915_NUM_ENGINES ]; };
drivers/gpu/drm/i915/intel_pm.c +2 -0
@@ -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>
@@ -9013,6 +9014,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_display_workarounds_apply (dev_priv); }void intel_suspend_hw (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_workarounds.c +147 -7
175 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +2 -1
@@ -28,8 +28,9 @@int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv);int intel_ctx_workarounds_emit (struct drm_i915_gem_request *req); -int intel_gt_workarounds_init_early (struct drm_i915_private *dev_priv); +int intel_mmio_workarounds_init_early (struct drm_i915_private *dev_priv);void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv); +void intel_display_workarounds_apply (struct drm_i915_private *dev_priv);int intel_whitelist_workarounds_init (struct intel_engine_cs *engine);void intel_whitelist_workarounds_apply (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
PATCH v4 8/20 drm/i915: Print all workaround types correctly in debugfs
In reply to Oscar MateoLet's try to make sure that all WAs are applied correctly and survive resumes, resets, etc... (with some help from a companion i-g-t patch).
v2:
- Rebased
- Print display WAs as well (Ville)
v3:
- Grab the forcewake once for everyone, so that all reads are from the same powercontext (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 59 ++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +45 -14
@@ -3355,6 +3355,22 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)return 0 ; } +static void check_wa_register (struct seq_file *m,struct i915_wa_reg *wa_reg) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +u32 read; +bool ok; + +assert_forcewakes_active (dev_priv,FORCEWAKE_ALL ); + + read =I915_READ_FW (wa_reg->addr); + ok = (wa_reg->value & wa_reg->mask) == (read & wa_reg->mask); +seq_printf (m,"0x%X: 0x%08x, mask: 0x%08x, read: 0x%08x, status: %s\n" , +i915_mmio_reg_offset (wa_reg->addr), + wa_reg->value, wa_reg->mask, read, + ok ?"OK" :"FAIL" ); +} +static int i915_wa_registers (struct seq_file *m,void *unused) {int i;
@@ -3364,6 +3380,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)struct drm_device *dev = &dev_priv->drm;struct i915_workarounds *workarounds = &dev_priv->workarounds;enum intel_engine_id id; +u32 whitelist_wa_count =0 ; ret =mutex_lock_interruptible (&dev->struct_mutex);if (ret)
@@ -3372,22 +3389,36 @@ static int i915_wa_registers(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv);seq_printf (m,"Context workarounds applied: %d\n" , workarounds->ctx_wa_count); -for_each_engine (engine, dev_priv, id) -seq_printf (m,"HW whitelist count for %s: %d\n" , - engine->name, workarounds->whitelist_wa_count[id]);for (i =0 ; i < workarounds->ctx_wa_count; ++i) { -i915_reg_t addr; -u32 mask, value, read; -bool ok; - - addr = workarounds->ctx_wa_reg[i].addr; - mask = workarounds->ctx_wa_reg[i].mask; - value = workarounds->ctx_wa_reg[i].value; - read =I915_READ (addr); - ok = (value & mask) == (read & mask); -seq_printf (m,"0x%X: 0x%08X, mask: 0x%08X, read: 0x%08x, status: %s\n" , -i915_mmio_reg_offset (addr), value, mask, read, ok ?"OK" :"FAIL" ); +struct i915_wa_reg *wa_reg = &workarounds->ctx_wa_reg[i]; + +seq_printf (m,"0x%X: 0x%08x, mask: 0x%08x\n" , +i915_mmio_reg_offset (wa_reg->addr), + wa_reg->value, wa_reg->mask); } +seq_putc (m,'\n' ); + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +seq_printf (m,"GT workarounds applied: %d\n" , workarounds->gt_wa_count); +for (i =0 ; i < workarounds->gt_wa_count; ++i) +check_wa_register (m, &workarounds->gt_wa_reg[i]); +seq_putc (m,'\n' ); + +seq_printf (m,"Display workarounds applied: %d\n" , workarounds->display_wa_count); +for (i =0 ; i < workarounds->display_wa_count; ++i) +check_wa_register (m, &workarounds->display_wa_reg[i]); +seq_putc (m,'\n' ); + +for_each_engine (engine, dev_priv, id) + whitelist_wa_count += workarounds->whitelist_wa_count[id]; +seq_printf (m,"Whitelist workarounds applied: %d\n" , whitelist_wa_count); +for_each_engine (engine, dev_priv, id) +for (i =0 ; i < workarounds->whitelist_wa_count[id]; ++i) +check_wa_register (m, &workarounds->whitelist_wa_reg[id][i]); +seq_putc (m,'\n' ); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );intel_runtime_pm_put (dev_priv);mutex_unlock (&dev->struct_mutex);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 9/20 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)
--- 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 ,
@@ -1873,7 +1624,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);
@@ -1996,7 +1747,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
@@ -35,4 +35,7 @@int intel_whitelist_workarounds_init (struct intel_engine_cs *engine);void 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
PATCH v4 10/20 drm/i915/cnl: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
v2: classify WaSarbUnitClockGatingDisable as GT WA (Ville)
--- drivers/gpu/drm/i915/intel_pm.c | 32 +------------------------------- drivers/gpu/drm/i915/intel_workarounds.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -31
@@ -8519,36 +8519,6 @@ static void cnp_init_clock_gating(struct drm_i915_private *dev_priv) 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);
@@ -9040,7 +9010,7 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)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; + dev_priv->display.init_clock_gating = nop_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))
drivers/gpu/drm/i915/intel_workarounds.c +25 -1
@@ -724,6 +724,15 @@ static int cfl_gt_workarounds_init_early(struct drm_i915_private *dev_priv)static int cnl_gt_workarounds_init_early (struct drm_i915_private *dev_priv) { +/* This is not an Wa. Enable for better image quality */ +GT_WA_SET_BIT_MASKED (_3D_CHICKEN3, + _3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE); + +/* WaSarbUnitClockGatingDisable:cnl (pre-prod) */ +if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) +GT_WA_SET_BIT (SLICE_UNIT_LEVEL_CLKGATE , +SARBUNIT_CLKGATE_DIS ); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) GT_WA_SET_BIT(GAMT_CHKN_BIT_REG,
@@ -856,6 +865,22 @@ static int cfl_display_workarounds_init_early(struct drm_i915_private *dev_priv)static int cnl_display_workarounds_init_early (struct drm_i915_private *dev_priv) { +if (HAS_PCH_CNP (dev_priv)) { +/* Wa #1181 */ +DISPLAY_WA_SET_BIT (SOUTH_DSPCLK_GATE_D , +CNP_PWM_CGE_GATING_DISABLE ); + } + +/* WaEnableChickenDCPR:cnl */ +DISPLAY_WA_SET_BIT (GEN8_CHICKEN_DCPR_1 ,MASK_WAKEMEM ); + +/* WaFbcWakeMemOn:cnl */ +DISPLAY_WA_SET_BIT (DISP_ARB_CTL ,DISP_FBC_MEMORY_WAKE ); + +/* Display WA #1133: WaFbcSkipSegments:cnl */ +DISPLAY_WA_SET_FIELD (ILK_DPFC_CHICKEN ,GLK_SKIP_SEG_COUNT_MASK , +GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 )); +return 0 ; }
@@ -863,7 +888,6 @@ static int display_workarounds_init_early(struct drm_i915_private *dev_priv) {int err; -DISPLAY_WA_SET_BIT (_MMIO (0 ),0 );/* shut up gcc temporarily */ dev_priv->workarounds.display_wa_count =0 ;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
PATCH v4 11/20 drm/i915/gen9: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
v2:
- Rebase on WA removed
- Rebased to carry the init_early nomenclature over (Chris)
--- drivers/gpu/drm/i915/intel_pm.c | 48 ----------------------------- drivers/gpu/drm/i915/intel_workarounds.c | 52 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -48
@@ -57,50 +57,8 @@#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 );
@@ -123,7 +81,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv)static void glk_init_clock_gating (struct drm_i915_private *dev_priv) {u32 val; -gen9_init_clock_gating (dev_priv);/* * WaDisablePWMClockGating:glk
@@ -8522,7 +8479,6 @@ static void cnp_init_clock_gating(struct drm_i915_private *dev_priv)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) |
@@ -8531,8 +8487,6 @@ static void cfl_init_clock_gating(struct drm_i915_private *dev_priv)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) |
@@ -8550,8 +8504,6 @@ static void kbl_init_clock_gating(struct drm_i915_private *dev_priv)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 );
drivers/gpu/drm/i915/intel_workarounds.c +52 -0
80 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 12/20 drm/i915/cfl: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
--- drivers/gpu/drm/i915/intel_pm.c | 23 +---------------------- drivers/gpu/drm/i915/intel_workarounds.c | 9 +++++++++ 2 files changed, 10 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -22
@@ -8466,25 +8466,6 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,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 cfl_init_clock_gating (struct drm_i915_private *dev_priv) -{ -cnp_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) {/* WaDisableSDEUnitClockGating:kbl */
@@ -8961,10 +8942,8 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)*/ void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) { -if (IS_CANNONLAKE (dev_priv)) +if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) dev_priv->display.init_clock_gating = nop_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))
drivers/gpu/drm/i915/intel_workarounds.c +9 -0
@@ -912,6 +912,15 @@ static int cfl_display_workarounds_init_early(struct drm_i915_private *dev_priv)if (ret)return ret; +if (HAS_PCH_CNP (dev_priv)) { +/* Wa #1181 */ +DISPLAY_WA_SET_BIT (SOUTH_DSPCLK_GATE_D , +CNP_PWM_CGE_GATING_DISABLE ); + } + +/* WaFbcNukeOnHostModify:cfl */ +DISPLAY_WA_SET_BIT (ILK_DPFC_CHICKEN ,ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 13/20 drm/i915/glk: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
--- drivers/gpu/drm/i915/intel_pm.c | 33 ++------------------------------ drivers/gpu/drm/i915/intel_workarounds.c | 17 ++++++++++++++++ 2 files changed, 19 insertions(+), 31 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +2 -31
@@ -78,34 +78,6 @@ static void bxt_init_clock_gating(struct drm_i915_private *dev_priv) PWM1_GATING_DIS | PWM2_GATING_DIS); } -static void glk_init_clock_gating (struct drm_i915_private *dev_priv) -{ -u32 val; - -/* -* 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;
@@ -8942,7 +8914,8 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)*/ void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) { -if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) +if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv) || +IS_GEMINILAKE (dev_priv)) dev_priv->display.init_clock_gating = nop_init_clock_gating;else if (IS_SKYLAKE (dev_priv)) dev_priv->display.init_clock_gating = skl_init_clock_gating;
@@ -8950,8 +8923,6 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *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; else if (IS_BROADWELL(dev_priv)) dev_priv->display.init_clock_gating = bdw_init_clock_gating; else if (IS_CHERRYVIEW(dev_priv))
drivers/gpu/drm/i915/intel_workarounds.c +17 -0
@@ -903,6 +903,23 @@ static int glk_display_workarounds_init_early(struct drm_i915_private *dev_priv)if (ret)return ret; +/* +* WaDisablePWMClockGating:glk +* Backlight PWM may stop in the asserted state, causing backlight +* to stay fully on. +*/ +DISPLAY_WA_SET_BIT (GEN9_CLKGATE_DIS_0 ,PWM1_GATING_DIS |PWM2_GATING_DIS ); + +/* WaDDIIOTimeout:glk */ +if (IS_GLK_REVID (dev_priv,0 ,GLK_REVID_A1 )) +DISPLAY_WA_CLR_BIT (CHICKEN_MISC_2 ,GLK_CL0_PWR_DOWN | +GLK_CL1_PWR_DOWN | +GLK_CL2_PWR_DOWN ); + +/* Display WA #1133: WaFbcSkipSegments:glk */ +DISPLAY_WA_SET_FIELD (ILK_DPFC_CHICKEN ,GLK_SKIP_SEG_COUNT_MASK , +GLK_SKIP_SEG_EN |GLK_SKIP_SEG_COUNT (1 )); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 14/20 drm/i915/kbl: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
v2: Classify WaDisableSDEUnitClockGating and WaDisableGamClockGating as GT WAs
--- drivers/gpu/drm/i915/intel_pm.c | 21 +-------------------- drivers/gpu/drm/i915/intel_workarounds.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -20
@@ -8438,23 +8438,6 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,I915_WRITE (GEN7_MISCCPCTL , misccpctl); } -static void kbl_init_clock_gating (struct drm_i915_private *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) {/* WAC6entrylatency:skl */
@@ -8915,12 +8898,10 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) {if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv) || -IS_GEMINILAKE (dev_priv)) +IS_GEMINILAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) dev_priv->display.init_clock_gating = nop_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_BROADWELL (dev_priv))
drivers/gpu/drm/i915/intel_workarounds.c +11 -0
@@ -674,6 +674,14 @@ static int kbl_gt_workarounds_init_early(struct drm_i915_private *dev_priv)if (ret)return ret; +/* WaDisableSDEUnitClockGating:kbl */ +if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) +GT_WA_SET_BIT (GEN8_UCGCTL6 ,GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); + +/* WaDisableGamClockGating:kbl */ +if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) +GT_WA_SET_BIT (GEN6_UCGCTL1 ,GEN6_GAMUNIT_CLOCK_GATE_DISABLE ); +/* WaEnableGapsTsvCreditFix:kbl */ GT_WA_SET_BIT (GEN8_GARBCNTL ,GEN9_GAPS_TSV_CREDIT_DISABLE );
@@ -894,6 +902,9 @@ static int kbl_display_workarounds_init_early(struct drm_i915_private *dev_priv)if (ret)return ret; +/* WaFbcNukeOnHostModify:kbl */ +DISPLAY_WA_SET_BIT (ILK_DPFC_CHICKEN ,ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 15/20 drm/i915/bxt: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
v2: Classify WaDisableSDEUnitClockGating as GT WA
--- drivers/gpu/drm/i915/intel_pm.c | 26 ++------------------------ drivers/gpu/drm/i915/intel_workarounds.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +2 -24
@@ -57,27 +57,6 @@#define INTEL_RC6p_ENABLE (1<<1)#define INTEL_RC6pp_ENABLE (1<<2) -static void bxt_init_clock_gating (struct drm_i915_private *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 i915_pineview_get_mem_freq (struct drm_i915_private *dev_priv) {u32 tmp;
@@ -8898,12 +8877,11 @@ static void nop_init_clock_gating(struct drm_i915_private *dev_priv)void intel_init_clock_gating_hooks (struct drm_i915_private *dev_priv) {if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv) || -IS_GEMINILAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) +IS_GEMINILAKE (dev_priv) ||IS_KABYLAKE (dev_priv) || +IS_BROXTON (dev_priv)) dev_priv->display.init_clock_gating = nop_init_clock_gating;else if (IS_SKYLAKE (dev_priv)) dev_priv->display.init_clock_gating = skl_init_clock_gating; -else if (IS_BROXTON (dev_priv)) - dev_priv->display.init_clock_gating = bxt_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))
drivers/gpu/drm/i915/intel_workarounds.c +15 -0
@@ -636,6 +636,9 @@ static int bxt_gt_workarounds_init_early(struct drm_i915_private *dev_priv)if (ret)return ret; +/* WaDisableSDEUnitClockGating:bxt */ +GT_WA_SET_BIT (GEN8_UCGCTL6 ,GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); +/* WaStoreMultiplePTEenable:bxt */ /* This is a requirement according to Hardware specification */ if (IS_BXT_REVID (dev_priv,0 ,BXT_REVID_A1 ))
@@ -893,6 +896,18 @@ static int bxt_display_workarounds_init_early(struct drm_i915_private *dev_priv)if (ret)return ret; +/* +* FIXME: +* GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ applies on 3x6 GT SKUs only. +*/ +DISPLAY_WA_SET_BIT (GEN8_UCGCTL6 ,GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ ); + +/* +* Wa: Backlight PWM may stop in the asserted state, causing backlight +* to stay fully on. +*/ +DISPLAY_WA_SET_BIT (GEN9_CLKGATE_DIS_0 ,PWM1_GATING_DIS |PWM2_GATING_DIS ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 16/20 drm/i915/skl: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
--- drivers/gpu/drm/i915/intel_pm.c | 15 +-------------- drivers/gpu/drm/i915/intel_workarounds.c | 6 ++++++ 2 files changed, 7 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -14
@@ -8417,17 +8417,6 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,I915_WRITE (GEN7_MISCCPCTL , misccpctl); } -static void skl_init_clock_gating (struct drm_i915_private *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. */
@@ -8878,10 +8867,8 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv) {if (IS_CANNONLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv) ||IS_GEMINILAKE (dev_priv) ||IS_KABYLAKE (dev_priv) || -IS_BROXTON (dev_priv)) +IS_BROXTON (dev_priv) ||IS_SKYLAKE (dev_priv)) dev_priv->display.init_clock_gating = nop_init_clock_gating; -else if (IS_SKYLAKE (dev_priv)) - dev_priv->display.init_clock_gating = skl_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))
drivers/gpu/drm/i915/intel_workarounds.c +6 -0
@@ -887,6 +887,12 @@ static int skl_display_workarounds_init_early(struct drm_i915_private *dev_priv)/* WaDisableDopClockGating */ DISPLAY_WA_CLR_BIT (GEN7_MISCCPCTL ,GEN7_DOP_CLOCK_GATE_ENABLE ); +/* WAC6entrylatency:skl */ +DISPLAY_WA_SET_BIT (FBC_LLC_READ_CTRL ,FBC_LLC_FULLY_OPEN ); + +/* WaFbcNukeOnHostModify:skl */ +DISPLAY_WA_SET_BIT (ILK_DPFC_CHICKEN ,ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 17/20 drm/i915/chv: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
TODO: Notice that we are leaving WaProgramL3SqcReg1Default (and the associated WaTempDisableDOPClkGating) behind because it requires extra careful reviewing. We'll deal with it in a separate patch.
v2: Classify WaDisableCSUnitClockGating and WaDisableSDEUnitClockGating as GT WAs
--- drivers/gpu/drm/i915/intel_pm.c | 24 ------------------------ drivers/gpu/drm/i915/intel_workarounds.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -24
@@ -8707,36 +8707,12 @@ static void vlv_init_clock_gating(struct drm_i915_private *dev_priv)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)
drivers/gpu/drm/i915/intel_workarounds.c +21 -0
@@ -568,6 +568,27 @@ static int bdw_gt_workarounds_init_early(struct drm_i915_private *dev_priv)static int chv_gt_workarounds_init_early (struct drm_i915_private *dev_priv) { +/* WaVSRefCountFullforceMissDisable:chv */ +/* WaDSRefCountFullforceMissDisable:chv */ +GT_WA_CLR_BIT (GEN7_FF_THREAD_MODE ,GEN8_FF_DS_REF_CNT_FFME | +GEN7_FF_VS_REF_CNT_FFME ); + +/* WaDisableSemaphoreAndSyncFlipWait:chv */ +GT_WA_SET_BIT_MASKED (GEN6_RC_SLEEP_PSMI_CONTROL , +GEN8_RC_SEMA_IDLE_MSG_DISABLE ); + +/* +* GTT cache may not work with big pages, so if those +* are ever enabled GTT cache may need to be disabled. +*/ +GT_WA_SET_FIELD (HSW_GTT_CACHE_EN ,0xFFFFFFFF ,GTT_CACHE_EN_ALL ); + +/* WaDisableCSUnitClockGating:chv */ +GT_WA_SET_BIT (GEN6_UCGCTL1 ,GEN6_CSUNIT_CLOCK_GATE_DISABLE ); + +/* WaDisableSDEUnitClockGating:chv */ +GT_WA_SET_BIT (GEN8_UCGCTL6 ,GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 18/20 drm/i915/bdw: Move GT and Display workarounds from init_clock_gating
In reply to Oscar MateoTo their rightful place inside intel_workarounds.c
TODO: Notice that we are leaving WaProgramL3SqcReg1Default (and the associated WaTempDisableDOPClkGating) behind because it requires extra careful reviewing. We'll deal with it in a separate patch.
TODO2: Decide what to do with lpt_init_clock_gating (shouldn't WADPOClockGatingDisable be marked as "bdw"? shouldn't it be protected by HAS_PCH_LPT_LP? do we want to move the whole thing to the workarounds file or not?).
v2: Classify WaDisableSDEUnitClockGating as GT WA
--- drivers/gpu/drm/i915/intel_pm.c | 47 -------------------------------- drivers/gpu/drm/i915/intel_workarounds.c | 43 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -47
@@ -8419,59 +8419,12 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,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; -ilk_init_lp_watermarks (dev_priv); -/* 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)
drivers/gpu/drm/i915/intel_workarounds.c +43 -0
55 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 19/20 drm/i915: Move WaProgramL3SqcReg1Default to the workarounds file
In reply to Oscar MateoThis means moving WaTempDisableDOPClkGating as well.
Notice that BXT implements a similar WA to WaProgramL3SqcReg1Default but, according to the BSpec, it does not require WaTempDisableDOPClkGating.
v2: Use pre-/post- hook calls (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 10 ++++++ drivers/gpu/drm/i915/intel_pm.c | 46 ++----------------------- drivers/gpu/drm/i915/intel_workarounds.c | 59 ++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +10 -0
@@ -1968,8 +1968,18 @@ struct i915_frontbuffer_tracking {unsigned flip_bits; }; +struct i915_wa_reg ; + +typedef void (*wa_hook_func )(struct drm_i915_private *dev_priv, +struct i915_wa_reg *wa); +struct i915_wa_reg {i915_reg_t addr; + +wa_hook_func pre_hook; +wa_hook_func post_hook; +u32 hook_data; +u32 value;/* bitmask representing WA bits */ u32 mask;
drivers/gpu/drm/i915/intel_pm.c +3 -43
71 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.c +59 -0
97 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 20/20 drm/i915: Document the i915_workarounds file
In reply to Oscar MateoDoes what it says on the tin (plus a few fixes in some old comments).
v2: Include display WAs as a separate category.
--- drivers/gpu/drm/i915/intel_pm.c | 4 +-- drivers/gpu/drm/i915/intel_workarounds.c | 47 +++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -3
@@ -8749,9 +8749,7 @@ 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) {
drivers/gpu/drm/i915/intel_workarounds.c +40 -7
73 lines not on this page · raw message
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: warning for Refactor HW workaround code (rev4)
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: Refactor HW workaround code (rev4)
URL : https://patchwork.freedesktop.org/series/31611/
State : warning
== Summary ==
Series 31611v4 Refactor HW workaround code
https://patchwork.freedesktop.org/api/1.0/series/31611/revisions/4/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-WARN (fi-cfl-s) fdo#103186
Test gem_workarounds:
Subgroup basic-read:
pass -> SKIP (fi-bdw-5557u)
pass -> SKIP (fi-bdw-gvtdvm)
pass -> SKIP (fi-bsw-n3050)
pass -> SKIP (fi-skl-6260u)
pass -> SKIP (fi-skl-6600u)
pass -> SKIP (fi-skl-6700hq)
pass -> SKIP (fi-skl-6700k)
pass -> SKIP (fi-skl-6770hq)
pass -> SKIP (fi-skl-gvtdvm)
pass -> SKIP (fi-bxt-dsi)
pass -> SKIP (fi-bxt-j4205)
pass -> SKIP (fi-kbl-7500u)
pass -> SKIP (fi-kbl-7560u)
pass -> SKIP (fi-kbl-7567u)
pass -> SKIP (fi-kbl-r)
pass -> SKIP (fi-glk-1)
pass -> SKIP (fi-cfl-s)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
incomplete -> PASS (fi-bxt-dsi)
Test pm_rpm:
Subgroup basic-pci-d3-state:
incomplete -> FAIL (fi-bxt-j4205)
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-WARN (fi-bdw-5557u)
pass -> DMESG-WARN (fi-bdw-gvtdvm)
pass -> DMESG-WARN (fi-bsw-n3050) fdo#103479
Subgroup basic-no-display:
pass -> DMESG-WARN (fi-bdw-5557u)
pass -> DMESG-WARN (fi-bdw-gvtdvm)
pass -> DMESG-WARN (fi-bsw-n3050)
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-bdw-5557u)
pass -> DMESG-WARN (fi-bdw-gvtdvm)
pass -> DMESG-WARN (fi-bsw-n3050)fdo#103186 https://bugs.freedesktop.org/show_bug.cgi?id=103186
fdo#103479 https://bugs.freedesktop.org/show_bug.cgi?id=103479
fi-bdw-5557u total:289 pass:262 dwarn:3 dfail:0 fail:2 skip:22 time:456s fi-bdw-gvtdvm total:289 pass:261 dwarn:3 dfail:0 fail:0 skip:25 time:453s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:373s fi-bsw-n3050 total:289 pass:237 dwarn:3 dfail:0 fail:2 skip:47 time:538s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:267s fi-bxt-dsi total:289 pass:256 dwarn:0 dfail:0 fail:2 skip:31 time:515s fi-bxt-j4205 total:289 pass:257 dwarn:0 dfail:0 fail:2 skip:30 time:515s fi-byt-j1900 total:289 pass:251 dwarn:1 dfail:0 fail:2 skip:35 time:509s fi-byt-n2820 total:289 pass:247 dwarn:1 dfail:0 fail:2 skip:39 time:497s fi-cfl-s total:289 pass:250 dwarn:4 dfail:0 fail:2 skip:33 time:564s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:421s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:249s fi-glk-1 total:289 pass:258 dwarn:0 dfail:0 fail:2 skip:29 time:598s fi-hsw-4770 total:289 pass:260 dwarn:0 dfail:0 fail:2 skip:27 time:446s fi-hsw-4770r total:289 pass:260 dwarn:0 dfail:0 fail:2 skip:27 time:442s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:415s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:499s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:456s fi-kbl-7500u total:289 pass:261 dwarn:1 dfail:0 fail:2 skip:25 time:509s fi-kbl-7560u total:289 pass:267 dwarn:0 dfail:0 fail:2 skip:20 time:586s fi-kbl-7567u total:289 pass:266 dwarn:0 dfail:0 fail:2 skip:21 time:490s fi-kbl-r total:289 pass:259 dwarn:0 dfail:0 fail:2 skip:28 time:591s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:540s fi-skl-6260u total:289 pass:266 dwarn:0 dfail:0 fail:2 skip:21 time:470s fi-skl-6600u total:289 pass:259 dwarn:0 dfail:0 fail:2 skip:28 time:598s fi-skl-6700hq total:289 pass:260 dwarn:0 dfail:0 fail:2 skip:27 time:659s fi-skl-6700k total:289 pass:262 dwarn:0 dfail:0 fail:2 skip:25 time:543s fi-skl-6770hq total:289 pass:266 dwarn:0 dfail:0 fail:2 skip:21 time:515s fi-skl-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:452s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:559s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:414s
302b1723bec5e7f43e423c975b9b87705fb9fdd6 drm-tip: 2017y-10m-30d-18h-28m-39s UTC integration manifest 87080ff7b53b drm/i915: Document the i915_workarounds file67a5b78838c5 drm/i915: Move WaProgramL3SqcReg1Default to the workarounds file 396de69059e9 drm/i915/bdw: Move GT and Display workarounds from init_clock_gating c1e60e825bf3 drm/i915/chv: Move GT and Display workarounds from init_clock_gating 145bb7fa659a drm/i915/skl: Move GT and Display workarounds from init_clock_gating 0e648f021c9f drm/i915/bxt: Move GT and Display workarounds from init_clock_gating ccabeab078fe drm/i915/kbl: Move GT and Display workarounds from init_clock_gating c6e15d041dce drm/i915/glk: Move GT and Display workarounds from init_clock_gating c70b885f6126 drm/i915/cfl: Move GT and Display workarounds from init_clock_gating 394694e17f42 drm/i915/gen9: Move GT and Display workarounds from init_clock_gating 154721323716 drm/i915/cnl: Move GT and Display workarounds from init_clock_gating 9c801174be23 drm/i915: Move WA BB stuff to the workarounds file as well8bec1242e0b4 drm/i915: Print all workaround types correctly in debugfs6d58ffd7fd3a drm/i915: Create a new category of display WAs4aa32a01de61 drm/i915: Save all Whitelist WAs and apply them at a later time ab6c5bfff3ae drm/i915: Save all GT WAs and apply them at a later time2c91eb7f330f drm/i915: Rename saved workarounds to make it explicit that they are context WAs e4fe9a68f6ee drm/i915: Split out functions for different kinds of workarounds ed3b7bd0fae4 drm/i915: Move a bunch of workaround-related code to its own file 0822716dee29 drm/i915: Remove Gen9 WAs with no effect
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6269/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx