summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-06-13 18:26:24 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-06-13 18:26:24 -0400
commit8b18300c13a1e08e152f6b6a430faac84f986231 (patch)
tree8a88ff44bf5aa4771a9c92bf39830e878667bc13 /drivers/gpu
parent05082b8bbd1a0ffc74235449c4b8930a8c240f85 (diff)
downloadblackbird-op-linux-8b18300c13a1e08e152f6b6a430faac84f986231.tar.gz
blackbird-op-linux-8b18300c13a1e08e152f6b6a430faac84f986231.zip
drm/amdgpu/gfx7: fix broken condition check
Wrong operator. Reported-by: David Binderman <linuxdev.baldrick@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 8c6ad1e72f02..fc8ff4d3ccf8 100644
--- 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;
OpenPOWER on IntegriCloud