drm/nouveau: fixup the uapi header file.
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 drm/nouveau: fixup the uapi header file.
From: Dave Airlie <[email protected]>
nouveau > 10 years ago had a plan for new multiplexer inside a multiplexer API using nvif. It never fully reached fruition, fast forward 10 years, and the new vulkan driver is avoiding libdrm and calling ioctls, and these 3 ioctls, getparam, channel alloc + free don't seem to be things we'd want to use nvif for.
Undeprecate and put them into the uapi header so we can just copy it into mesa later.
v2: use uapi types.
--- drivers/gpu/drm/nouveau/nouveau_abi16.h | 41 --------------------- include/uapi/drm/nouveau_drm.h | 48 +++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 44 deletions(-)
drivers/gpu/drm/nouveau/nouveau_abi16.h +0 -41
@@ -43,28 +43,6 @@ int nouveau_abi16_usif(struct drm_file *, void *data, u32 size);#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)#define NOUVEAU_GEM_DOMAIN_GART (1 << 2) -struct drm_nouveau_channel_alloc { -uint32_t fb_ctxdma_handle; -uint32_t tt_ctxdma_handle; - -int channel; -uint32_t pushbuf_domains; - -/* Notifier memory */ -uint32_t notifier_handle; - -/* DRM-enforced subchannel assignments */ -struct { -uint32_t handle; -uint32_t grclass; - } subchan[8 ]; -uint32_t nr_subchan; -}; - -struct drm_nouveau_channel_free { -int channel; -}; -struct drm_nouveau_grobj_alloc {int channel;uint32_t handle;
@@ -83,31 +61,12 @@ struct drm_nouveau_gpuobj_free {uint32_t handle; }; -#define NOUVEAU_GETPARAM_PCI_VENDOR 3 -#define NOUVEAU_GETPARAM_PCI_DEVICE 4 -#define NOUVEAU_GETPARAM_BUS_TYPE 5 -#define NOUVEAU_GETPARAM_FB_SIZE 8 -#define NOUVEAU_GETPARAM_AGP_SIZE 9 -#define NOUVEAU_GETPARAM_CHIPSET_ID 11 -#define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 -#define NOUVEAU_GETPARAM_GRAPH_UNITS 13 -#define NOUVEAU_GETPARAM_PTIMER_TIME 14 -#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 -#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 -struct drm_nouveau_getparam { -uint64_t param; -uint64_t value; -}; -struct drm_nouveau_setparam {uint64_t param;uint64_t value; }; -#define DRM_IOCTL_NOUVEAU_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GETPARAM, struct drm_nouveau_getparam)#define DRM_IOCTL_NOUVEAU_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_SETPARAM, struct drm_nouveau_setparam) -#define DRM_IOCTL_NOUVEAU_CHANNEL_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_ALLOC, struct drm_nouveau_channel_alloc) -#define DRM_IOCTL_NOUVEAU_CHANNEL_FREE DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_FREE, struct drm_nouveau_channel_free)#define DRM_IOCTL_NOUVEAU_GROBJ_ALLOC DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GROBJ_ALLOC, struct drm_nouveau_grobj_alloc)#define DRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_NOTIFIEROBJ_ALLOC, struct drm_nouveau_notifierobj_alloc)#define DRM_IOCTL_NOUVEAU_GPUOBJ_FREE DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_GPUOBJ_FREE, struct drm_nouveau_gpuobj_free)
include/uapi/drm/nouveau_drm.h +45 -3
67 lines not on this page · raw message
Signature · 1 line
2.41.0
Quoted 8 lines · Dave Airlie
From: Dave Airlie <[email protected]>
nouveau > 10 years ago had a plan for new multiplexer inside a multiplexer API using nvif. It never fully reached fruition, fast forward 10 years, and the new vulkan driver is avoiding libdrm and calling ioctls, and these 3 ioctls, getparam, channel alloc + free don't seem to be things we'd want to use nvif for.
Quoted 7 lines
Undeprecate and put them into the uapi header so we can just copy it into mesa later.
v2: use uapi types.
Signed-off-by Dave Airlie <[email protected]>
Quoted 163 lines
--- drivers/gpu/drm/nouveau/nouveau_abi16.h | 41 --------------------- include/uapi/drm/nouveau_drm.h | 48 +++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 44 deletions(-)drivers/gpu/drm/nouveau/nouveau_abi16.h +0
-22@@ -43,28 +43,6 @@ int nouveau_abi16_usif(struct drm_file *, void *data, u32 size);#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)#define NOUVEAU_GEM_DOMAIN_GART (1 << 2) -struct drm_nouveau_channel_alloc { -uint32_t fb_ctxdma_handle; -uint32_t tt_ctxdma_handle; - -int channel; -uint32_t pushbuf_domains; - -/* Notifier memory */ -uint32_t notifier_handle; - -/* DRM-enforced subchannel assignments */ -struct { -uint32_t handle; -uint32_t grclass; - } subchan[8 ]; -uint32_t nr_subchan; -}; - -struct drm_nouveau_channel_free { -int channel; -}; -struct drm_nouveau_grobj_alloc {int channel;uint32_t handle;drivers/gpu/drm/nouveau/nouveau_abi16.h +0
-19@@ -83,31 +61,12 @@ struct drm_nouveau_gpuobj_free {uint32_t handle; }; -#define NOUVEAU_GETPARAM_PCI_VENDOR 3 -#define NOUVEAU_GETPARAM_PCI_DEVICE 4 -#define NOUVEAU_GETPARAM_BUS_TYPE 5 -#define NOUVEAU_GETPARAM_FB_SIZE 8 -#define NOUVEAU_GETPARAM_AGP_SIZE 9 -#define NOUVEAU_GETPARAM_CHIPSET_ID 11 -#define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 -#define NOUVEAU_GETPARAM_GRAPH_UNITS 13 -#define NOUVEAU_GETPARAM_PTIMER_TIME 14 -#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 -#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 -struct drm_nouveau_getparam { -uint64_t param; -uint64_t value; -}; -struct drm_nouveau_setparam {uint64_t param;uint64_t value; }; -#define DRM_IOCTL_NOUVEAU_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GETPARAM, struct drm_nouveau_getparam)#define DRM_IOCTL_NOUVEAU_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_SETPARAM, struct drm_nouveau_setparam) -#define DRM_IOCTL_NOUVEAU_CHANNEL_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_ALLOC, struct drm_nouveau_channel_alloc) -#define DRM_IOCTL_NOUVEAU_CHANNEL_FREE DRM_IOW (DRM_COMMAND_BASE +
DRM_NOUVEAU_CHANNEL_FREE, structdrm_nouveau_channel_free)
#defineDRM_IOCTL_NOUVEAU_GROBJ_ALLOCDRM_IOW(DRM_COMMAND_BASE+DRM_NOUVEAU_GROBJ_ALLOC, structdrm_nouveau_grobj_alloc)
#defineDRM_IOCTL_NOUVEAU_NOTIFIEROBJ_ALLOCDRM_IOWR(DRM_COMMAND_BASE +DRM_NOUVEAU_NOTIFIEROBJ_ALLOC, structdrm_nouveau_notifierobj_alloc)
#defineDRM_IOCTL_NOUVEAU_GPUOBJ_FREEDRM_IOW(DRM_COMMAND_BASE+DRM_NOUVEAU_GPUOBJ_FREE, structdrm_nouveau_gpuobj_free)include/uapi/drm/nouveau_drm.h +45
-3@@ -33,6 +33,44 @@extern "C" {#endif +#define NOUVEAU_GETPARAM_PCI_VENDOR 3 +#define NOUVEAU_GETPARAM_PCI_DEVICE 4 +#define NOUVEAU_GETPARAM_BUS_TYPE 5 +#define NOUVEAU_GETPARAM_FB_SIZE 8 +#define NOUVEAU_GETPARAM_AGP_SIZE 9 +#define NOUVEAU_GETPARAM_CHIPSET_ID 11 +#define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 +#define NOUVEAU_GETPARAM_GRAPH_UNITS 13 +#define NOUVEAU_GETPARAM_PTIMER_TIME 14 +#define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 +#define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 +struct drm_nouveau_getparam { +__u64 param; +__u64 value; +}; + +struct drm_nouveau_channel_alloc { +__u32 fb_ctxdma_handle; +__u32 tt_ctxdma_handle; + +__s32 channel; +__u32 pushbuf_domains; + +/* Notifier memory */ +__u32 notifier_handle; + +/* DRM-enforced subchannel assignments */ +struct { +__u32 handle; +__u32 grclass; + } subchan[8 ]; +__u32 nr_subchan; +}; + +struct drm_nouveau_channel_free { +__s32 channel; +}; +#define NOUVEAU_GEM_DOMAIN_CPU (1 << 0)#define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1)#define NOUVEAU_GEM_DOMAIN_GART (1 << 2)@@ -126,10 +164,10 @@ struct drm_nouveau_gem_cpu_fini {__u32 handle; }; -#define DRM_NOUVEAU_GETPARAM 0x00/* deprecated */ +#define DRM_NOUVEAU_GETPARAM 0x00#define DRM_NOUVEAU_SETPARAM 0x01/* deprecated */ -#define DRM_NOUVEAU_CHANNEL_ALLOC 0x02/* deprecated */ -#define DRM_NOUVEAU_CHANNEL_FREE 0x03/* deprecated */ +#define DRM_NOUVEAU_CHANNEL_ALLOC 0x02 +#define DRM_NOUVEAU_CHANNEL_FREE 0x03#define DRM_NOUVEAU_GROBJ_ALLOC 0x04/* deprecated */ #define DRM_NOUVEAU_NOTIFIEROBJ_ALLOC 0x05/* deprecated */ #define DRM_NOUVEAU_GPUOBJ_FREE 0x06/* deprecated */ @@ -188,6 +226,10 @@ struct drm_nouveau_svm_bind {#define NOUVEAU_SVM_BIND_TARGET__GPU_VRAM (1UL << 31) +#define DRM_IOCTL_NOUVEAU_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_GETPARAM, struct drm_nouveau_getparam) +#define DRM_IOCTL_NOUVEAU_CHANNEL_ALLOC DRM_IOWR(DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_ALLOC, struct drm_nouveau_channel_alloc) +#define DRM_IOCTL_NOUVEAU_CHANNEL_FREE DRM_IOW (DRM_COMMAND_BASE + DRM_NOUVEAU_CHANNEL_FREE, struct drm_nouveau_channel_free) +#define
DRM_IOCTL_NOUVEAU_SVM_INITDRM_IOWR(DRM_COMMAND_BASE +DRM_NOUVEAU_SVM_INIT, structdrm_nouveau_svm_init)
#defineDRM_IOCTL_NOUVEAU_SVM_BINDDRM_IOWR(DRM_COMMAND_BASE +DRM_NOUVEAU_SVM_BIND, structdrm_nouveau_svm_bind)--
2.41.0