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

drm/amdgpu: add amdgpu_gmc_pd_addr helper 



Add a helper to get the root PD address and remove the workarounds from
the GMC9 code for that.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e830fb1

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \

	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o

	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \

	amdgpu_gmc.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

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

+1 −4
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) 
	struct amdgpu_bo *pd = vm->root.base.bo;

	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);

	struct amdgpu_vm_parser param;

	uint64_t addr, flags = AMDGPU_PTE_VALID;

	int ret;



	param.domain = AMDGPU_GEM_DOMAIN_VRAM;
@@ -383,9 +382,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) 
		return ret;

	}



	addr = amdgpu_bo_gpu_offset(vm->root.base.bo);

	amdgpu_gmc_get_vm_pde(adev, -1, &addr, &flags);

	vm->pd_phys_addr = addr;

	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.base.bo);



	if (vm->use_cpu_for_update) {

		ret = amdgpu_bo_kmap(pd, NULL);

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

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (r)

		return r;



	p->job->vm_pd_addr = amdgpu_bo_gpu_offset(vm->root.base.bo);

	p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.base.bo);



	if (amdgpu_vm_debug) {

		/* Invalidate all BOs to test for userspace bugs */

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

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018 Advanced Micro Devices, Inc.

 * All Rights Reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the

 * "Software"), to deal in the Software without restriction, including

 * without limitation the rights to use, copy, modify, merge, publish,

 * distribute, sub license, and/or sell copies of the Software, and to

 * permit persons to whom the Software is furnished to do so, subject to

 * the following conditions:

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

 * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,

 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

 * USE OR OTHER DEALINGS IN THE SOFTWARE.

 *

 * The above copyright notice and this permission notice (including the

 * next paragraph) shall be included in all copies or substantial portions

 * of the Software.

 *

 */



#include "amdgpu.h"



/**

 * amdgpu_gmc_pd_addr - return the address of the root directory

 *

 */

uint64_t amdgpu_gmc_pd_addr(struct amdgpu_bo *bo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	uint64_t pd_addr;



	pd_addr = amdgpu_bo_gpu_offset(bo);

	/* TODO: move that into ASIC specific code */

	if (adev->asic_type >= CHIP_VEGA10) {

		uint64_t flags = AMDGPU_PTE_VALID;



		amdgpu_gmc_get_vm_pde(adev, -1, &pd_addr, &flags);

		pd_addr |= flags;

	}

	return pd_addr;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -133,4 +133,6 @@ static inline bool amdgpu_gmc_vram_full_visible(struct amdgpu_gmc *gmc) 
	return (gmc->real_vram_size == gmc->visible_vram_size);

}



uint64_t amdgpu_gmc_pd_addr(struct amdgpu_bo *bo);



#endif