Commit 460be1d5 authored by Karol Herbst's avatar Karol Herbst
Browse files

drm/nouveau: move more missing UAPI bits 



Those are already de-facto UAPI, so let's just move it into the uapi
header.

Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240305133853.2214268-2-kherbst@redhat.com
parent 113cc3ad

drivers/gpu/drm/nouveau/nouveau_abi16.c

+15 −5
Original line number Diff line number Diff line
@@ -312,11 +312,21 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) 
	if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) {

		if (init->fb_ctxdma_handle == ~0) {

			switch (init->tt_ctxdma_handle) {

			case 0x01: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_GR    ; break;

			case 0x02: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPDEC; break;

			case 0x04: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPPP ; break;

			case 0x08: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSVLD ; break;

			case 0x30: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_CE    ; break;

			case NOUVEAU_FIFO_ENGINE_GR:

				engine = NV_DEVICE_HOST_RUNLIST_ENGINES_GR;

				break;

			case NOUVEAU_FIFO_ENGINE_VP:

				engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPDEC;

				break;

			case NOUVEAU_FIFO_ENGINE_PPP:

				engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPPP;

				break;

			case NOUVEAU_FIFO_ENGINE_BSP:

				engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSVLD;

				break;

			case NOUVEAU_FIFO_ENGINE_CE:

				engine = NV_DEVICE_HOST_RUNLIST_ENGINES_CE;

				break;

			default:

				return nouveau_abi16_put(abi16, -ENOSYS);

			}

drivers/gpu/drm/nouveau/nouveau_abi16.h

+0 −12
Original line number Diff line number Diff line
@@ -50,18 +50,6 @@ struct drm_nouveau_grobj_alloc { 
	int      class;

};



struct drm_nouveau_notifierobj_alloc {

	uint32_t channel;

	uint32_t handle;

	uint32_t size;

	uint32_t offset;

};



struct drm_nouveau_gpuobj_free {

	int      channel;

	uint32_t handle;

};



struct drm_nouveau_setparam {

	uint64_t param;

	uint64_t value;

include/uapi/drm/nouveau_drm.h

+22 −0
Original line number Diff line number Diff line
@@ -73,6 +73,16 @@ struct drm_nouveau_getparam { 
	__u64 value;

};



/*

 * Those are used to support selecting the main engine used on Kepler.

 * This goes into drm_nouveau_channel_alloc::tt_ctxdma_handle

 */

#define NOUVEAU_FIFO_ENGINE_GR  0x01

#define NOUVEAU_FIFO_ENGINE_VP  0x02

#define NOUVEAU_FIFO_ENGINE_PPP 0x04

#define NOUVEAU_FIFO_ENGINE_BSP 0x08

#define NOUVEAU_FIFO_ENGINE_CE  0x30



struct drm_nouveau_channel_alloc {

	__u32     fb_ctxdma_handle;

	__u32     tt_ctxdma_handle;
@@ -95,6 +105,18 @@ struct drm_nouveau_channel_free { 
	__s32 channel;

};



struct drm_nouveau_notifierobj_alloc {

	__u32 channel;

	__u32 handle;

	__u32 size;

	__u32 offset;

};



struct drm_nouveau_gpuobj_free {

	__s32 channel;

	__u32 handle;

};



#define NOUVEAU_GEM_DOMAIN_CPU       (1 << 0)

#define NOUVEAU_GEM_DOMAIN_VRAM      (1 << 1)

#define NOUVEAU_GEM_DOMAIN_GART      (1 << 2)