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

drm/amdgpu: use VRAM|GTT for a bunch of kernel allocations 



Technically all of those can use GTT as well, no need to force things
into VRAM.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9c705b96

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

+5 −0
Original line number Diff line number Diff line
@@ -755,6 +755,11 @@ struct amdgpu_mqd { 
#define AMDGPU_PRODUCT_NAME_LEN 64

struct amdgpu_reset_domain;



/*

 * Non-zero (true) if the GPU has VRAM. Zero (false) otherwise.

 */

#define AMDGPU_HAS_VRAM(_adev) ((_adev)->gmc.real_vram_size)



struct amdgpu_device {

	struct device			*dev;

	struct pci_dev			*pdev;

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

+5 −3
Original line number Diff line number Diff line
@@ -934,7 +934,8 @@ static int amdgpu_device_asic_init(struct amdgpu_device *adev) 
static int amdgpu_device_vram_scratch_init(struct amdgpu_device *adev)

{

	return amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_SIZE,

				       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,

				       PAGE_SIZE,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       &adev->vram_scratch.robj,

				       &adev->vram_scratch.gpu_addr,

				       (void **)&adev->vram_scratch.ptr);
@@ -2410,7 +2411,8 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
			/* right after GMC hw init, we create CSA */

			if (amdgpu_mcbp) {

				r = amdgpu_allocate_static_csa(adev, &adev->virt.csa_obj,

								AMDGPU_GEM_DOMAIN_VRAM,

							       AMDGPU_GEM_DOMAIN_VRAM |

							       AMDGPU_GEM_DOMAIN_GTT,

							       AMDGPU_CSA_SIZE);

				if (r) {

					DRM_ERROR("allocate CSA failed %d\n", r);

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

+5 −2
Original line number Diff line number Diff line
@@ -372,8 +372,11 @@ int amdgpu_gfx_mqd_sw_init(struct amdgpu_device *adev, 
		 * KIQ MQD no matter SRIOV or Bare-metal

		 */

		r = amdgpu_bo_create_kernel(adev, mqd_size, PAGE_SIZE,

					    AMDGPU_GEM_DOMAIN_VRAM, &ring->mqd_obj,

					    &ring->mqd_gpu_addr, &ring->mqd_ptr);

					    AMDGPU_GEM_DOMAIN_VRAM |

					    AMDGPU_GEM_DOMAIN_GTT,

					    &ring->mqd_obj,

					    &ring->mqd_gpu_addr,

					    &ring->mqd_ptr);

		if (r) {

			dev_warn(adev->dev, "failed to create ring mqd ob (%d)", r);

			return r;

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

+15 −9
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ static int psp_ring_init(struct psp_context *psp, 
	/* allocate 4k Page of Local Frame Buffer memory for ring */

	ring->ring_size = 0x1000;

	ret = amdgpu_bo_create_kernel(adev, ring->ring_size, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &adev->firmware.rbuf,

				      &ring->ring_mem_mc_addr,

				      (void **)&ring->ring_mem);
@@ -797,9 +798,13 @@ static int psp_tmr_init(struct psp_context *psp) 


	if (!psp->tmr_bo) {

		pptr = amdgpu_sriov_vf(psp->adev) ? &tmr_buf : NULL;

		ret = amdgpu_bo_create_kernel(psp->adev, tmr_size, PSP_TMR_ALIGNMENT,

					      AMDGPU_GEM_DOMAIN_VRAM,

					      &psp->tmr_bo, &psp->tmr_mc_addr, pptr);

		ret = amdgpu_bo_create_kernel(psp->adev, tmr_size,

					      PSP_TMR_ALIGNMENT,

					      AMDGPU_HAS_VRAM(psp->adev) ?

					      AMDGPU_GEM_DOMAIN_VRAM :

					      AMDGPU_GEM_DOMAIN_GTT,

					      &psp->tmr_bo, &psp->tmr_mc_addr,

					      pptr);

	}



	return ret;
@@ -1092,7 +1097,8 @@ int psp_ta_init_shared_buf(struct psp_context *psp, 
	* physical) for ta to host memory

	*/

	return amdgpu_bo_create_kernel(psp->adev, mem_ctx->shared_mem_size,

				      PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,

				      PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &mem_ctx->shared_bo,

				      &mem_ctx->shared_mc_addr,

				      &mem_ctx->shared_buf);
@@ -3444,9 +3450,9 @@ static ssize_t psp_usbc_pd_fw_sysfs_write(struct device *dev, 


	/* LFB address which is aligned to 1MB boundary per PSP request */

	ret = amdgpu_bo_create_kernel(adev, usbc_pd_fw->size, 0x100000,

						AMDGPU_GEM_DOMAIN_VRAM,

						&fw_buf_bo,

						&fw_pri_mc_addr,

				      AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &fw_buf_bo, &fw_pri_mc_addr,

				      &fw_pri_cpu_addr);

	if (ret)

		goto rel_buf;

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

+6 −3
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ int amdgpu_gfx_rlc_init_sr(struct amdgpu_device *adev, u32 dws) 


	/* allocate save restore block */

	r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &adev->gfx.rlc.save_restore_obj,

				      &adev->gfx.rlc.save_restore_gpu_addr,

				      (void **)&adev->gfx.rlc.sr_ptr);
@@ -130,7 +131,8 @@ int amdgpu_gfx_rlc_init_csb(struct amdgpu_device *adev) 
	/* allocate clear state block */

	adev->gfx.rlc.clear_state_size = dws = adev->gfx.rlc.funcs->get_csb_size(adev);

	r = amdgpu_bo_create_kernel(adev, dws * 4, PAGE_SIZE,

				      AMDGPU_GEM_DOMAIN_VRAM,

				      AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &adev->gfx.rlc.clear_state_obj,

				      &adev->gfx.rlc.clear_state_gpu_addr,

				      (void **)&adev->gfx.rlc.cs_ptr);
@@ -156,7 +158,8 @@ int amdgpu_gfx_rlc_init_cpt(struct amdgpu_device *adev) 
	int r;



	r = amdgpu_bo_create_reserved(adev, adev->gfx.rlc.cp_table_size,

				      PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,

				      PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM |

				      AMDGPU_GEM_DOMAIN_GTT,

				      &adev->gfx.rlc.cp_table_obj,

				      &adev->gfx.rlc.cp_table_gpu_addr,

				      (void **)&adev->gfx.rlc.cp_table_ptr);