drm/i915: switch intel_wait_for_register to uncore

[linux.git] / drivers / gpu / drm / i915 / intel_uncore.c

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 83a8ae5c8e75953cd7d1018dd6d7d90c7e3a669a..35d9ce33bf83b2be167781c6aae13f2b205232c9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1831,15 +1831,14 @@ int __intel_wait_for_register_fw(struct intel_uncore *uncore,
  *
  * Returns 0 if the register matches the desired condition, or -ETIMEOUT.
  */
-int __intel_wait_for_register(struct drm_i915_private *dev_priv,
-                           i915_reg_t reg,
-                           u32 mask,
-                           u32 value,
-                           unsigned int fast_timeout_us,
-                           unsigned int slow_timeout_ms,
-                           u32 *out_value)
-{
-       struct intel_uncore *uncore = &dev_priv->uncore;
+int __intel_wait_for_register(struct intel_uncore *uncore,
+                             i915_reg_t reg,
+                             u32 mask,
+                             u32 value,
+                             unsigned int fast_timeout_us,
+                             unsigned int slow_timeout_ms,
+                             u32 *out_value)
+{
        unsigned fw =
                intel_uncore_forcewake_for_reg(uncore, reg, FW_REG_READ);
        u32 reg_value;