Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfbcacf4 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: add vm ioctl 



It will be used for reserving vmid for shader debugging
that requires a fixed vmid.

v2: fix warning (Alex)

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 63a7c748

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe) 
const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {

	DRM_IOCTL_DEF_DRV(AMDGPU_GEM_CREATE, amdgpu_gem_create_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(AMDGPU_CTX, amdgpu_ctx_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(AMDGPU_VM, amdgpu_vm_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(AMDGPU_BO_LIST, amdgpu_bo_list_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	/* KMS */

	DRM_IOCTL_DEF_DRV(AMDGPU_GEM_MMAP, amdgpu_gem_mmap_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+16 −0
Original line number Diff line number Diff line
@@ -2322,3 +2322,19 @@ void amdgpu_vm_manager_fini(struct amdgpu_device *adev) 
		}

	}

}



int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)

{

	union drm_amdgpu_vm *args = data;



	switch (args->in.op) {

	case AMDGPU_VM_OP_RESERVE_VMID:

	case AMDGPU_VM_OP_UNRESERVE_VMID:

		return -EINVAL;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h

+1 −0
Original line number Diff line number Diff line
@@ -239,5 +239,6 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, 
void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,

		      struct amdgpu_bo_va *bo_va);

void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size);

int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);



#endif

include/uapi/drm/amdgpu_drm.h

+22 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ extern "C" { 
#define DRM_AMDGPU_GEM_OP		0x10

#define DRM_AMDGPU_GEM_USERPTR		0x11

#define DRM_AMDGPU_WAIT_FENCES		0x12

#define DRM_AMDGPU_VM			0x13



#define DRM_IOCTL_AMDGPU_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)

#define DRM_IOCTL_AMDGPU_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
@@ -65,6 +66,7 @@ extern "C" { 
#define DRM_IOCTL_AMDGPU_GEM_OP		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_OP, struct drm_amdgpu_gem_op)

#define DRM_IOCTL_AMDGPU_GEM_USERPTR	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_USERPTR, struct drm_amdgpu_gem_userptr)

#define DRM_IOCTL_AMDGPU_WAIT_FENCES	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_WAIT_FENCES, union drm_amdgpu_wait_fences)

#define DRM_IOCTL_AMDGPU_VM		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_VM, union drm_amdgpu_vm)



#define AMDGPU_GEM_DOMAIN_CPU		0x1

#define AMDGPU_GEM_DOMAIN_GTT		0x2
@@ -190,6 +192,26 @@ union drm_amdgpu_ctx { 
	union drm_amdgpu_ctx_out out;

};



/* vm ioctl */

#define AMDGPU_VM_OP_RESERVE_VMID	1

#define AMDGPU_VM_OP_UNRESERVE_VMID	2



struct drm_amdgpu_vm_in {

	/** AMDGPU_VM_OP_* */

	__u32	op;

	__u32	flags;

};



struct drm_amdgpu_vm_out {

	/** For future use, no flags defined so far */

	__u64	flags;

};



union drm_amdgpu_vm {

	struct drm_amdgpu_vm_in in;

	struct drm_amdgpu_vm_out out;

};



/*

 * This is not a reliable API and you should expect it to fail for any

 * number of reasons and have fallback path that do not use userptr to