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

drm/amdgpu: rename vram_scratch into mem_scratch 



Rename vram_scratch into mem_scratch and allow allocating it into GTT as
well.

The only problem with that is that we won't have a default page for the
system aperture any more.

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 58ab2c08

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

+2 −2
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data, 
				struct drm_file *filp);



/* VRAM scratch page for HDP bug, default vram page */

struct amdgpu_vram_scratch {

struct amdgpu_mem_scratch {

	struct amdgpu_bo		*robj;

	volatile uint32_t		*ptr;

	u64				gpu_addr;
@@ -853,7 +853,7 @@ struct amdgpu_device { 


	/* memory management */

	struct amdgpu_mman		mman;

	struct amdgpu_vram_scratch	vram_scratch;

	struct amdgpu_mem_scratch	mem_scratch;

	struct amdgpu_wb		wb;

	atomic64_t			num_bytes_moved;

	atomic64_t			num_evictions;

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

+14 −14
Original line number Diff line number Diff line
@@ -924,33 +924,33 @@ static int amdgpu_device_asic_init(struct amdgpu_device *adev) 
}



/**

 * amdgpu_device_vram_scratch_init - allocate the VRAM scratch page

 * amdgpu_device_mem_scratch_init - allocate the VRAM scratch page

 *

 * @adev: amdgpu_device pointer

 *

 * Allocates a scratch page of VRAM for use by various things in the

 * driver.

 */

static int amdgpu_device_vram_scratch_init(struct amdgpu_device *adev)

static int amdgpu_device_mem_scratch_init(struct amdgpu_device *adev)

{

	return amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_SIZE,

				       PAGE_SIZE,

				       AMDGPU_GEM_DOMAIN_VRAM,

				       &adev->vram_scratch.robj,

				       &adev->vram_scratch.gpu_addr,

				       (void **)&adev->vram_scratch.ptr);

	return amdgpu_bo_create_kernel(adev, AMDGPU_GPU_PAGE_SIZE, PAGE_SIZE,

				       AMDGPU_GEM_DOMAIN_VRAM |

				       AMDGPU_GEM_DOMAIN_GTT,

				       &adev->mem_scratch.robj,

				       &adev->mem_scratch.gpu_addr,

				       (void **)&adev->mem_scratch.ptr);

}



/**

 * amdgpu_device_vram_scratch_fini - Free the VRAM scratch page

 * amdgpu_device_mem_scratch_fini - Free the VRAM scratch page

 *

 * @adev: amdgpu_device pointer

 *

 * Frees the VRAM scratch page.

 */

static void amdgpu_device_vram_scratch_fini(struct amdgpu_device *adev)

static void amdgpu_device_mem_scratch_fini(struct amdgpu_device *adev)

{

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

	amdgpu_bo_free_kernel(&adev->mem_scratch.robj, NULL, NULL);

}



/**
@@ -2391,9 +2391,9 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
			if (amdgpu_sriov_vf(adev))

				amdgpu_virt_exchange_data(adev);



			r = amdgpu_device_vram_scratch_init(adev);

			r = amdgpu_device_mem_scratch_init(adev);

			if (r) {

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

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

				goto init_failed;

			}

			r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev);
@@ -2875,7 +2875,7 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
			amdgpu_ucode_free_bo(adev);

			amdgpu_free_static_csa(&adev->virt.csa_obj);

			amdgpu_device_wb_fini(adev);

			amdgpu_device_vram_scratch_fini(adev);

			amdgpu_device_mem_scratch_fini(adev);

			amdgpu_ib_pool_fini(adev);

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 
				max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



		/* Set default page address. */

		value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr);

		value = amdgpu_gmc_vram_mc2pa(adev, adev->mem_scratch.gpu_addr);

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,

			     (u32)(value >> 12));

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,

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

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void gfxhub_v2_0_init_system_aperture_regs(struct amdgpu_device *adev) 
			     max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



		/* Set default page address. */

		value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr);

		value = amdgpu_gmc_vram_mc2pa(adev, adev->mem_scratch.gpu_addr);

		WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,

			     (u32)(value >> 12));

		WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static void gfxhub_v2_1_init_system_aperture_regs(struct amdgpu_device *adev) 
		     max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



	/* Set default page address. */

	value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr);

	value = amdgpu_gmc_vram_mc2pa(adev, adev->mem_scratch.gpu_addr);

	WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,

		     (u32)(value >> 12));

	WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,