Commit 5073506c authored by Jonathan Kim's avatar Jonathan Kim Committed by Alex Deucher
Browse files

drm/amdkfd: add aldebaran kfd2kgd callbacks to kfd device (v2) 



Create dedicated Aldebaran kfd2kgd callbacks to prepare
for new per-vmid register instructions for debug trap
setting functions and sending host traps.

v2: rebase (Alex)

Signed-off-by: default avatarJonathan Kim <Jonathan.Kim@amd.com>
Reviewed-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 51a0f459

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ amdgpu-y += \ 
	amdgpu_amdkfd_gfx_v8.o \

	amdgpu_amdkfd_gfx_v9.o \

	amdgpu_amdkfd_arcturus.o \

	amdgpu_amdkfd_aldebaran.o \

	amdgpu_amdkfd_gfx_v10.o \

	amdgpu_amdkfd_gfx_v10_3.o

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

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

 * Copyright 2020 Advanced Micro Devices, Inc.

 *

 * 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, sublicense,

 * 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 above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * 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 NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

 */

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_amdkfd_arcturus.h"

#include "amdgpu_amdkfd_gfx_v9.h"



const struct kfd2kgd_calls aldebaran_kfd2kgd = {

	.program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings,

	.set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,

	.init_interrupts = kgd_gfx_v9_init_interrupts,

	.hqd_load = kgd_gfx_v9_hqd_load,

	.hiq_mqd_load = kgd_gfx_v9_hiq_mqd_load,

	.hqd_sdma_load = kgd_arcturus_hqd_sdma_load,

	.hqd_dump = kgd_gfx_v9_hqd_dump,

	.hqd_sdma_dump = kgd_arcturus_hqd_sdma_dump,

	.hqd_is_occupied = kgd_gfx_v9_hqd_is_occupied,

	.hqd_sdma_is_occupied = kgd_arcturus_hqd_sdma_is_occupied,

	.hqd_destroy = kgd_gfx_v9_hqd_destroy,

	.hqd_sdma_destroy = kgd_arcturus_hqd_sdma_destroy,

	.address_watch_disable = kgd_gfx_v9_address_watch_disable,

	.address_watch_execute = kgd_gfx_v9_address_watch_execute,

	.wave_control_execute = kgd_gfx_v9_wave_control_execute,

	.address_watch_get_offset = kgd_gfx_v9_address_watch_get_offset,

	.get_atc_vmid_pasid_mapping_info =

				kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base,

};

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

+8 −9
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "amdgpu_amdkfd_gfx_v9.h"

#include "gfxhub_v1_0.h"

#include "mmhub_v9_4.h"

#include "mmhub_v1_7.h"



#define HQD_N_REGS 56

#define DUMP_REG(addr) do {				\
@@ -123,7 +122,7 @@ static uint32_t get_sdma_rlc_reg_offset(struct amdgpu_device *adev, 
	return sdma_rlc_reg_offset;

}



static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd,

int kgd_arcturus_hqd_sdma_load(struct kgd_dev *kgd, void *mqd,

			     uint32_t __user *wptr, struct mm_struct *mm)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);
@@ -193,7 +192,7 @@ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, 
	return 0;

}



static int kgd_hqd_sdma_dump(struct kgd_dev *kgd,

int kgd_arcturus_hqd_sdma_dump(struct kgd_dev *kgd,

			     uint32_t engine_id, uint32_t queue_id,

			     uint32_t (**dump)[2], uint32_t *n_regs)

{
@@ -225,7 +224,7 @@ static int kgd_hqd_sdma_dump(struct kgd_dev *kgd, 
	return 0;

}



static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd)

bool kgd_arcturus_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	struct v9_sdma_mqd *m;
@@ -244,7 +243,7 @@ static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd) 
	return false;

}



static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

int kgd_arcturus_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

				unsigned int utimeout)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);
@@ -290,13 +289,13 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
	.init_interrupts = kgd_gfx_v9_init_interrupts,

	.hqd_load = kgd_gfx_v9_hqd_load,

	.hiq_mqd_load = kgd_gfx_v9_hiq_mqd_load,

	.hqd_sdma_load = kgd_hqd_sdma_load,

	.hqd_sdma_load = kgd_arcturus_hqd_sdma_load,

	.hqd_dump = kgd_gfx_v9_hqd_dump,

	.hqd_sdma_dump = kgd_hqd_sdma_dump,

	.hqd_sdma_dump = kgd_arcturus_hqd_sdma_dump,

	.hqd_is_occupied = kgd_gfx_v9_hqd_is_occupied,

	.hqd_sdma_is_occupied = kgd_hqd_sdma_is_occupied,

	.hqd_sdma_is_occupied = kgd_arcturus_hqd_sdma_is_occupied,

	.hqd_destroy = kgd_gfx_v9_hqd_destroy,

	.hqd_sdma_destroy = kgd_hqd_sdma_destroy,

	.hqd_sdma_destroy = kgd_arcturus_hqd_sdma_destroy,

	.address_watch_disable = kgd_gfx_v9_address_watch_disable,

	.address_watch_execute = kgd_gfx_v9_address_watch_execute,

	.wave_control_execute = kgd_gfx_v9_wave_control_execute,

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

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

 * Copyright 2020 Advanced Micro Devices, Inc.

 *

 * 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, sublicense,

 * 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 above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * 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 NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

 */



int kgd_arcturus_hqd_sdma_load(struct kgd_dev *kgd, void *mqd,

			     uint32_t __user *wptr, struct mm_struct *mm);

int kgd_arcturus_hqd_sdma_dump(struct kgd_dev *kgd,

			     uint32_t engine_id, uint32_t queue_id,

			     uint32_t (**dump)[2], uint32_t *n_regs);

bool kgd_arcturus_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd);

int kgd_arcturus_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,

				unsigned int utimeout);

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ extern const struct kfd2kgd_calls gfx_v7_kfd2kgd; 
extern const struct kfd2kgd_calls gfx_v8_kfd2kgd;

extern const struct kfd2kgd_calls gfx_v9_kfd2kgd;

extern const struct kfd2kgd_calls arcturus_kfd2kgd;

extern const struct kfd2kgd_calls aldebaran_kfd2kgd;

extern const struct kfd2kgd_calls gfx_v10_kfd2kgd;

extern const struct kfd2kgd_calls gfx_v10_3_kfd2kgd;
@@ -71,7 +72,7 @@ static const struct kfd2kgd_calls *kfd2kgd_funcs[] = { 
	[CHIP_VEGA20] = &gfx_v9_kfd2kgd,

	[CHIP_RENOIR] = &gfx_v9_kfd2kgd,

	[CHIP_ARCTURUS] = &arcturus_kfd2kgd,

	[CHIP_ALDEBARAN] = &arcturus_kfd2kgd,

	[CHIP_ALDEBARAN] = &aldebaran_kfd2kgd,

	[CHIP_NAVI10] = &gfx_v10_kfd2kgd,

	[CHIP_NAVI12] = &gfx_v10_kfd2kgd,

	[CHIP_NAVI14] = &gfx_v10_kfd2kgd,