diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-02-10 09:15:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-02-10 09:15:57 +1000 |
| commit | 337d5b5edc3d03a30a972aead75cc6be5dcebbf6 (patch) | |
| tree | 8a3cc5e354d297e4b6b1a38c04eac419c9c26473 /include | |
| parent | 4684f5ce839ab27f5f0414c08084468098363d27 (diff) | |
| parent | 85e26dd5100a182bf8448050427539c0a66ab793 (diff) | |
Merge tag 'drm-misc-fixes-2023-02-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A fix for a circular refcounting in drm/client, one for a memory leak in
amdgpu and a virtio fence fix when interrupted
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230209083600.7hi6roht6xxgldgz@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_client.h | 5 | ||||
| -rw-r--r-- | include/uapi/drm/virtgpu_drm.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h index 4fc8018eddda..1220d185c776 100644 --- a/include/drm/drm_client.h +++ b/include/drm/drm_client.h @@ -127,11 +127,6 @@ struct drm_client_buffer { struct drm_client_dev *client; /** - * @handle: Buffer handle - */ - u32 handle; - - /** * @pitch: Buffer pitch */ u32 pitch; diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index 0512fde5e697..7b158fcb02b4 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -64,6 +64,7 @@ struct drm_virtgpu_map { __u32 pad; }; +/* fence_fd is modified on success if VIRTGPU_EXECBUF_FENCE_FD_OUT flag is set. */ struct drm_virtgpu_execbuffer { __u32 flags; __u32 size; |