Skip to content

Commit f2ea257

Browse files
committed
Merge tag 'drm-misc-fixes-2020-08-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.9-rc1: - Add missing dma_fence_put() in virtio_gpu_execbuffer_ioctl(). - Fix memory leak in virtio_gpu_cleanup_object(). Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 9123e3a + 836b194 commit f2ea257

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/gpu/drm/virtio/virtgpu_ioctl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
179179

180180
virtio_gpu_cmd_submit(vgdev, buf, exbuf->size,
181181
vfpriv->ctx_id, buflist, out_fence);
182+
dma_fence_put(&out_fence->f);
182183
virtio_gpu_notify(vgdev);
183184
return 0;
184185

drivers/gpu/drm/virtio/virtgpu_object.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo)
7979
}
8080

8181
sg_free_table(shmem->pages);
82+
kfree(shmem->pages);
8283
shmem->pages = NULL;
8384
drm_gem_shmem_unpin(&bo->base.base);
8485
}

0 commit comments

Comments
 (0)