diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-11-23 01:56:11 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-11-23 01:56:11 +0100 |
| commit | 9cae7751dc6896fb0c11ac858d3cbd9d6a8c022f (patch) | |
| tree | d01ec99e5703f9a12bda4bc4ab36dad0539c3d4c /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | Merge tag 'imx-drm-next-2017-10-18' of git://git.pengutronix.de/git/pza/linux... (diff) | |
| parent | drm/amdgpu: fix rmmod KCQ disable failed error (diff) | |
| download | linux-9cae7751dc6896fb0c11ac858d3cbd9d6a8c022f.tar.xz linux-9cae7751dc6896fb0c11ac858d3cbd9d6a8c022f.zip | |
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
more misc amdgpu fixes.
* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: fix rmmod KCQ disable failed error
drm/amdgpu: fix kernel hang when starting VNC server
drm/amdgpu: don't skip attributes when powerplay is enabled
drm/amd/pp: fix typecast error in powerplay.
Revert "drm/radeon: dont switch vt on suspend"
drm/amd/amdgpu: fix over-bound accessing in amdgpu_cs_wait_any_fence
drm/amd/powerplay: fix unfreeze level smc message for smu7
drm/amdgpu:fix memleak
drm/amdgpu:fix memleak in takedown
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 146e05f21d35..bdef497a6a26 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1498,7 +1498,7 @@ out: wait->out.status = (r > 0); wait->out.first_signaled = first; - if (array[first]) + if (first < fence_count && array[first]) r = array[first]->error; else r = 0; |