Commit d769ab18 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Fix type of timeout_ms parameter in intel_wait_for_register_fw() 



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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170407133212.174608-1-michal.wajdeczko@intel.com


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent f2be9d68

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3092,7 +3092,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)

{

drivers/gpu/drm/i915/intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE