summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2026-08-24 11:21:11 +1000
committerDave Airlie <airlied@redhat.com>2026-08-24 11:21:12 +1000
commite91d58cb2f470fe15bd4e02a26d44e9aaf771346 (patch)
treec568800930e7c70ed1409c7d129683d5f70f81a5 /include/uapi
parentbb11536efd7dbde13a8a168c66881a9b8131dd81 (diff)
parent140b13475302601368c0cf4e193e66126a49feb3 (diff)
downloadlinux-e91d58cb2f470fe15bd4e02a26d44e9aaf771346.tar.gz
linux-e91d58cb2f470fe15bd4e02a26d44e9aaf771346.zip
Merge tag 'drm-msm-next-2026-08-01' of https://gitlab.freedesktop.org/drm/msm into drm-next
Changes for v7.3 Bindings: - Added Shikra support - Document a840, a704, a722 Core: - Use drm_client buffers for fbdev emulation - teardown fixes - ARM32 DMA fixup - Remove objects from evict list when re-validated - Bunch of corner case and error path fixes DPU: - Dropped dev_pm_opp_set_rate(0) preventing burnout - Fixed SSPP offsets of Kaanapali DP: - Dropped dev_pm_opp_set_rate(0) preventing burnout - Cleaned up core code in preparation for MST support - Fixed prepare() to let Pipewire continue in case of the unplugged cable GPU: - Add support for a704 - Add support for a722 HDMI: - Simplifed register access Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rob Clark <rob.clark@oss.qualcomm.com> Link: https://patch.msgid.link/CACSVV02Kp=J+w_RjEJbBbQnBYRb+SWdwMvVbCaAL70bq9EBagQ@mail.gmail.com
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/drm/msm_drm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index 7f2e594be4eb..3d363f12f66a 100644
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h
@@ -228,7 +228,7 @@ struct drm_msm_gem_cpu_fini {
struct drm_msm_syncobj {
__u32 handle; /* in, syncobj handle. */
- __u32 flags; /* in, from MSM_SUBMIT_SYNCOBJ_FLAGS */
+ __u32 flags; /* in, from MSM_SYNCOBJ_FLAGS */
__u64 point; /* in, timepoint for timeline syncobjs. */
};
@@ -393,9 +393,9 @@ struct drm_msm_vm_bind {
__s32 fence_fd;
/** @queue_id: in, submitqueue id */
__u32 queue_id;
- /** @in_syncobjs: in, ptr to array of drm_msm_gem_syncobj */
+ /** @in_syncobjs: in, ptr to array of drm_msm_syncobj */
__u64 in_syncobjs;
- /** @out_syncobjs: in, ptr to array of drm_msm_gem_syncobj */
+ /** @out_syncobjs: in, ptr to array of drm_msm_syncobj */
__u64 out_syncobjs;
/** @nr_in_syncobjs: in, number of entries in in_syncobj */
__u32 nr_in_syncobjs;