Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / intel_uncore.h

diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index 6e6b3675d0a0ed221f431044e46a147aa728adb5..53ef77d0c97c55bf89afd286e4b27034a13c7ae6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -163,11 +163,23 @@ void intel_uncore_forcewake_put__locked(struct drm_i915_private *dev_priv,
 void intel_uncore_forcewake_user_get(struct drm_i915_private *dev_priv);
 void intel_uncore_forcewake_user_put(struct drm_i915_private *dev_priv);
 
+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);
+static inline
 int intel_wait_for_register(struct drm_i915_private *dev_priv,
                            i915_reg_t reg,
                            u32 mask,
                            u32 value,
-                           unsigned int timeout_ms);
+                           unsigned int timeout_ms)
+{
+       return __intel_wait_for_register(dev_priv, reg, mask, value, 2,
+                                        timeout_ms, NULL);
+}
 int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
                                 i915_reg_t reg,
                                 u32 mask,