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

Commit 84b74608 authored by Deepak Sharma's avatar Deepak Sharma Committed by Alex Deucher
Browse files

drm/amdgpu: Add helper function to get buffer domain 



Move logic of getting supported domain to a helper
function

Signed-off-by: default avatarDeepak Sharma <Deepak.Sharma@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bda31a24

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

+3 −7
Original line number Diff line number Diff line
@@ -750,19 +750,15 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv, 
	struct amdgpu_device *adev = dev->dev_private;

	struct drm_gem_object *gobj;

	uint32_t handle;

	u32 domain = amdgpu_display_supported_domains(adev);

	u32 domain;

	int r;



	args->pitch = amdgpu_align_pitch(adev, args->width,

					 DIV_ROUND_UP(args->bpp, 8), 0);

	args->size = (u64)args->pitch * args->height;

	args->size = ALIGN(args->size, PAGE_SIZE);

	if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {

		domain = AMDGPU_GEM_DOMAIN_VRAM;

		if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)

			domain = AMDGPU_GEM_DOMAIN_GTT;

	}



	domain = amdgpu_bo_get_preferred_pin_domain(adev,

				amdgpu_display_supported_domains(adev));

	r = amdgpu_gem_object_create(adev, args->size, 0, domain,

				     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

				     false, NULL, &gobj);

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

+12 −5
Original line number Diff line number Diff line
@@ -703,11 +703,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, 
	/* This assumes only APU display buffers are pinned with (VRAM|GTT).

	 * See function amdgpu_display_supported_domains()

	 */

	if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {

		domain = AMDGPU_GEM_DOMAIN_VRAM;

		if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)

			domain = AMDGPU_GEM_DOMAIN_GTT;

	}

	domain = amdgpu_bo_get_preferred_pin_domain(adev, domain);



	if (bo->pin_count) {

		uint32_t mem_type = bo->tbo.mem.mem_type;
@@ -1066,3 +1062,14 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo) 


	return bo->tbo.offset;

}



uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,

					    uint32_t domain)

{

	if (domain == (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {

		domain = AMDGPU_GEM_DOMAIN_VRAM;

		if (adev->gmc.real_vram_size <= AMDGPU_SG_THRESHOLD)

			domain = AMDGPU_GEM_DOMAIN_GTT;

	}

	return domain;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -289,7 +289,8 @@ int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev, 
				  struct reservation_object *resv,

				  struct dma_fence **fence,

				  bool direct);



uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,

					    uint32_t domain);



/*

 * sub allocation