Attachment 133739 Details for Bug 102243 – patch used for printing time taken by waiting

[patch] patch used for printing time taken by waiting

wait_for_us_print.diff (text/plain), 3.11 KB, created by Marta Löfstedt on 2017-08-24 11:37:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marta Löfstedt

Created: 2017-08-24 11:37:50 UTC

Size: 3.11 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
>index 20f6f988a308..d5046ab04538 100644
>--- a/drivers/gpu/drm/i915/intel_cdclk.c
>+++ b/drivers/gpu/drm/i915/intel_cdclk.c
>@@ -651,6 +651,8 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,
>        uint32_t val, data;
>        int ret;
> 
>+       printk("%s ENTER\n", __func__);
>+
>        if (WARN((I915_READ(LCPLL_CTL) &
>                  (LCPLL_PLL_DISABLE | LCPLL_PLL_LOCK |
>                   LCPLL_CD_CLOCK_DISABLE | LCPLL_ROOT_CD_CLOCK_DISABLE |
>@@ -672,8 +674,8 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,
>        val |= LCPLL_CD_SOURCE_FCLK;
>        I915_WRITE(LCPLL_CTL, val);
> 
>-       if (wait_for_us(I915_READ(LCPLL_CTL) &
>-                       LCPLL_CD_SOURCE_FCLK_DONE, 2))
>+       if (wait_for_us_print(I915_READ(LCPLL_CTL) &
>+                       LCPLL_CD_SOURCE_FCLK_DONE, 10))
>                DRM_ERROR("Switching to FCLK failed\n");
> 
>        val = I915_READ(LCPLL_CTL);
>@@ -722,6 +724,8 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,
>        WARN(cdclk != dev_priv->cdclk.hw.cdclk,
>             "cdclk requested %d kHz but got %d kHz\n",
>             cdclk, dev_priv->cdclk.hw.cdclk);
>+       printk("%s EXIT\n", __func__);
>+
> }
> 
> static int skl_calc_cdclk(int max_pixclk, int vco)
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index f60995fe455c..2c384be51319 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -118,6 +118,55 @@
>        ret; \
> })
> 
>+
>+#define _wait_for_atomic_print(COND, US, ATOMIC) \
>+({ \
>+        int cpu, ret, timeout = (US) * 1000; \
>+        u64 base; \
>+        _WAIT_FOR_ATOMIC_CHECK(ATOMIC); \
>+        if (!(ATOMIC)) { \
>+                preempt_disable(); \
>+                cpu = smp_processor_id(); \
>+        } \
>+        base = local_clock(); \
>+        for (;;) { \
>+                u64 now = local_clock(); \
>+                if (!(ATOMIC)) \
>+                        preempt_enable(); \
>+                if (COND) { \
>+                 printk("wait FCLK done timeout: %i base: %llu time: %llu\n", timeout, base, (now - base)); \
>+                        ret = 0; \
>+                        break; \
>+                } \
>+                if (now - base >= timeout) { \
>+                        ret = -ETIMEDOUT; \
>+                        break; \
>+                } \
>+                cpu_relax(); \
>+                if (!(ATOMIC)) { \
>+                        preempt_disable(); \
>+                        if (unlikely(cpu != smp_processor_id())) { \
>+                                timeout -= now - base; \
>+                                cpu = smp_processor_id(); \
>+                                base = local_clock(); \
>+                        } \
>+                } \
>+        } \
>+        ret; \
>+})
>+
>+
>+#define wait_for_us_print(COND, US) \
>+({ \
>+       int ret__; \
>+       BUILD_BUG_ON(!__builtin_constant_p(US)); \
>+       if ((US) > 10) \
>+               ret__ = _wait_for((COND), (US), 10); \
>+       else \
>+               ret__ = _wait_for_atomic_print((COND), (US), 0); \
>+       ret__; \
>+})
>+
>

Actions: View | Splinter Review

Attachments on bug 102243: 133739 | 133741 | 133742 | 133743 | 133744 | 133746

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.