Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_ib.c
diff --git
a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index
9e25eda
..
c77a1eb
100644
(file)
--- a/
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@
-288,7
+288,7
@@
void amdgpu_ib_pool_fini(struct amdgpu_device *adev)
int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
{
unsigned i;
int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
{
unsigned i;
- int r;
+ int r
, ret = 0
;
for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
struct amdgpu_ring *ring = adev->rings[i];
for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
struct amdgpu_ring *ring = adev->rings[i];
@@
-309,10
+309,11
@@
int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
} else {
/* still not good, but we can live with it */
DRM_ERROR("amdgpu: failed testing IB on ring %d (%d).\n", i, r);
} else {
/* still not good, but we can live with it */
DRM_ERROR("amdgpu: failed testing IB on ring %d (%d).\n", i, r);
+ ret = r;
}
}
}
}
}
}
- return
0
;
+ return
ret
;
}
/*
}
/*