diff options
author | Dave Airlie <airlied@redhat.com> | 2017-11-09 11:14:47 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-11-09 11:14:47 +1000 |
commit | 086711708b5a0b1662fb86a10dbf2ae9b3c18d0a (patch) | |
tree | 172c1d0c5ca0cbd0254ccd341950836f465f5b62 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |
parent | d65d31388a23b14df9494135ad6c6549a59a3caa (diff) | |
parent | cdd9a8b8599b952e2b39763090689ec2ad8e40c3 (diff) | |
download | talos-op-linux-086711708b5a0b1662fb86a10dbf2ae9b3c18d0a.tar.gz talos-op-linux-086711708b5a0b1662fb86a10dbf2ae9b3c18d0a.zip |
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
A few more fixes for 4.15.
* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: use irq-safe lock for kiq->ring_lock
drm/amdgpu: bypass lru touch for KIQ ring submission
drm/amdgpu: Potential uninitialized variable in amdgpu_vm_update_directories()
drm/amdgpu: potential uninitialized variable in amdgpu_vce_ring_parse_cs()
drm/amd/powerplay: initialize a variable before using it
drm/amd/powerplay: suppress KASAN out of bounds warning in vega10_populate_all_memory_levels
drm/amd/amdgpu: fix evicted VRAM bo adjudgement condition
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index b46280c1279f..2918de2f39ec 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -648,7 +648,7 @@ int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx) uint32_t allocated = 0; uint32_t tmp, handle = 0; uint32_t *size = &tmp; - int i, r, idx = 0; + int i, r = 0, idx = 0; p->job->vm = NULL; ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo); |