[PATCH v2] drm/i915: Use wait_for_register in lpt_reset_fdi_mphy()

* [PATCH v2] drm/i915: Use wait_for_register in lpt_reset_fdi_mphy()
@ 2017-04-10 10:22 Michal Wajdeczko
  2017-04-10 10:38 ` ✓ Fi.CI.BAT: success for drm/i915: Use wait_for_register in lpt_reset_fdi_mphy() (rev2) Patchwork
  2017-04-10 11:41 ` [PATCH v2] drm/i915: Use wait_for_register in lpt_reset_fdi_mphy() Chris Wilson
  0 siblings, 2 replies; 6+ messages in thread
From: Michal Wajdeczko @ 2017-04-10 10:22 UTC (permalink / raw)
  To: intel-gfx; +Cc: Paulo Zanoni

There is no need to use macros as we can use generic function.
And we can save ~2000 bytes in driver footprint.

v2: drop ret var, add 10ms fallback (Chris)

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_display.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b6b40cd..eeb828c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7703,16 +7703,21 @@ static void lpt_reset_fdi_mphy(struct drm_i915_private *dev_priv)
 	tmp |= FDI_MPHY_IOSFSB_RESET_CTL;
 	I915_WRITE(SOUTH_CHICKEN2, tmp);
 
-	if (wait_for_us(I915_READ(SOUTH_CHICKEN2) &
-			FDI_MPHY_IOSFSB_RESET_STATUS, 100))
+	if (__intel_wait_for_register_fw(dev_priv,
+					 SOUTH_CHICKEN2,
+					 FDI_MPHY_IOSFSB_RESET_STATUS,
+					 FDI_MPHY_IOSFSB_RESET_STATUS,
+					 100, 10, &tmp))
 		DRM_ERROR("FDI mPHY reset assert timeout\n");
 
-	tmp = I915_READ(SOUTH_CHICKEN2);
 	tmp &= ~FDI_MPHY_IOSFSB_RESET_CTL;
 	I915_WRITE(SOUTH_CHICKEN2, tmp);
 
-	if (wait_for_us((I915_READ(SOUTH_CHICKEN2) &
-			 FDI_MPHY_IOSFSB_RESET_STATUS) == 0, 100))
+	if (__intel_wait_for_register_fw(dev_priv,
+					 SOUTH_CHICKEN2,
+					 FDI_MPHY_IOSFSB_RESET_STATUS,
+					 0,
+					 100, 10, NULL))
 		DRM_ERROR("FDI mPHY reset de-assert timeout\n");
 }
 
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread