Commit b6c65a2c authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: add AMDGPU_VM_NOALLOC v2 



Add the AMDGPU_VM_NOALLOC flag to let userspace control MALL allocation.

v2: also add the flag to the allowed flags.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fab2cc83

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

+4 −1
Original line number Diff line number Diff line
@@ -645,6 +645,8 @@ uint64_t amdgpu_gem_va_map_flags(struct amdgpu_device *adev, uint32_t flags) 
		pte_flag |= AMDGPU_PTE_WRITEABLE;

	if (flags & AMDGPU_VM_PAGE_PRT)

		pte_flag |= AMDGPU_PTE_PRT;

	if (flags & AMDGPU_VM_PAGE_NOALLOC)

		pte_flag |= AMDGPU_PTE_NOALLOC;



	if (adev->gmc.gmc_funcs->map_mtype)

		pte_flag |= amdgpu_gmc_map_mtype(adev,
@@ -658,7 +660,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
{

	const uint32_t valid_flags = AMDGPU_VM_DELAY_UPDATE |

		AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE |

		AMDGPU_VM_PAGE_EXECUTABLE | AMDGPU_VM_MTYPE_MASK;

		AMDGPU_VM_PAGE_EXECUTABLE | AMDGPU_VM_MTYPE_MASK |

		AMDGPU_VM_PAGE_NOALLOC;

	const uint32_t prt_flags = AMDGPU_VM_DELAY_UPDATE |

		AMDGPU_VM_PAGE_PRT;

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

+3 −0
Original line number Diff line number Diff line
@@ -613,6 +613,9 @@ static void gmc_v10_0_get_vm_pte(struct amdgpu_device *adev, 
	*flags &= ~AMDGPU_PTE_MTYPE_NV10_MASK;

	*flags |= (mapping->flags & AMDGPU_PTE_MTYPE_NV10_MASK);



	*flags &= ~AMDGPU_PTE_NOALLOC;

	*flags |= (mapping->flags & AMDGPU_PTE_NOALLOC);



	if (mapping->flags & AMDGPU_PTE_PRT) {

		*flags |= AMDGPU_PTE_PRT;

		*flags |= AMDGPU_PTE_SNOOPED;

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

+3 −0
Original line number Diff line number Diff line
@@ -500,6 +500,9 @@ static void gmc_v11_0_get_vm_pte(struct amdgpu_device *adev, 
	*flags &= ~AMDGPU_PTE_MTYPE_NV10_MASK;

	*flags |= (mapping->flags & AMDGPU_PTE_MTYPE_NV10_MASK);



	*flags &= ~AMDGPU_PTE_NOALLOC;

	*flags |= (mapping->flags & AMDGPU_PTE_NOALLOC);



	if (mapping->flags & AMDGPU_PTE_PRT) {

		*flags |= AMDGPU_PTE_PRT;

		*flags |= AMDGPU_PTE_SNOOPED;

include/uapi/drm/amdgpu_drm.h

+2 −0
Original line number Diff line number Diff line
@@ -533,6 +533,8 @@ struct drm_amdgpu_gem_op { 
#define AMDGPU_VM_MTYPE_UC		(4 << 5)

/* Use Read Write MTYPE instead of default MTYPE */

#define AMDGPU_VM_MTYPE_RW		(5 << 5)

/* don't allocate MALL */

#define AMDGPU_VM_PAGE_NOALLOC		(1 << 9)



struct drm_amdgpu_gem_va {

	/** GEM object handle */