Commit f2ea2578 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d50eb2e0-75c8-b724-006f-5e7b391961ff@linux.intel.com
parents 9123e3a7 836b194d

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, 


	virtio_gpu_cmd_submit(vgdev, buf, exbuf->size,

			      vfpriv->ctx_id, buflist, out_fence);

	dma_fence_put(&out_fence->f);

	virtio_gpu_notify(vgdev);

	return 0;

drivers/gpu/drm/virtio/virtgpu_object.c

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo) 
			}



			sg_free_table(shmem->pages);

			kfree(shmem->pages);

			shmem->pages = NULL;

			drm_gem_shmem_unpin(&bo->base.base);

		}