[Intel-gfx] [PATCH 1/3] drm/i915: Fix type of timeout_ms parameter in intel_wait_for_register_fw()

[Chris Wilson]

On Fri, Apr 07, 2017 at 02:52:25PM +0100, Tvrtko Ursulin wrote:
> 
> On 07/04/2017 14:32, Michal Wajdeczko wrote:
> >There is no need to specify timeout as unsigned long since this parameter
> >will be consumed by usecs_to_jiffies() which expects unsigned int only.
> >
> >Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> >Cc: Chris Wilson <chris at chris-wilson.co.uk>
> >Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> >---
> > drivers/gpu/drm/i915/i915_drv.h     | 2 +-
> > drivers/gpu/drm/i915/intel_uncore.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> >index c9b0949..41188d6 100644
> >--- a/drivers/gpu/drm/i915/i915_drv.h
> >+++ b/drivers/gpu/drm/i915/i915_drv.h
> >@@ -3098,7 +3098,7 @@ int intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
> > 			       i915_reg_t reg,
> > 			       const u32 mask,
> > 			       const u32 value,
> >-			       const unsigned long timeout_ms);
> >+			       const unsigned int timeout_ms);
> >
> > static inline bool intel_gvt_active(struct drm_i915_private *dev_priv)
> > {
> >diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> >index 6d1ea26..bcabf54 100644
> >--- a/drivers/gpu/drm/i915/intel_uncore.c
> >+++ b/drivers/gpu/drm/i915/intel_uncore.c
> >@@ -1610,7 +1610,7 @@ int intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
> > 			       i915_reg_t reg,
> > 			       const u32 mask,
> > 			       const u32 value,
> >-			       const unsigned long timeout_ms)
> >+			       const unsigned int timeout_ms)
> > {
> > #define done ((I915_READ_FW(reg) & mask) == value)
> > 	int ret = wait_for_us(done, 2);
> >
> 
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Pushed this patch an excuse to kick CI. Thanks!
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre