drm/i915: Move the GTFIFODBG to the common mmio dbg framework
Subsystems (2)
PATCH 1/2 drm/i915: Move the GTFIFODBG to the common mmio dbg framework
From: Mika Kuoppala <[email protected]>
Remove the per-mmio checking of the FIFO debug register into the common conditional mmio debug handling. Based on patch from Chris Wilson.
v2: postpone warn on fifodbg for unclaimed reg debugs
--- drivers/gpu/drm/i915/intel_uncore.c | 76 +++++++++++++++---------------------- 1 file changed, 30 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +30 -46
@@ -172,22 +172,6 @@ static void fw_domains_get_with_thread_status(struct drm_i915_private *dev_priv,__gen6_gt_wait_for_thread_c0 (dev_priv); } -static void gen6_gt_check_fifodbg (struct drm_i915_private *dev_priv) -{ -u32 gtfifodbg; - - gtfifodbg =__raw_i915_read32 (dev_priv,GTFIFODBG ); -if (WARN (gtfifodbg,"GT wake FIFO error 0x%x\n" , gtfifodbg)) -__raw_i915_write32 (dev_priv,GTFIFODBG , gtfifodbg); -} - -static void fw_domains_put_with_fifo (struct drm_i915_private *dev_priv, -enum forcewake_domains fw_domains) -{ -fw_domains_put (dev_priv, fw_domains); -gen6_gt_check_fifodbg (dev_priv); -} -static inline u32 fifo_free_entries (struct drm_i915_private *dev_priv) {u32 count =__raw_i915_read32 (dev_priv,GTFIFOCTL );
@@ -384,15 +368,35 @@ vlv_check_for_unclaimed_mmio(struct drm_i915_private *dev_priv) }static bool +gen6_check_for_fifo_debug (struct drm_i915_private *dev_priv) +{ +u32 fifodbg; + + fifodbg =__raw_i915_read32 (dev_priv,GTFIFODBG ); + +if (unlikely (fifodbg)) { +DRM_DEBUG_DRIVER ("GTFIFODBG = 0x08%x\n" , fifodbg); +__raw_i915_write32 (dev_priv,GTFIFODBG , fifodbg); + } + +return fifodbg; +} + +static bool check_for_unclaimed_mmio (struct drm_i915_private *dev_priv) { +bool ret = false; +if (HAS_FPGA_DBG_UNCLAIMED (dev_priv)) -return fpga_check_for_unclaimed_mmio (dev_priv); + ret |=fpga_check_for_unclaimed_mmio (dev_priv);if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -return vlv_check_for_unclaimed_mmio (dev_priv); + ret |=vlv_check_for_unclaimed_mmio (dev_priv); -return false; +if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) + ret |=gen6_check_for_fifo_debug (dev_priv); + +return ret; } static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,
@@ -404,11 +408,6 @@ static void __intel_uncore_early_sanitize(struct drm_i915_private *dev_priv,if (check_for_unclaimed_mmio (dev_priv))DRM_DEBUG ("unclaimed mmio detected on uncore init, clearing\n" ); -/* clear out old GT FIFO errors */ -if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) -__raw_i915_write32 (dev_priv,GTFIFODBG , -__raw_i915_read32 (dev_priv,GTFIFODBG )); -/* WaDisableShadowRegForCpd:chv */ if (IS_CHERRYVIEW (dev_priv)) { __raw_i915_write32(dev_priv, GTFIFOCTL,
@@ -1047,15 +1046,10 @@ __gen2_write(32)#define __gen6_write (x) \ static void \ gen6_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { \ - u32 __fifo_ret = 0; \ GEN6_WRITE_HEADER; \ - if (NEEDS_FORCE_WAKE(offset)) { \ - __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ - } \ + if (NEEDS_FORCE_WAKE(offset)) \ + __gen6_gt_wait_for_fifo(dev_priv); \ __raw_i915_write##x(dev_priv, reg, val); \ - if (unlikely(__fifo_ret)) { \ - gen6_gt_check_fifodbg(dev_priv); \ - } \ GEN6_WRITE_FOOTER; \ }
@@ -1190,11 +1184,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9); }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { dev_priv->uncore.funcs.force_wake_get = fw_domains_get; -if (!IS_CHERRYVIEW (dev_priv)) - dev_priv->uncore.funcs.force_wake_put = - fw_domains_put_with_fifo; -else - dev_priv->uncore.funcs.force_wake_put = fw_domains_put; + dev_priv->uncore.funcs.force_wake_put = fw_domains_put;fw_domain_init (dev_priv,FW_DOMAIN_ID_RENDER ,FORCEWAKE_VLV ,FORCEWAKE_ACK_VLV ); fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
@@ -1202,11 +1192,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { dev_priv->uncore.funcs.force_wake_get = fw_domains_get_with_thread_status; -if (IS_HASWELL (dev_priv)) - dev_priv->uncore.funcs.force_wake_put = - fw_domains_put_with_fifo; -else - dev_priv->uncore.funcs.force_wake_put = fw_domains_put; + dev_priv->uncore.funcs.force_wake_put = fw_domains_put;fw_domain_init (dev_priv,FW_DOMAIN_ID_RENDER ,FORCEWAKE_MT ,FORCEWAKE_ACK_HSW ); }else if (IS_IVYBRIDGE (dev_priv)) {
@@ -1223,8 +1209,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv)*/ dev_priv->uncore.funcs.force_wake_get = fw_domains_get_with_thread_status; - dev_priv->uncore.funcs.force_wake_put = - fw_domains_put_with_fifo; + dev_priv->uncore.funcs.force_wake_put = fw_domains_put;/* We need to init first for ECOBUS access and then * determine later if we want to reinit, in case of MT access is
@@ -1242,7 +1227,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv)spin_lock_irq (&dev_priv->uncore.lock);fw_domains_get_with_thread_status (dev_priv,FORCEWAKE_RENDER ); ecobus =__raw_i915_read32 (dev_priv,ECOBUS ); -fw_domains_put_with_fifo (dev_priv,FORCEWAKE_RENDER ); +fw_domains_put (dev_priv,FORCEWAKE_RENDER );spin_unlock_irq (&dev_priv->uncore.lock);if (!(ecobus &FORCEWAKE_MT_ENABLE )) {
@@ -1254,8 +1239,7 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) }else if (IS_GEN6 (dev_priv)) { dev_priv->uncore.funcs.force_wake_get = fw_domains_get_with_thread_status; - dev_priv->uncore.funcs.force_wake_put = - fw_domains_put_with_fifo; + dev_priv->uncore.funcs.force_wake_put = fw_domains_put;fw_domain_init (dev_priv,FW_DOMAIN_ID_RENDER ,FORCEWAKE ,FORCEWAKE_ACK ); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Use wait_for_atomic_us when waiting for gt fifo
From: Mika Kuoppala <[email protected]>
Replace the handcrafter loop when checking for fifo slots with atomic wait for. This brings this wait in line with the other waits on register access. We also get a readable timeout constraint, so make it to fail after 10ms.
Chris suggested that we should fail silently as the fifo debug handler, now attached to unclaimed mmio handling, will take care of the possible errors at later stage.
Note that the decision to wait was changed so that we avoid allocating the first reserved entry. Nor do we reduce the count if we fail the wait, removing the possiblity to wrap the count if the hw fifo returned zero.
v2: remove unclaimed check on timeout (Chris)
References: https://bugs.freedesktop.org/show_bug.cgi?id=100247
--- drivers/gpu/drm/i915/intel_uncore.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +14 -15
@@ -29,6 +29,7 @@#include <linux/pm_runtime.h> #define FORCEWAKE_ACK_TIMEOUT_MS 50 +#define GT_FIFO_TIMEOUT_MS 10#define __raw_posting_read (dev_priv__, reg__) (void)__raw_i915_read32((dev_priv__), (reg__))
@@ -181,28 +182,26 @@ static inline u32 fifo_free_entries(struct drm_i915_private *dev_priv)static int __gen6_gt_wait_for_fifo (struct drm_i915_private *dev_priv) { -int ret =0 ; +u32 n;/* On VLV, FIFO will be shared by both SW and HW. * So, we need to read the FREE_ENTRIES everytime */ if (IS_VALLEYVIEW (dev_priv)) - dev_priv->uncore.fifo_count =fifo_free_entries (dev_priv); - -if (dev_priv->uncore.fifo_count <GT_FIFO_NUM_RESERVED_ENTRIES ) { -int loop =500 ; -u32 fifo =fifo_free_entries (dev_priv); - -while (fifo <=GT_FIFO_NUM_RESERVED_ENTRIES && loop--) { -udelay (10 ); - fifo =fifo_free_entries (dev_priv); + n =fifo_free_entries (dev_priv); +else + n = dev_priv->uncore.fifo_count; + +if (n <=GT_FIFO_NUM_RESERVED_ENTRIES ) { +if (wait_for_atomic ((n =fifo_free_entries (dev_priv)) > +GT_FIFO_NUM_RESERVED_ENTRIES , +GT_FIFO_TIMEOUT_MS )) { +DRM_DEBUG ("GT_FIFO timeout, entries: %u\n" , n); +return -EBUSY ; } -if (WARN_ON (loop <0 && fifo <=GT_FIFO_NUM_RESERVED_ENTRIES )) - ++ret; - dev_priv->uncore.fifo_count = fifo; } - dev_priv->uncore.fifo_count--; -return ret; + dev_priv->uncore.fifo_count = n -1 ; +return 0 ; } static enum hrtimer_restart
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [CI,1/2] drm/i915: Move the GTFIFODBG to the common mmio dbg framework
In reply to Mika Kuoppala== Series Details ==
== Series Details ==
Series: series starting with [CI,1/2] drm/i915: Move the GTFIFODBG to the common mmio dbg framework
URL : https://patchwork.freedesktop.org/series/23804/
State : success
== Summary ==
Series 23804v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/23804/revisions/1/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:433s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:432s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:581s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:514s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:540s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:486s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:482s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:413s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:411s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:412s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:487s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:472s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:452s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:564s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:453s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:462s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:502s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:433s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:529s fi-snb-2600 total:278 pass:248 dwarn:1 dfail:0 fail:0 skip:29 time:413s
310077224306c08a82476bb616de679715e83485 drm-tip: 2017y-05m-02d-12h-04m-57s UTC integration manifest 48bedb7 drm/i915: Use wait_for_atomic_us when waiting for gt fifo
3017c51 drm/i915: Move the GTFIFODBG to the common mmio dbg framework
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4595/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx