From d769ab182771df6d7ad6c3ecb0449d94043b7921 Mon Sep 17 00:00:00 2001
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
Date: Fri, 7 Apr 2017 13:32:10 +0000
Subject: [PATCH] drm/i915: Fix type of timeout_ms parameter in intel_wait_for_register_fw()
Git-commit: d769ab182771df6d7ad6c3ecb0449d94043b7921
Patch-mainline: v4.13-rc1
References: FATE#322643 bsc#1055900
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@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: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_uncore.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3103,7 +3103,7 @@ int intel_wait_for_register_fw(struct dr
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)
{
--- 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 dr
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);