summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authormonk.liu <monk.liu@amd.com>2015-06-08 08:48:15 +0200
committerAlex Deucher <alexander.deucher@amd.com>2015-06-29 17:21:45 +0200
commit332300b97e700e000739c8db782406b6fd8f092d (patch)
treec833f7a8e03c70a1f86472bb7bed53b84077a40c /drivers/gpu
parentdrm/amdgpu: print the bo_list in the CS trace point as well (diff)
downloadlinux-332300b97e700e000739c8db782406b6fd8f092d.tar.xz
linux-332300b97e700e000739c8db782406b6fd8f092d.zip
drm/amdgpu: fix wrong type
Signed-off-by: monk.liu <monk.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 8f0fc22f6810..f2d885c1da8f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -522,7 +522,8 @@ long amdgpu_fence_wait_seq_timeout(struct amdgpu_device *adev, u64 *target_seq,
{
uint64_t last_seq[AMDGPU_MAX_RINGS];
bool signaled;
- int i, r;
+ int i;
+ long r;
if (timeout == 0) {
return amdgpu_fence_any_seq_signaled(adev, target_seq);