projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.7-rc5' into perf/core, to pick up fixes
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
gfx_v7_0.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index
8c6ad1e
..
fc8ff4d
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@
-4833,7
+4833,7
@@
static int gfx_v7_0_eop_irq(struct amdgpu_device *adev,
case 2:
for (i = 0; i < adev->gfx.num_compute_rings; i++) {
ring = &adev->gfx.compute_ring[i];
- if ((ring->me == me_id) & (ring->pipe == pipe_id))
+ if ((ring->me == me_id) &
&
(ring->pipe == pipe_id))
amdgpu_fence_process(ring);
}
break;