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

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

drm/amdgpu: add AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS flag v3 



Add a flag noting that a BO must be created using linear VRAM
and set this flag on all in kernel users where appropriate.

Hopefully I haven't missed anything.

v2: add it in a few more places, fix CPU mapping.
v3: rename to VRAM_CONTIGUOUS, fix typo in CS code.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Tested-by: default avatarMike Lothian <mike@fireburn.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cfa32556

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

+4 −2
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device, 
	switch(type) {

	case CGS_GPU_MEM_TYPE__VISIBLE_CONTIG_FB:

	case CGS_GPU_MEM_TYPE__VISIBLE_FB:

		flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;

		flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

			AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

		domain = AMDGPU_GEM_DOMAIN_VRAM;

		if (max_offset > adev->mc.real_vram_size)

			return -EINVAL;
@@ -157,7 +158,8 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device, 
		break;

	case CGS_GPU_MEM_TYPE__INVISIBLE_CONTIG_FB:

	case CGS_GPU_MEM_TYPE__INVISIBLE_FB:

		flags = AMDGPU_GEM_CREATE_NO_CPU_ACCESS;

		flags = AMDGPU_GEM_CREATE_NO_CPU_ACCESS |

			AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

		domain = AMDGPU_GEM_DOMAIN_VRAM;

		if (adev->mc.visible_vram_size < adev->mc.real_vram_size) {

			place.fpfn =

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

+9 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,15 @@ int amdgpu_cs_sysvm_access_required(struct amdgpu_cs_parser *parser) 
		r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem);

		if (unlikely(r))

			return r;



		if (bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)

			continue;



		bo->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

		amdgpu_ttm_placement_from_domain(bo, bo->allowed_domains);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);

		if (unlikely(r))

			return r;

	}



	return 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ static int amdgpu_vram_scratch_init(struct amdgpu_device *adev) 
	if (adev->vram_scratch.robj == NULL) {

		r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				     AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,

				     NULL, NULL, &adev->vram_scratch.robj);

		if (r) {

			return r;

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

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
	aligned_size = ALIGN(size, PAGE_SIZE);

	ret = amdgpu_gem_object_create(adev, aligned_size, 0,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				       AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				       AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,

				       true, &gobj);

	if (ret) {

		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",

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

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) 
	if (adev->gart.robj == NULL) {

		r = amdgpu_bo_create(adev, adev->gart.table_size,

				     PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				     AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,

				     NULL, NULL, &adev->gart.robj);

		if (r) {

			return r;