Restore workarounds after engine reset and unify their handling
Subsystems (2)
v4 cover Restore workarounds after engine reset and unify their handling
From: Tvrtko Ursulin <[email protected]>
First two patches in this series fix losing of workarounds after engine reset
(https://bugzilla.freedesktop.org/show_bug.cgi?id=107945) which started happening after 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds").
But since it was discovered to be unsafe to simply re-apply all of them, against a possibly active GPU, and potentially from IRQ context, the approach taken was to split GT workarounds and per-engine workarounds. Latter so far contain the ones living in the 0x2xxx and 0xbxxx range, which were empirically shown to be lost after RCS reset.
This way only a smaller set of affected workarounds can be applied after engine resetm, which is done with irq safe read-modify-write cycle.
The series is structured like this so first two patches are as standalone as possible so it is easy (easier) to backport them. The rest of the series cleans up the whole workaround handling by moving all four classes of them to a common framework.
v2:
* One patch less due removing verification after engine reset.
* See patch change logs.
v3:
* Further review comments as per individual change logs.
v4:
* Further review comment tweaks.
Tvrtko Ursulin (7):
drm/i915: Record GT workarounds in a list
drm/i915: Introduce per-engine workarounds
drm/i915: Verify GT workaround state after GPU init drm/i915/selftests: Add tests for GT and engine workaround
verification
drm/i915: Move register white-listing to the common workaround
framework
drm/i915: Fuse per-context workaround handling with the common
framework
drm/i915: Trim unused workaround list entries
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 17 +- drivers/gpu/drm/i915/i915_gem.c | 7 +- drivers/gpu/drm/i915/i915_gem_context.c | 6 +- drivers/gpu/drm/i915/intel_engine_cs.c | 4 + drivers/gpu/drm/i915/intel_lrc.c | 11 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 + drivers/gpu/drm/i915/intel_workarounds.c | 989 +++++++++++------- drivers/gpu/drm/i915/intel_workarounds.h | 36 +- drivers/gpu/drm/i915/selftests/igt_reset.c | 44 + drivers/gpu/drm/i915/selftests/igt_reset.h | 15 + .../gpu/drm/i915/selftests/intel_hangcheck.c | 51 +- .../drm/i915/selftests/intel_workarounds.c | 184 +++- 16 files changed, 886 insertions(+), 499 deletions(-) create mode 100644 drivers/gpu/drm/i915/selftests/igt_reset.c create mode 100644 drivers/gpu/drm/i915/selftests/igt_reset.h
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/7 drm/i915: Record GT workarounds in a list
From: Tvrtko Ursulin <[email protected]>
To enable later verification of GT workaround state at various stages of driver lifetime, we record the list of applicable ones per platforms to a list, from which they are also applied.
The added data structure is a simple array of register, mask and value items, which is allocated on demand as workarounds are added to the list.
This is a temporary implementation which later in the series gets fused with the existing per context workaround list handling. It is separated at this stage since the following patch fixes a bug which needs to be as easy to backport as possible.
Also, since in the following patch we will be adding a new class of workarounds (per engine) which can be applied from interrupt context, we straight away make the provision for safe read-modify-write cycle.
v2:
* Change dev_priv to i915 along the init path. (Chris Wilson)
* API rename. (Chris Wilson)
v3:
* Remove explicit list size tracking in favour of growing the allocation in power of two chunks. (Chris Wilson)
v4:
Chris Wilson:
* Change wa_list_finish to early return.
* Copy workarounds using the compiler for static checking.
* Do not bother zeroing unused entries.
* Re-order struct i915_wa_list.
--- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/intel_workarounds.c | 493 +++++++++++++++-------- drivers/gpu/drm/i915/intel_workarounds.h | 23 +- 5 files changed, 355 insertions(+), 168 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -1453,6 +1453,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)intel_uncore_sanitize (dev_priv); +intel_gt_init_workarounds (dev_priv);i915_gem_load_init_fences (dev_priv);/* On the 945G/GM, the chipset reports the MSI capability on the
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -69,6 +69,7 @@#include "intel_ringbuffer.h" #include "intel_uncore.h" #include "intel_wopcm.h" +#include "intel_workarounds.h" #include "intel_uc.h" #include "i915_gem.h"
@@ -1652,6 +1653,7 @@ struct drm_i915_private {int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ];struct i915_workarounds workarounds; +struct i915_wa_list gt_wa_list;struct i915_frontbuffer_tracking fb_tracking;
drivers/gpu/drm/i915/i915_gem.c +3 -1
@@ -5334,7 +5334,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)I915_WRITE (MI_PREDICATE_RESULT_2 ,IS_HSW_GT3 (dev_priv) ?LOWER_SLICE_ENABLED :LOWER_SLICE_DISABLED ); -intel_gt_workarounds_apply (dev_priv); +intel_gt_apply_workarounds (dev_priv);i915_gem_init_swizzling (dev_priv);
@@ -5706,6 +5706,8 @@ void i915_gem_fini(struct drm_i915_private *dev_priv)i915_gem_contexts_fini (dev_priv);mutex_unlock (&dev_priv->drm.struct_mutex); +intel_wa_list_free (&dev_priv->gt_wa_list); +intel_cleanup_gt_powersave (dev_priv);intel_uc_fini_misc (dev_priv);
drivers/gpu/drm/i915/intel_workarounds.c +327 -166
657 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +22 -1
@@ -7,10 +7,31 @@#ifndef _I915_WORKAROUNDS_H_#define _I915_WORKAROUNDS_H_ +#include <linux/slab.h> + +struct i915_wa { +i915_reg_t reg; +u32 mask; +u32 val; +}; + +struct i915_wa_list { +const char *name; +struct i915_wa *list; +unsigned int count; +}; + +static inline void intel_wa_list_free (struct i915_wa_list *wal) +{ +kfree (wal->list); +memset (wal,0 ,sizeof (*wal)); +} +int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv);int intel_ctx_workarounds_emit (struct i915_request *rq); -void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv); +void intel_gt_init_workarounds (struct drm_i915_private *dev_priv); +void intel_gt_apply_workarounds (struct drm_i915_private *dev_priv);void intel_whitelist_workarounds_apply (struct intel_engine_cs *engine);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/7] drm/i915: Record GT workarounds in a list
Quoting Tvrtko Ursulin (2018-12-03 12:50:08)
Quoted 33 lines
From: Tvrtko Ursulin <[email protected]>
To enable later verification of GT workaround state at various stages of driver lifetime, we record the list of applicable ones per platforms to a list, from which they are also applied.
The added data structure is a simple array of register, mask and value items, which is allocated on demand as workarounds are added to the list.
This is a temporary implementation which later in the series gets fused with the existing per context workaround list handling. It is separated at this stage since the following patch fixes a bug which needs to be as easy to backport as possible.
Also, since in the following patch we will be adding a new class of workarounds (per engine) which can be applied from interrupt context, we straight away make the provision for safe read-modify-write cycle.
v2:
* Changedev_privto i915 along the init path. (Chris Wilson)
* API rename. (Chris Wilson)v3:
* Remove explicit list size tracking in favour of growing the allocation in power of two chunks. (Chris Wilson)v4:
Chris Wilson:
* Changewa_list_finishto early return.
* Copy workarounds using the compiler for static checking.
* Do not bother zeroing unused entries.
* Re-order structi915_wa_list.
Quoted 2 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> # v2
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/7 drm/i915: Record GT workarounds in a list
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
To enable later verification of GT workaround state at various stages of driver lifetime, we record the list of applicable ones per platforms to a list, from which they are also applied.
The added data structure is a simple array of register, mask and value items, which is allocated on demand as workarounds are added to the list.
This is a temporary implementation which later in the series gets fused with the existing per context workaround list handling. It is separated at this stage since the following patch fixes a bug which needs to be as easy to backport as possible.
Also, since in the following patch we will be adding a new class of workarounds (per engine) which can be applied from interrupt context, we straight away make the provision for safe read-modify-write cycle.
v2:
* Change dev_priv to i915 along the init path. (Chris Wilson)
* API rename. (Chris Wilson)
v3:
* Remove explicit list size tracking in favour of growing the allocation in power of two chunks. (Chris Wilson)
v4:
Chris Wilson:
* Change wa_list_finish to early return.
* Copy workarounds using the compiler for static checking.
* Do not bother zeroing unused entries.
* Re-order struct i915_wa_list.
v5:
* kmalloc_array.
* Whitespace cleanup.
--- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 4 +- drivers/gpu/drm/i915/intel_workarounds.c | 492 +++++++++++++++-------- drivers/gpu/drm/i915/intel_workarounds.h | 23 +- 5 files changed, 354 insertions(+), 168 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -1453,6 +1453,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)intel_uncore_sanitize (dev_priv); +intel_gt_init_workarounds (dev_priv);i915_gem_load_init_fences (dev_priv);/* On the 945G/GM, the chipset reports the MSI capability on the
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -69,6 +69,7 @@#include "intel_ringbuffer.h" #include "intel_uncore.h" #include "intel_wopcm.h" +#include "intel_workarounds.h" #include "intel_uc.h" #include "i915_gem.h"
@@ -1652,6 +1653,7 @@ struct drm_i915_private {int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ];struct i915_workarounds workarounds; +struct i915_wa_list gt_wa_list;struct i915_frontbuffer_tracking fb_tracking;
drivers/gpu/drm/i915/i915_gem.c +3 -1
@@ -5334,7 +5334,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)I915_WRITE (MI_PREDICATE_RESULT_2 ,IS_HSW_GT3 (dev_priv) ?LOWER_SLICE_ENABLED :LOWER_SLICE_DISABLED ); -intel_gt_workarounds_apply (dev_priv); +intel_gt_apply_workarounds (dev_priv);i915_gem_init_swizzling (dev_priv);
@@ -5706,6 +5706,8 @@ void i915_gem_fini(struct drm_i915_private *dev_priv)i915_gem_contexts_fini (dev_priv);mutex_unlock (&dev_priv->drm.struct_mutex); +intel_wa_list_free (&dev_priv->gt_wa_list); +intel_cleanup_gt_powersave (dev_priv);intel_uc_fini_misc (dev_priv);
drivers/gpu/drm/i915/intel_workarounds.c +326 -166
656 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +22 -1
@@ -7,10 +7,31 @@#ifndef _I915_WORKAROUNDS_H_#define _I915_WORKAROUNDS_H_ +#include <linux/slab.h> + +struct i915_wa { +i915_reg_t reg; +u32 mask; +u32 val; +}; + +struct i915_wa_list { +const char *name; +struct i915_wa *list; +unsigned int count; +}; + +static inline void intel_wa_list_free (struct i915_wa_list *wal) +{ +kfree (wal->list); +memset (wal,0 ,sizeof (*wal)); +} +int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv);int intel_ctx_workarounds_emit (struct i915_request *rq); -void intel_gt_workarounds_apply (struct drm_i915_private *dev_priv); +void intel_gt_init_workarounds (struct drm_i915_private *dev_priv); +void intel_gt_apply_workarounds (struct drm_i915_private *dev_priv);void intel_whitelist_workarounds_apply (struct intel_engine_cs *engine);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/7 drm/i915: Introduce per-engine workarounds
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
We stopped re-applying the GT workarounds after engine reset since commit 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds").
Issue with this is that some of the GT workarounds live in the MMIO space which gets lost during engine resets. So far the registers in 0x2xxx and 0xbxxx address range have been identified to be affected.
This losing of applied workarounds has obvious negative effects and can even lead to hard system hangs (see the linked Bugzilla).
Rather than just restoring this re-application, because we have also observed that it is not safe to just re-write all GT workarounds after engine resets (GPU might be live and weird hardware states can happen), we introduce a new class of per-engine workarounds and move only the affected GT workarounds over.
Using the framework introduced in the previous patch, we therefore after engine reset, re-apply only the workarounds living in the affected MMIO address ranges.
v2:
* Move Wa_1406609255:icl to engine workarounds as well.
* Rename API. (Chris Wilson)
* Drop redundant IS_KABYLAKE. (Chris Wilson)
* Re-order engine wa/ init so latest platforms are first. (Rodrigo Vivi)
Bugzilla: https://bugzilla.freedesktop.org/show_bug.cgi?id=107945
--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 + drivers/gpu/drm/i915/intel_lrc.c | 4 + drivers/gpu/drm/i915/intel_ringbuffer.h | 2 + drivers/gpu/drm/i915/intel_workarounds.c | 261 ++++++++++++----------- drivers/gpu/drm/i915/intel_workarounds.h | 3 + 5 files changed, 153 insertions(+), 119 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +2 -0
@@ -723,6 +723,8 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)__intel_context_unpin (i915->kernel_context, engine);i915_timeline_fini (&engine->timeline); + +intel_wa_list_free (&engine->wa_list); }u64 intel_engine_get_active_head (const struct intel_engine_cs *engine)
drivers/gpu/drm/i915/intel_lrc.c +4 -0
@@ -1617,6 +1617,8 @@ static bool unexpected_starting_state(struct intel_engine_cs *engine)static int gen8_init_common_ring (struct intel_engine_cs *engine) { +intel_engine_apply_workarounds (engine); +intel_mocs_init_engine (engine);intel_engine_reset_breadcrumbs (engine);
@@ -2314,6 +2316,8 @@ int logical_render_ring_init(struct intel_engine_cs *engine) ret); } +intel_engine_init_workarounds (engine); +return 0 ; err_cleanup_common:
drivers/gpu/drm/i915/intel_ringbuffer.h +2 -0
@@ -15,6 +15,7 @@#include "i915_selftest.h" #include "i915_timeline.h" #include "intel_gpu_commands.h" +#include "intel_workarounds.h" struct drm_printer ;struct i915_sched_attr ;
@@ -451,6 +452,7 @@ struct intel_engine_cs {struct intel_hw_status_page status_page;struct i915_ctx_workarounds wa_ctx; +struct i915_wa_list wa_list;struct i915_vma *scratch;u32 irq_keep_mask;/* always keep these interrupts */
drivers/gpu/drm/i915/intel_workarounds.c +142 -119
344 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +3 -0
@@ -35,4 +35,7 @@ void intel_gt_apply_workarounds(struct drm_i915_private *dev_priv);void intel_whitelist_workarounds_apply (struct intel_engine_cs *engine); +void intel_engine_init_workarounds (struct intel_engine_cs *engine); +void intel_engine_apply_workarounds (struct intel_engine_cs *engine); +#endif
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/7 drm/i915: Introduce per-engine workarounds
From: Tvrtko Ursulin <[email protected]>
We stopped re-applying the GT workarounds after engine reset since commit 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds").
Issue with this is that some of the GT workarounds live in the MMIO space which gets lost during engine resets. So far the registers in 0x2xxx and 0xbxxx address range have been identified to be affected.
This losing of applied workarounds has obvious negative effects and can even lead to hard system hangs (see the linked Bugzilla).
Rather than just restoring this re-application, because we have also observed that it is not safe to just re-write all GT workarounds after engine resets (GPU might be live and weird hardware states can happen), we introduce a new class of per-engine workarounds and move only the affected GT workarounds over.
Using the framework introduced in the previous patch, we therefore after engine reset, re-apply only the workarounds living in the affected MMIO address ranges.
v2:
* Move Wa_1406609255:icl to engine workarounds as well.
* Rename API. (Chris Wilson)
* Drop redundant IS_KABYLAKE. (Chris Wilson)
* Re-order engine wa/ init so latest platforms are first. (Rodrigo Vivi)
Bugzilla: https://bugzilla.freedesktop.org/show_bug.cgi?id=107945
--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 + drivers/gpu/drm/i915/intel_lrc.c | 4 + drivers/gpu/drm/i915/intel_ringbuffer.h | 2 + drivers/gpu/drm/i915/intel_workarounds.c | 261 ++++++++++++----------- drivers/gpu/drm/i915/intel_workarounds.h | 3 + 5 files changed, 153 insertions(+), 119 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +2 -0
@@ -723,6 +723,8 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)__intel_context_unpin (i915->kernel_context, engine);i915_timeline_fini (&engine->timeline); + +intel_wa_list_free (&engine->wa_list); }u64 intel_engine_get_active_head (const struct intel_engine_cs *engine)
drivers/gpu/drm/i915/intel_lrc.c +4 -0
@@ -1617,6 +1617,8 @@ static bool unexpected_starting_state(struct intel_engine_cs *engine)static int gen8_init_common_ring (struct intel_engine_cs *engine) { +intel_engine_apply_workarounds (engine); +intel_mocs_init_engine (engine);intel_engine_reset_breadcrumbs (engine);
@@ -2314,6 +2316,8 @@ int logical_render_ring_init(struct intel_engine_cs *engine) ret); } +intel_engine_init_workarounds (engine); +return 0 ; err_cleanup_common:
drivers/gpu/drm/i915/intel_ringbuffer.h +2 -0
@@ -15,6 +15,7 @@#include "i915_selftest.h" #include "i915_timeline.h" #include "intel_gpu_commands.h" +#include "intel_workarounds.h" struct drm_printer ;struct i915_sched_attr ;
@@ -451,6 +452,7 @@ struct intel_engine_cs {struct intel_hw_status_page status_page;struct i915_ctx_workarounds wa_ctx; +struct i915_wa_list wa_list;struct i915_vma *scratch;u32 irq_keep_mask;/* always keep these interrupts */
drivers/gpu/drm/i915/intel_workarounds.c +142 -119
344 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +3 -0
@@ -35,4 +35,7 @@ void intel_gt_apply_workarounds(struct drm_i915_private *dev_priv);void intel_whitelist_workarounds_apply (struct intel_engine_cs *engine); +void intel_engine_init_workarounds (struct intel_engine_cs *engine); +void intel_engine_apply_workarounds (struct intel_engine_cs *engine); +#endif
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/7 drm/i915: Verify GT workaround state after GPU init
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Since we now have all the GT workarounds in a table, by adding a simple shared helper function we can now verify that their values are still applied after some interesting events in the lifetime of the driver.
Initially we only do this after GPU initialization.
v2:
Chris Wilson:
* Simplify verification by realizing it's a simple xor and and.
* Remove verification from engine reset path.
* Return bool straight away from the verify API.
v3:
* API rename. (Chris Wilson)
--- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_gem.c | 3 +++ drivers/gpu/drm/i915/intel_workarounds.c | 34 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_workarounds.h | 2 ++ 4 files changed, 40 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -53,6 +53,7 @@#include "i915_vgpu.h" #include "intel_drv.h" #include "intel_uc.h" +#include "intel_workarounds.h" static struct drm_driver driver;
drivers/gpu/drm/i915/i915_gem.c +3 -0
@@ -5334,7 +5334,10 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)I915_WRITE (MI_PREDICATE_RESULT_2 ,IS_HSW_GT3 (dev_priv) ?LOWER_SLICE_ENABLED :LOWER_SLICE_DISABLED ); +/* Apply the GT workarounds... */ intel_gt_apply_workarounds (dev_priv); +/* ...and determine whether they are sticking. */ +intel_gt_verify_workarounds (dev_priv,"init" );i915_gem_init_swizzling (dev_priv);
drivers/gpu/drm/i915/intel_workarounds.c +34 -0
@@ -978,6 +978,40 @@ void intel_gt_apply_workarounds(struct drm_i915_private *dev_priv)wa_list_apply (dev_priv, &dev_priv->gt_wa_list); } +static bool +wa_verify (const struct i915_wa *wa,u32 cur,const char *name,const char *from) +{ +if ((cur ^ wa->val) & wa->mask) { +DRM_ERROR ("%s workaround lost on %s! (%x=%x/%x, expected %x, mask=%x)\n" , + name, from,i915_mmio_reg_offset (wa->reg), cur, + cur & wa->mask, wa->val, wa->mask); + +return false; + } + +return true; +} + +static bool wa_list_verify (struct drm_i915_private *dev_priv, +const struct i915_wa_list *wal, +const char *from) +{ +struct i915_wa *wa; +unsigned int i; +bool ok = true; + +for (i =0 , wa = wal->list; i < wal->count; i++, wa++) + ok &=wa_verify (wa,I915_READ (wa->reg), wal->name, from); + +return ok; +} + +bool intel_gt_verify_workarounds (struct drm_i915_private *dev_priv, +const char *from) +{ +return wa_list_verify (dev_priv, &dev_priv->gt_wa_list, from); +} +struct whitelist {i915_reg_t reg[RING_MAX_NONPRIV_SLOTS ];unsigned int count;
drivers/gpu/drm/i915/intel_workarounds.h +2 -0
@@ -32,6 +32,8 @@ int intel_ctx_workarounds_emit(struct i915_request *rq);void intel_gt_init_workarounds (struct drm_i915_private *dev_priv);void intel_gt_apply_workarounds (struct drm_i915_private *dev_priv); +bool intel_gt_verify_workarounds (struct drm_i915_private *dev_priv, +const char *from);void intel_whitelist_workarounds_apply (struct intel_engine_cs *engine);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/7 drm/i915/selftests: Add tests for GT and engine workaround verification
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Two simple selftests which test that both GT and engine workarounds are not lost after either a full GPU reset, or after the per-engine ones.
(Including checks that one engine reset is not affecting workarounds not belonging to itself.)
v2:
* Rebase for series refactoring.
* Add spinner for actual engine reset!
* Add idle reset test as well. (Chris Wilson)
* Share existing global_reset_lock. (Chris Wilson)
v3:
* intel_engine_verify_workarounds can be static.
* API rename. (Chris Wilson)
* Move global reset lock out of the loop. (Chris Wilson)
v4:
* Add missing rpm puts. (Chris Wilson)
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/intel_workarounds.c | 6 + drivers/gpu/drm/i915/selftests/igt_reset.c | 44 ++++++ drivers/gpu/drm/i915/selftests/igt_reset.h | 15 ++ .../gpu/drm/i915/selftests/intel_hangcheck.c | 51 ++----- .../drm/i915/selftests/intel_workarounds.c | 144 +++++++++++++++++- 6 files changed, 214 insertions(+), 47 deletions(-) create mode 100644 drivers/gpu/drm/i915/selftests/igt_reset.c create mode 100644 drivers/gpu/drm/i915/selftests/igt_reset.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -166,6 +166,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ selftests/i915_random.o \ selftests/i915_selftest.o \ selftests/igt_flush_test.o \ + selftests/igt_reset.o \ selftests/igt_spinner.o # virtual gpu code
drivers/gpu/drm/i915/intel_workarounds.c +6 -0
@@ -1304,5 +1304,11 @@ void intel_engine_apply_workarounds(struct intel_engine_cs *engine) }#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST ) +static bool intel_engine_verify_workarounds (struct intel_engine_cs *engine, +const char *from) +{ +return wa_list_verify (engine->i915, &engine->wa_list, from); +} +#include "selftests/intel_workarounds.c" #endif
drivers/gpu/drm/i915/selftests/igt_reset.c new file +44 -0
44 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/igt_reset.h new file +15 -0
@@ -0,0 +1,15 @@ +/* +* SPDX-License-Identifier: MIT +* +* Copyright © 2018 Intel Corporation +*/ + +#ifndef __I915_SELFTESTS_IGT_RESET_H__ +#define __I915_SELFTESTS_IGT_RESET_H__ + +#include "../i915_drv.h" + +void igt_global_reset_lock (struct drm_i915_private *i915); +void igt_global_reset_unlock (struct drm_i915_private *i915); + +#endif
drivers/gpu/drm/i915/selftests/intel_hangcheck.c +9 -42
111 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/intel_workarounds.c +139 -5
175 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 5/7 drm/i915: Move register white-listing to the common workaround framework
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Instead of having a separate list of white-listed registers we can trivially move this to the common workarounds framework.
This brings us one step closer to the goal of driving all workaround classes using the same code.
v2:
* Use GEM_DEBUG_WARN_ON for the sanity check. (Chris Wilson)
v3:
* API rename. (Chris Wilson)
--- drivers/gpu/drm/i915/intel_engine_cs.c | 1 + drivers/gpu/drm/i915/intel_lrc.c | 5 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + drivers/gpu/drm/i915/intel_workarounds.c | 83 ++++++++----------- drivers/gpu/drm/i915/intel_workarounds.h | 3 +- .../drm/i915/selftests/intel_workarounds.c | 40 ++++----- 6 files changed, 60 insertions(+), 73 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +1 -0
@@ -725,6 +725,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)i915_timeline_fini (&engine->timeline);intel_wa_list_free (&engine->wa_list); +intel_wa_list_free (&engine->whitelist); }u64 intel_engine_get_active_head (const struct intel_engine_cs *engine)
drivers/gpu/drm/i915/intel_lrc.c +3 -2
@@ -1643,7 +1643,7 @@ static int gen8_init_render_ring(struct intel_engine_cs *engine)if (ret)return ret; -intel_whitelist_workarounds_apply (engine); +intel_engine_apply_whitelist (engine);/* We need to disable the AsyncFlip performance optimisations in order * to use MI_WAIT_FOR_EVENT within the CS. It should already be
@@ -1666,7 +1666,7 @@ static int gen9_init_render_ring(struct intel_engine_cs *engine)if (ret)return ret; -intel_whitelist_workarounds_apply (engine); +intel_engine_apply_whitelist (engine);return 0 ; }
@@ -2316,6 +2316,7 @@ int logical_render_ring_init(struct intel_engine_cs *engine) ret); } +intel_engine_init_whitelist (engine);intel_engine_init_workarounds (engine);return 0 ;
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -453,6 +453,7 @@ struct intel_engine_cs {struct intel_hw_status_page status_page;struct i915_ctx_workarounds wa_ctx;struct i915_wa_list wa_list; +struct i915_wa_list whitelist;struct i915_vma *scratch;u32 irq_keep_mask;/* always keep these interrupts */
drivers/gpu/drm/i915/intel_workarounds.c +33 -50
165 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +2 -1
@@ -35,7 +35,8 @@ void intel_gt_apply_workarounds(struct drm_i915_private *dev_priv);bool intel_gt_verify_workarounds (struct drm_i915_private *dev_priv,const char *from); -void intel_whitelist_workarounds_apply (struct intel_engine_cs *engine); +void intel_engine_init_whitelist (struct intel_engine_cs *engine); +void intel_engine_apply_whitelist (struct intel_engine_cs *engine);void intel_engine_init_workarounds (struct intel_engine_cs *engine);void intel_engine_apply_workarounds (struct intel_engine_cs *engine);
drivers/gpu/drm/i915/selftests/intel_workarounds.c +20 -20
@@ -94,17 +94,23 @@ read_nonprivs(struct i915_gem_context *ctx, struct intel_engine_cs *engine)return ERR_PTR (err); } -static u32 get_whitelist_reg (const struct whitelist *w,unsigned int i) +static u32 +get_whitelist_reg (const struct intel_engine_cs *engine,unsigned int i) { -return i < w->count ?i915_mmio_reg_offset (w->reg[i]) : w->nopid; +i915_reg_t reg = i < engine->whitelist.count ? + engine->whitelist.list[i].reg : +RING_NOPID (engine->mmio_base); + +return i915_mmio_reg_offset (reg); } -static void print_results (const struct whitelist *w,const u32 *results) +static void +print_results (const struct intel_engine_cs *engine,const u32 *results) {unsigned int i;for (i =0 ; i <RING_MAX_NONPRIV_SLOTS ; i++) { -u32 expected =get_whitelist_reg (w, i); +u32 expected =get_whitelist_reg (engine, i);u32 actual = results[i]; pr_info("RING_NONPRIV[%d]: expected 0x%08x, found 0x%08x\n",
@@ -112,8 +118,7 @@ static void print_results(const struct whitelist *w, const u32 *results) } } -static int check_whitelist (const struct whitelist *w, -struct i915_gem_context *ctx, +static int check_whitelist (struct i915_gem_context *ctx,struct intel_engine_cs *engine) {struct drm_i915_gem_object *results;
@@ -141,11 +146,11 @@ static int check_whitelist(const struct whitelist *w, }for (i =0 ; i <RING_MAX_NONPRIV_SLOTS ; i++) { -u32 expected =get_whitelist_reg (w, i); +u32 expected =get_whitelist_reg (engine, i);u32 actual = vaddr[i];if (expected != actual) { -print_results (w, vaddr); +print_results (engine, vaddr);pr_err ("Invalid RING_NONPRIV[%d], expected 0x%08x, found 0x%08x\n" , i, expected, actual);
@@ -217,7 +222,6 @@ switch_to_scratch_context(struct intel_engine_cs *engine,static int check_whitelist_across_reset (struct intel_engine_cs *engine,int (*reset)(struct intel_engine_cs *), -const struct whitelist *w,const char *name) {struct drm_i915_private *i915 = engine->i915;
@@ -227,7 +231,7 @@ static int check_whitelist_across_reset(struct intel_engine_cs *engine,int err;pr_info ("Checking %d whitelisted registers (RING_NONPRIV) [%s]\n" , - w->count, name); + engine->whitelist.count, name);if (want_spin) { err =igt_spinner_init (&spin, i915);
@@ -239,7 +243,7 @@ static int check_whitelist_across_reset(struct intel_engine_cs *engine,if (IS_ERR (ctx))return PTR_ERR (ctx); - err =check_whitelist (w, ctx, engine); + err =check_whitelist (ctx, engine);if (err) {pr_err ("Invalid whitelist *before* %s reset!\n" , name); goto out;
@@ -263,7 +267,7 @@ static int check_whitelist_across_reset(struct intel_engine_cs *engine, goto out; } - err =check_whitelist (w, ctx, engine); + err =check_whitelist (ctx, engine);if (err) {pr_err ("Whitelist not preserved in context across %s reset!\n" , name);
@@ -276,7 +280,7 @@ static int check_whitelist_across_reset(struct intel_engine_cs *engine,if (IS_ERR (ctx))return PTR_ERR (ctx); - err =check_whitelist (w, ctx, engine); + err =check_whitelist (ctx, engine);if (err) {pr_err ("Invalid whitelist *after* %s reset in fresh context!\n" , name);
@@ -292,22 +296,18 @@ static int live_reset_whitelist(void *arg) {struct drm_i915_private *i915 = arg;struct intel_engine_cs *engine = i915->engine[RCS ]; -struct whitelist w;int err =0 ;/* If we reset the gpu, we should not lose the RING_NONPRIV */ -if (!engine) -return 0 ; - -if (!whitelist_build (engine, &w)) +if (!engine || engine->whitelist.count ==0 )return 0 ;igt_global_reset_lock (i915);if (intel_has_reset_engine (i915)) { err =check_whitelist_across_reset (engine, - do_engine_reset, &w, + do_engine_reset,"engine" );if (err) goto out;
@@ -315,7 +315,7 @@ static int live_reset_whitelist(void *arg)if (intel_has_gpu_reset (i915)) { err =check_whitelist_across_reset (engine, - do_device_reset, &w, + do_device_reset,"device" );if (err) goto out;
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/7 drm/i915: Fuse per-context workaround handling with the common framework
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Convert the per context workaround handling code to run against the newly introduced common workaround framework and fuse the two to use the existing smarter list add helper, the one which does the sorted insert and merges registers where possible.
This completes migration of all four classes of workarounds onto the common framework.
Existing macros are kept untouched for smaller code churn.
v2:
* Rename to list name ctx_wa_list and move from dev_priv to engine.
v3:
* API rename and parameters tweaking. (Chris Wilson)
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 15 - drivers/gpu/drm/i915/i915_gem_context.c | 6 +- drivers/gpu/drm/i915/intel_engine_cs.c | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + drivers/gpu/drm/i915/intel_workarounds.c | 334 +++++++++++------------ drivers/gpu/drm/i915/intel_workarounds.h | 5 +- 9 files changed, 168 insertions(+), 210 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -5
@@ -3375,13 +3375,15 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)static int i915_wa_registers (struct seq_file *m,void *unused) { -struct i915_workarounds *wa = &node_to_i915 (m->private)->workarounds; -int i; +struct drm_i915_private *i915 =node_to_i915 (m->private); +const struct i915_wa_list *wal = &i915->engine[RCS ]->ctx_wa_list; +struct i915_wa *wa; +unsigned int i; -seq_printf (m,"Workarounds applied: %d\n" , wa->count); -for (i =0 ; i < wa->count; ++i) +seq_printf (m,"Workarounds applied: %u\n" , wal->count); +for (i =0 , wa = wal->list; i < wal->count; i++, wa++)seq_printf (m,"0x%X: 0x%08X, mask: 0x%08X\n" , - wa->reg[i].addr, wa->reg[i].value, wa->reg[i].mask); +i915_mmio_reg_offset (wa->reg), wa->val, wa->mask);return 0 ; }
drivers/gpu/drm/i915/i915_drv.h +0 -15
@@ -1189,20 +1189,6 @@ struct i915_frontbuffer_tracking {unsigned flip_bits; }; -struct i915_wa_reg { -u32 addr; -u32 value; -/* bitmask representing WA bits */ -u32 mask; -}; - -#define I915_MAX_WA_REGS 16 - -struct i915_workarounds { -struct i915_wa_reg reg[I915_MAX_WA_REGS ]; -u32 count; -}; -struct i915_virtual_gpu {bool active;u32 caps;
@@ -1652,7 +1638,6 @@ struct drm_i915_private {int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ]; -struct i915_workarounds workarounds;struct i915_wa_list gt_wa_list;struct i915_frontbuffer_tracking fb_tracking;
drivers/gpu/drm/i915/i915_gem_context.c +1 -5
@@ -535,16 +535,12 @@ static bool needs_preempt_context(struct drm_i915_private *i915)int i915_gem_contexts_init (struct drm_i915_private *dev_priv) {struct i915_gem_context *ctx; -int ret;/* Reassure ourselves we are only called once */ GEM_BUG_ON (dev_priv->kernel_context);GEM_BUG_ON (dev_priv->preempt_context); - ret =intel_ctx_workarounds_init (dev_priv); -if (ret) -return ret; - +intel_engine_init_ctx_wa (dev_priv->engine[RCS ]);init_contexts (dev_priv);/* lowest priority; idle task */
drivers/gpu/drm/i915/intel_engine_cs.c +1 -0
@@ -724,6 +724,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)i915_timeline_fini (&engine->timeline); +intel_wa_list_free (&engine->ctx_wa_list);intel_wa_list_free (&engine->wa_list);intel_wa_list_free (&engine->whitelist); }
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -2078,7 +2078,7 @@ static int gen8_init_rcs_context(struct i915_request *rq) {int ret; - ret =intel_ctx_workarounds_emit (rq); + ret =intel_engine_emit_ctx_wa (rq);if (ret)return ret;
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -649,7 +649,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq) {int ret; - ret =intel_ctx_workarounds_emit (rq); + ret =intel_engine_emit_ctx_wa (rq);if (ret !=0 )return ret;
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -452,6 +452,7 @@ struct intel_engine_cs {struct intel_hw_status_page status_page;struct i915_ctx_workarounds wa_ctx; +struct i915_wa_list ctx_wa_list;struct i915_wa_list wa_list;struct i915_wa_list whitelist;struct i915_vma *scratch;
drivers/gpu/drm/i915/intel_workarounds.c +153 -181
571 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +3 -2
@@ -19,6 +19,7 @@ struct i915_wa_list {const char *name;struct i915_wa *list;unsigned int count; +unsigned int wa_count; };static inline void intel_wa_list_free (struct i915_wa_list *wal)
@@ -27,8 +28,8 @@ static inline void intel_wa_list_free(struct i915_wa_list *wal)memset (wal,0 ,sizeof (*wal)); } -int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv); -int intel_ctx_workarounds_emit (struct i915_request *rq); +void intel_engine_init_ctx_wa (struct intel_engine_cs *engine); +int intel_engine_emit_ctx_wa (struct i915_request *rq);void intel_gt_init_workarounds (struct drm_i915_private *dev_priv);void intel_gt_apply_workarounds (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/7 drm/i915: Fuse per-context workaround handling with the common framework
From: Tvrtko Ursulin <[email protected]>
Convert the per context workaround handling code to run against the newly introduced common workaround framework and fuse the two to use the existing smarter list add helper, the one which does the sorted insert and merges registers where possible.
This completes migration of all four classes of workarounds onto the common framework.
Existing macros are kept untouched for smaller code churn.
v2:
* Rename to list name ctx_wa_list and move from dev_priv to engine.
v3:
* API rename and parameters tweaking. (Chris Wilson)
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 15 - drivers/gpu/drm/i915/i915_gem_context.c | 6 +- drivers/gpu/drm/i915/intel_engine_cs.c | 1 + drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + drivers/gpu/drm/i915/intel_workarounds.c | 333 +++++++++++------------ drivers/gpu/drm/i915/intel_workarounds.h | 5 +- 9 files changed, 168 insertions(+), 209 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -5
@@ -3375,13 +3375,15 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)static int i915_wa_registers (struct seq_file *m,void *unused) { -struct i915_workarounds *wa = &node_to_i915 (m->private)->workarounds; -int i; +struct drm_i915_private *i915 =node_to_i915 (m->private); +const struct i915_wa_list *wal = &i915->engine[RCS ]->ctx_wa_list; +struct i915_wa *wa; +unsigned int i; -seq_printf (m,"Workarounds applied: %d\n" , wa->count); -for (i =0 ; i < wa->count; ++i) +seq_printf (m,"Workarounds applied: %u\n" , wal->count); +for (i =0 , wa = wal->list; i < wal->count; i++, wa++)seq_printf (m,"0x%X: 0x%08X, mask: 0x%08X\n" , - wa->reg[i].addr, wa->reg[i].value, wa->reg[i].mask); +i915_mmio_reg_offset (wa->reg), wa->val, wa->mask);return 0 ; }
drivers/gpu/drm/i915/i915_drv.h +0 -15
@@ -1189,20 +1189,6 @@ struct i915_frontbuffer_tracking {unsigned flip_bits; }; -struct i915_wa_reg { -u32 addr; -u32 value; -/* bitmask representing WA bits */ -u32 mask; -}; - -#define I915_MAX_WA_REGS 16 - -struct i915_workarounds { -struct i915_wa_reg reg[I915_MAX_WA_REGS ]; -u32 count; -}; -struct i915_virtual_gpu {bool active;u32 caps;
@@ -1652,7 +1638,6 @@ struct drm_i915_private {int dpio_phy_iosf_port[I915_NUM_PHYS_VLV ]; -struct i915_workarounds workarounds;struct i915_wa_list gt_wa_list;struct i915_frontbuffer_tracking fb_tracking;
drivers/gpu/drm/i915/i915_gem_context.c +1 -5
@@ -535,16 +535,12 @@ static bool needs_preempt_context(struct drm_i915_private *i915)int i915_gem_contexts_init (struct drm_i915_private *dev_priv) {struct i915_gem_context *ctx; -int ret;/* Reassure ourselves we are only called once */ GEM_BUG_ON (dev_priv->kernel_context);GEM_BUG_ON (dev_priv->preempt_context); - ret =intel_ctx_workarounds_init (dev_priv); -if (ret) -return ret; - +intel_engine_init_ctx_wa (dev_priv->engine[RCS ]);init_contexts (dev_priv);/* lowest priority; idle task */
drivers/gpu/drm/i915/intel_engine_cs.c +1 -0
@@ -724,6 +724,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)i915_timeline_fini (&engine->timeline); +intel_wa_list_free (&engine->ctx_wa_list);intel_wa_list_free (&engine->wa_list);intel_wa_list_free (&engine->whitelist); }
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -2078,7 +2078,7 @@ static int gen8_init_rcs_context(struct i915_request *rq) {int ret; - ret =intel_ctx_workarounds_emit (rq); + ret =intel_engine_emit_ctx_wa (rq);if (ret)return ret;
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -649,7 +649,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq) {int ret; - ret =intel_ctx_workarounds_emit (rq); + ret =intel_engine_emit_ctx_wa (rq);if (ret !=0 )return ret;
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -452,6 +452,7 @@ struct intel_engine_cs {struct intel_hw_status_page status_page;struct i915_ctx_workarounds wa_ctx; +struct i915_wa_list ctx_wa_list;struct i915_wa_list wa_list;struct i915_wa_list whitelist;struct i915_vma *scratch;
drivers/gpu/drm/i915/intel_workarounds.c +153 -180
570 lines not on this page · raw message
drivers/gpu/drm/i915/intel_workarounds.h +3 -2
@@ -19,6 +19,7 @@ struct i915_wa_list {const char *name;struct i915_wa *list;unsigned int count; +unsigned int wa_count; };static inline void intel_wa_list_free (struct i915_wa_list *wal)
@@ -27,8 +28,8 @@ static inline void intel_wa_list_free(struct i915_wa_list *wal)memset (wal,0 ,sizeof (*wal)); } -int intel_ctx_workarounds_init (struct drm_i915_private *dev_priv); -int intel_ctx_workarounds_emit (struct i915_request *rq); +void intel_engine_init_ctx_wa (struct intel_engine_cs *engine); +int intel_engine_emit_ctx_wa (struct i915_request *rq);void intel_gt_init_workarounds (struct drm_i915_private *dev_priv);void intel_gt_apply_workarounds (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 7/7 drm/i915: Trim unused workaround list entries
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
The new workaround list allocator grows the list in chunks so will end up with some unused space. Trim it when the initialization phase is done to free up a tiny bit of slab.
v2:
* Simplify with kmemdup. (Chris Wilson)
v3:
* Refactor for __size removal.
--- drivers/gpu/drm/i915/intel_workarounds.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_workarounds.c +15 -1
@@ -53,8 +53,22 @@ static void wa_init_start(struct i915_wa_list *wal, const char *name) wal->name = name; } +#define WA_LIST_CHUNK (1 << 4) +static void wa_init_finish (struct i915_wa_list *wal) { +/* Trim unused entries. */ +if (!IS_ALIGNED (wal->count,WA_LIST_CHUNK )) { +struct i915_wa *list =kmemdup (wal->list, + wal->count *sizeof (*list), +GFP_KERNEL ); + +if (list) { +kfree (wal->list); + wal->list = list; + } + } +if (!wal->count)return ;
@@ -66,7 +80,7 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa) {unsigned int addr =i915_mmio_reg_offset (wa->reg);unsigned int start =0 , end = wal->count; -const unsigned int grow =1 <<4 ; +const unsigned int grow =WA_LIST_CHUNK ;struct i915_wa *wa_;GEM_BUG_ON (!is_power_of_2 (grow));
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/7] drm/i915: Trim unused workaround list entries
Quoting Tvrtko Ursulin (2018-12-03 12:50:14)
Quoted 9 lines
From: Tvrtko Ursulin <[email protected]>
The new workaround list allocator grows the list in chunks so will end up with some unused space. Trim it when the initialization phase is done to free up a tiny bit of slab.
v2:
* Simplify with kmemdup. (Chris Wilson)
Quoted 6 lines
v3:
* Refactor for__sizeremoval.Signed-off-by Tvrtko Ursulin <[email protected]>Reviewed-by Chris Wilson <[email protected]> # v2Reviewed-by Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Restore workarounds after engine reset and unify their handling (rev4)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev4)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 2c7ee2141088 drm/i915: Record GT workarounds in a list -:135: WARNING:ALLOC_WITH_MULTIPLY: Prefer kmalloc_array over kmalloc with multiply #135: FILE: drivers/gpu/drm/i915/intel_workarounds.c:602: + list = kmalloc(ALIGN(wal->count + 1, grow) * sizeof(*wa), + GFP_KERNEL);
-:148: CHECK:LINE_SPACING: Please don't use multiple blank lines #148: FILE: drivers/gpu/drm/i915/intel_workarounds.c:615:
+
+
-:502: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #502: FILE: drivers/gpu/drm/i915/intel_workarounds.c:916:
+ wa_masked_en(wal,
+ _3D_CHICKEN3,
total: 0 errors, 1 warnings, 2 checks, 726 lines checkeda814929884ca drm/i915: Introduce per-engine workarounds
-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds")' #10:59b449d5c82a ("drm/i915: Split out functions for different kinds of
total: 1 errors, 0 warnings, 0 checks, 389 lines checked21f44a8d57a8 drm/i915: Verify GT workaround state after GPU init5e2506a706bf drm/i915/selftests: Add tests for GT and engine workaround verification -:59: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #59:
new file mode 100644
-:64: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #64: FILE: drivers/gpu/drm/i915/selftests/igt_reset.c:1:
+/*
-:114: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #114: FILE: drivers/gpu/drm/i915/selftests/igt_reset.h:1:
+/*
total: 0 errors, 3 warnings, 0 checks, 363 lines checked5118aae39798 drm/i915: Move register white-listing to the common workaround framework dea19ac0666f drm/i915: Fuse per-context workaround handling with the common framework -:186: WARNING:ALLOC_WITH_MULTIPLY: Prefer kmalloc_array over kmalloc with multiply #186: FILE: drivers/gpu/drm/i915/intel_workarounds.c:77:
+ list = kmalloc(ALIGN(wal->count + 1, grow) * sizeof(*wa),
+ GFP_KERNEL);
total: 0 errors, 1 warnings, 0 checks, 682 lines checked b6aae830b133 drm/i915: Trim unused workaround list entries
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Restore workarounds after engine reset and unify their handling (rev4)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev4)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Record GT workarounds in a list -drivers/gpu/drm/i915/selftests/../i915_drv.h:3571:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +./include/linux/slab.h:332:43: warning: dubious: x & !y
Commit: drm/i915: Introduce per-engine workarounds Okay!
Commit: drm/i915: Verify GT workaround state after GPU init Okay!
Commit: drm/i915/selftests: Add tests for GT and engine workaround verification +./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: Move register white-listing to the common workaround framework Okay!
Commit: drm/i915: Fuse per-context workaround handling with the common framework -drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3558:16: warning: expression using sizeof(void)
Commit: drm/i915: Trim unused workaround list entries Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Restore workarounds after engine reset and unify their handling (rev4)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev4)
URL : https://patchwork.freedesktop.org/series/53313/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5240 -> Patchwork_10998
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53313/revisions/4/mbox/
Known issues
------------
Here are the changes found in Patchwork_10998 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-ivb-3520m: PASS -> FAIL [fdo#108880]
#### Warnings ####
* igt@i915_selftest@live_contexts:
- {fi-icl-u3}: INCOMPLETE [fdo#108315] -> DMESG-FAIL [fdo#108569]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108315]: https://bugs.freedesktop.org/show_bug.cgi?id=108315
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108880]: https://bugs.freedesktop.org/show_bug.cgi?id=108880
Participating hosts (47 -> 43)
------------------------------
Additional (1): fi-pnv-d510
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
Build changes
-------------
* Linux: CI_DRM_5240 -> Patchwork_10998
CI_DRM_5240: bc2afe004b92ad969d5fd89de9ccefbc3fcda688 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4736: 285ebfb3b7adc56586031afa5150c4e5ad40c229 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10998: b6aae830b133fd829597a12caffe760e6c08ff44 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
b6aae830b133 drm/i915: Trim unused workaround list entriesdea19ac0666f drm/i915: Fuse per-context workaround handling with the common framework 5118aae39798 drm/i915: Move register white-listing to the common workaround framework 5e2506a706bf drm/i915/selftests: Add tests for GT and engine workaround verification 21f44a8d57a8 drm/i915: Verify GT workaround state after GPU init a814929884ca drm/i915: Introduce per-engine workarounds2c7ee2141088 drm/i915: Record GT workarounds in a list
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10998/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Restore workarounds after engine reset and unify their handling (rev7)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev7)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
0d8922bbcea9 drm/i915: Record GT workarounds in a list
5f4bdd949a82 drm/i915: Introduce per-engine workarounds
-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds")'
#10:
59b449d5c82a ("drm/i915: Split out functions for different kinds oftotal: 1 errors, 0 warnings, 0 checks, 389 lines checkeda5adea0e9978 drm/i915: Verify GT workaround state after GPU initc872addcf55b drm/i915/selftests: Add tests for GT and engine workaround verification -:59: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #59:
new file mode 100644
-:64: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #64: FILE: drivers/gpu/drm/i915/selftests/igt_reset.c:1:
+/*
-:114: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #114: FILE: drivers/gpu/drm/i915/selftests/igt_reset.h:1:
+/*
total: 0 errors, 3 warnings, 0 checks, 363 lines checkedbc8c485122bc drm/i915: Move register white-listing to the common workaround framework d0c549c8e91b drm/i915: Fuse per-context workaround handling with the common framework c66049dd5e5b drm/i915: Trim unused workaround list entries
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Restore workarounds after engine reset and unify their handling (rev7)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev7)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Record GT workarounds in a list -drivers/gpu/drm/i915/selftests/../i915_drv.h:3571:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +./include/linux/slab.h:665:13: error: undefined identifier '__builtin_mul_overflow' +./include/linux/slab.h:665:13: warning: call with no type!
Commit: drm/i915: Introduce per-engine workarounds Okay!
Commit: drm/i915: Verify GT workaround state after GPU init Okay!
Commit: drm/i915/selftests: Add tests for GT and engine workaround verification +./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: Move register white-listing to the common workaround framework Okay!
Commit: drm/i915: Fuse per-context workaround handling with the common framework -drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3558:16: warning: expression using sizeof(void)
Commit: drm/i915: Trim unused workaround list entries Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Restore workarounds after engine reset and unify their handling (rev7)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev7)
URL : https://patchwork.freedesktop.org/series/53313/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5243 -> Patchwork_10999
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_10999 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10999, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53313/revisions/7/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_10999:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_hangcheck:
- fi-bsw-kefka: PASS -> DMESG-FAIL
Known issues
------------
Here are the changes found in Patchwork_10999 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-ivb-3520m: PASS -> FAIL [fdo#108880]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- fi-cfl-8109u: PASS -> INCOMPLETE [fdo#106070] / [fdo#108126]
[fdo#106070]: https://bugs.freedesktop.org/show_bug.cgi?id=106070
[fdo#108126]: https://bugs.freedesktop.org/show_bug.cgi?id=108126
[fdo#108880]: https://bugs.freedesktop.org/show_bug.cgi?id=108880
Participating hosts (47 -> 42)
------------------------------
Additional (1): fi-apl-guc
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510
Build changes
-------------
* Linux: CI_DRM_5243 -> Patchwork_10999
CI_DRM_5243: 30124676e6a86dcb2271b10357331e09c4c75448 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4736: 285ebfb3b7adc56586031afa5150c4e5ad40c229 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10999: c66049dd5e5babefedb9b68630f9e6e7b9ce947e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c66049dd5e5b drm/i915: Trim unused workaround list entriesd0c549c8e91b drm/i915: Fuse per-context workaround handling with the common framework bc8c485122bc drm/i915: Move register white-listing to the common workaround framework c872addcf55b drm/i915/selftests: Add tests for GT and engine workaround verification a5adea0e9978 drm/i915: Verify GT workaround state after GPU init 5f4bdd949a82 drm/i915: Introduce per-engine workarounds0d8922bbcea9 drm/i915: Record GT workarounds in a list
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10999/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Restore workarounds after engine reset and unify their handling (rev8)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev8)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
e2c45229710e drm/i915: Record GT workarounds in a list
68a4800dce59 drm/i915: Introduce per-engine workarounds
-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds")'
#10:
59b449d5c82a ("drm/i915: Split out functions for different kinds oftotal: 1 errors, 0 warnings, 0 checks, 389 lines checkedb48dab8be432 drm/i915: Verify GT workaround state after GPU init5eb7b5ed728b drm/i915/selftests: Add tests for GT and engine workaround verification -:59: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #59:
new file mode 100644
-:64: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #64: FILE: drivers/gpu/drm/i915/selftests/igt_reset.c:1:
+/*
-:114: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #114: FILE: drivers/gpu/drm/i915/selftests/igt_reset.h:1:
+/*
total: 0 errors, 3 warnings, 0 checks, 363 lines checked6997332fc8d8 drm/i915: Move register white-listing to the common workaround framework 3a2e4194081e drm/i915: Fuse per-context workaround handling with the common framework d4c5c1e46f44 drm/i915: Trim unused workaround list entries
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Restore workarounds after engine reset and unify their handling (rev8)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev8)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Record GT workarounds in a list -drivers/gpu/drm/i915/selftests/../i915_drv.h:3571:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +./include/linux/slab.h:665:13: error: undefined identifier '__builtin_mul_overflow' +./include/linux/slab.h:665:13: warning: call with no type!
Commit: drm/i915: Introduce per-engine workarounds Okay!
Commit: drm/i915: Verify GT workaround state after GPU init Okay!
Commit: drm/i915/selftests: Add tests for GT and engine workaround verification +./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: Move register white-listing to the common workaround framework Okay!
Commit: drm/i915: Fuse per-context workaround handling with the common framework -drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3558:16: warning: expression using sizeof(void)
Commit: drm/i915: Trim unused workaround list entries Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Restore workarounds after engine reset and unify their handling (rev9)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev9)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
8fdd7aefba3b drm/i915: Record GT workarounds in a list
506778d9ace9 drm/i915: Introduce per-engine workarounds
-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 59b449d5c82a ("drm/i915: Split out functions for different kinds of workarounds")'
#10:
59b449d5c82a ("drm/i915: Split out functions for different kinds oftotal: 1 errors, 0 warnings, 0 checks, 389 lines checkedde96b7a4e767 drm/i915: Verify GT workaround state after GPU init5af6d7923d9b drm/i915/selftests: Add tests for GT and engine workaround verification -:59: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #59:
new file mode 100644
-:64: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #64: FILE: drivers/gpu/drm/i915/selftests/igt_reset.c:1:
+/*
-:114: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #114: FILE: drivers/gpu/drm/i915/selftests/igt_reset.h:1:
+/*
total: 0 errors, 3 warnings, 0 checks, 363 lines checkedbd69b61b4ff3 drm/i915: Move register white-listing to the common workaround framework ac5b345fee09 drm/i915: Fuse per-context workaround handling with the common framework 2c47e821e14d drm/i915: Trim unused workaround list entries
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Restore workarounds after engine reset and unify their handling (rev9)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev9)
URL : https://patchwork.freedesktop.org/series/53313/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: Record GT workarounds in a list -drivers/gpu/drm/i915/selftests/../i915_drv.h:3573:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3575:16: warning: expression using sizeof(void) +./include/linux/slab.h:665:13: error: undefined identifier '__builtin_mul_overflow' +./include/linux/slab.h:665:13: warning: call with no type!
Commit: drm/i915: Introduce per-engine workarounds Okay!
Commit: drm/i915: Verify GT workaround state after GPU init Okay!
Commit: drm/i915/selftests: Add tests for GT and engine workaround verification +./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
Commit: drm/i915: Move register white-listing to the common workaround framework Okay!
Commit: drm/i915: Fuse per-context workaround handling with the common framework -drivers/gpu/drm/i915/selftests/../i915_drv.h:3575:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3560:16: warning: expression using sizeof(void)
Commit: drm/i915: Trim unused workaround list entries Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Restore workarounds after engine reset and unify their handling (rev9)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev9)
URL : https://patchwork.freedesktop.org/series/53313/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5250 -> Patchwork_11007
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53313/revisions/9/mbox/
Known issues
------------
Here are the changes found in Patchwork_11007 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_create@basic-files:
- fi-bsw-n3050: PASS -> FAIL [fdo#108656]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: PASS -> DMESG-WARN [fdo#102614]
#### Possible fixes ####
* igt@gem_mmap_gtt@basic-small-copy-xy:
- fi-glk-dsi: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (47 -> 42)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
Build changes
-------------
* Linux: CI_DRM_5250 -> Patchwork_11007
CI_DRM_5250: 1e4e49c57969d1b53dea913c92e1d23ec23aee31 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4736: 285ebfb3b7adc56586031afa5150c4e5ad40c229 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11007: 2c47e821e14d2896eba516c6e412c08bc163b904 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2c47e821e14d drm/i915: Trim unused workaround list entriesac5b345fee09 drm/i915: Fuse per-context workaround handling with the common framework bd69b61b4ff3 drm/i915: Move register white-listing to the common workaround framework 5af6d7923d9b drm/i915/selftests: Add tests for GT and engine workaround verification de96b7a4e767 drm/i915: Verify GT workaround state after GPU init 506778d9ace9 drm/i915: Introduce per-engine workarounds8fdd7aefba3b drm/i915: Record GT workarounds in a list
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11007/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Restore workarounds after engine reset and unify their handling (rev8)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev8)
URL : https://patchwork.freedesktop.org/series/53313/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5247 -> Patchwork_11000
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/53313/revisions/8/mbox/
Known issues
------------
Here are the changes found in Patchwork_11000 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160: PASS -> DMESG-FAIL [fdo#108735]
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: PASS -> FAIL [fdo#104008]
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-bsw-n3050: FAIL [fdo#108656] -> PASS
* igt@gem_exec_suspend@basic-s3:
- fi-cfl-8109u: DMESG-WARN [fdo#107345] -> PASS +3
* igt@i915_selftest@live_evict:
- fi-bsw-kefka: DMESG-WARN [fdo#107709] -> PASS
[fdo#104008]: https://bugs.freedesktop.org/show_bug.cgi?id=104008
[fdo#107345]: https://bugs.freedesktop.org/show_bug.cgi?id=107345
[fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709
[fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656
[fdo#108735]: https://bugs.freedesktop.org/show_bug.cgi?id=108735
Participating hosts (48 -> 43)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
Build changes
-------------
* Linux: CI_DRM_5247 -> Patchwork_11000
CI_DRM_5247: ff3d336ae5b3ef75e12ed400fd4ccb55701c212a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4736: 285ebfb3b7adc56586031afa5150c4e5ad40c229 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11000: d4c5c1e46f449f42f10520d0af9208a02f05dca8 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d4c5c1e46f44 drm/i915: Trim unused workaround list entries3a2e4194081e drm/i915: Fuse per-context workaround handling with the common framework 6997332fc8d8 drm/i915: Move register white-listing to the common workaround framework 5eb7b5ed728b drm/i915/selftests: Add tests for GT and engine workaround verification b48dab8be432 drm/i915: Verify GT workaround state after GPU init 68a4800dce59 drm/i915: Introduce per-engine workaroundse2c45229710e drm/i915: Record GT workarounds in a list
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11000/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for Restore workarounds after engine reset and unify their handling (rev8)
Quoted 73 lines · Patchwork
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev8)
URL : https://patchwork.freedesktop.org/series/53313/
State : success== Summary ==
CI Bug Log - changes from
CI_DRM_5247->Patchwork_11000
====================================================Summary
-------**SUCCESS** No regressions found. External URL: https://patchwork.freedesktop.org/api/1.0/series/53313/revisions/8/mbox/Known issues
------------Here are the changes found in
Patchwork_11000that come from known issues:### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160: PASS -> DMESG-FAIL [fdo#108735]* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: PASS -> FAIL [fdo#104008]#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-bsw-n3050: FAIL [fdo#108656] -> PASS* igt@gem_exec_suspend@basic-s3: - fi-cfl-8109u: DMESG-WARN [fdo#107345] -> PASS +3 * igt@i915_selftest@live_evict: - fi-bsw-kefka: DMESG-WARN [fdo#107709] -> PASS [fdo#104008]: https://bugs.freedesktop.org/show_bug.cgi?id=104008 [fdo#107345]: https://bugs.freedesktop.org/show_bug.cgi?id=107345 [fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709 [fdo#108656]: https://bugs.freedesktop.org/show_bug.cgi?id=108656 [fdo#108735]: https://bugs.freedesktop.org/show_bug.cgi?id=108735Participating hosts (48 -> 43)
------------------------------Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600Build changes
-------------* Linux:
CI_DRM_5247->Patchwork_11000CI_DRM_5247: ff3d336ae5b3ef75e12ed400fd4ccb55701c212a @ git://anongit.freedesktop.org/gfx-ci/linux IGT_4736: 285ebfb3b7adc56586031afa5150c4e5ad40c229 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_11000: d4c5c1e46f449f42f10520d0af9208a02f05dca8 @ git://anongit.freedesktop.org/gfx-ci/linux== Linux commits ==
Quoted 7 lines
d4c5c1e46f44drm/i915: Trim unused workaround list entries3a2e4194081edrm/i915: Fuse per-context workaround handling with the common framework6997332fc8d8drm/i915: Move register white-listing to the common workaround framework5eb7b5ed728bdrm/i915/selftests: Add tests for GT and engine workaround verificationb48dab8be432drm/i915: Verify GT workaround state after GPU init68a4800dce59drm/i915: Introduce per-engine workaroundse2c45229710edrm/i915: Record GT workarounds in a list
Pushed, thanks for the reviews and lets hope there are some collateral fixes from this.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Restore workarounds after engine reset and unify their handling (rev9)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev9)
URL : https://patchwork.freedesktop.org/series/53313/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5250_full -> Patchwork_11007_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_11007_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_workarounds:
- {shard-iclb}: PASS -> DMESG-FAIL
Known issues
------------
Here are the changes found in Patchwork_11007_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@pi-ringfull-vebox:
- shard-apl: NOTRUN -> FAIL [fdo#103158]
* igt@gem_userptr_blits@readonly-unsync:
- shard-skl: PASS -> TIMEOUT [fdo#108887]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-hsw: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-glk: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-glk: PASS -> FAIL [fdo#108145]
* igt@kms_cursor_crc@cursor-128x128-offscreen:
- shard-skl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: PASS -> FAIL [fdo#103232] +2
* igt@kms_cursor_crc@cursor-64x64-onscreen:
- shard-apl: PASS -> FAIL [fdo#103232] +2
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: PASS -> FAIL [fdo#103167] +2
* igt@kms_frontbuffer_tracking@fbcpsr-stridechange:
- shard-skl: NOTRUN -> FAIL [fdo#105683]
* igt@kms_plane@pixel-format-pipe-a-planes:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#106885]
* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-glk: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
- shard-skl: NOTRUN -> FAIL [fdo#108145] +2
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
- shard-apl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815] / [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
- shard-apl: PASS -> FAIL [fdo#103166] +2
* igt@kms_properties@connector-properties-atomic:
- shard-skl: NOTRUN -> FAIL [fdo#108642]
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: PASS -> INCOMPLETE [fdo#104108]
* igt@pm_backlight@basic-brightness:
- {shard-iclb}: PASS -> INCOMPLETE [fdo#107820]
* igt@pm_backlight@fade_with_suspend:
- shard-skl: NOTRUN -> FAIL [fdo#107847]
* igt@pm_rpm@cursor:
- shard-skl: PASS -> INCOMPLETE [fdo#107807]
#### Possible fixes ####
* igt@gem_eio@reset-stress:
- shard-glk: FAIL [fdo#107799] -> PASS
* igt@gem_exec_schedule@preempt-queue-chain-render:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS
* igt@kms_busy@extended-pageflip-hang-newfb-render-a:
- shard-glk: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_color@pipe-c-legacy-gamma:
- shard-apl: FAIL [fdo#104782] -> PASS
* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-apl: FAIL [fdo#103232] -> PASS +2
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-skl: INCOMPLETE [fdo#104108] -> PASS +1
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: FAIL [fdo#104873] -> PASS
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-untiled:
- shard-skl: FAIL [fdo#103184] -> PASS
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-hsw: FAIL [fdo#102887] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-glk: FAIL [fdo#103167] -> PASS +3
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: FAIL [fdo#103167] -> PASS
* igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
- shard-apl: FAIL [fdo#103166] -> PASS
* igt@kms_setmode@basic:
- shard-kbl: FAIL [fdo#99912] -> PASS
* igt@pm_rpm@cursor-dpms:
- shard-skl: INCOMPLETE [fdo#107807] -> PASS
* igt@pm_rpm@gem-execbuf-stress-extra-wait:
- shard-skl: INCOMPLETE [fdo#107803] / [fdo#107807] -> PASS
* igt@pm_rpm@reg-read-ioctl:
- {shard-iclb}: DMESG-WARN [fdo#107724] -> PASS
#### Warnings ####
* igt@i915_selftest@live_contexts:
- {shard-iclb}: DMESG-FAIL [fdo#108569] -> INCOMPLETE [fdo#108315]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103158]: https://bugs.freedesktop.org/show_bug.cgi?id=103158
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#105683]: https://bugs.freedesktop.org/show_bug.cgi?id=105683
[fdo#106885]: https://bugs.freedesktop.org/show_bug.cgi?id=106885
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107799]: https://bugs.freedesktop.org/show_bug.cgi?id=107799
[fdo#107803]: https://bugs.freedesktop.org/show_bug.cgi?id=107803
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#107820]: https://bugs.freedesktop.org/show_bug.cgi?id=107820
[fdo#107847]: https://bugs.freedesktop.org/show_bug.cgi?id=107847
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108315]: https://bugs.freedesktop.org/show_bug.cgi?id=108315
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108642]: https://bugs.freedesktop.org/show_bug.cgi?id=108642
[fdo#108887]: https://bugs.freedesktop.org/show_bug.cgi?id=108887
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_5250 -> Patchwork_11007
CI_DRM_5250: 1e4e49c57969d1b53dea913c92e1d23ec23aee31 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4736: 285ebfb3b7adc56586031afa5150c4e5ad40c229 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11007: 2c47e821e14d2896eba516c6e412c08bc163b904 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11007/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.IGT: success for Restore workarounds after engine reset and unify their handling (rev9)
Quoting Patchwork (2018-12-04 09:42:41)
Quoted 23 lines
== Series Details ==
Series: Restore workarounds after engine reset and unify their handling (rev9)
URL : https://patchwork.freedesktop.org/series/53313/
State : success== Summary ==
CI Bug Log - changes from
CI_DRM_5250_full->Patchwork_11007_full
====================================================Summary
-------**SUCCESS**
No regressions found.
Possible new issues
-------------------
Quoted 8 lines
Here are the unknown changes that may have been introduced in
Patchwork_11007_full:### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_workarounds:
- {shard-iclb}: PASS -> DMESG-FAIL
As you say, the shards have a different preproduction machine to BAT. That we are highlighting the pre-existing issue should not block this series I believe, fixing the regression in stable kernels is more important.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx