Commit 8ffff9b4 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdgpu: use function pointer for gfxhub functions 



gfxhub functions are now called from function pointers,
instead of from asic-specific functions.

Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 825c91d0

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

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
#include "amdgpu_mes.h"

#include "amdgpu_umc.h"

#include "amdgpu_mmhub.h"

#include "amdgpu_gfxhub.h"

#include "amdgpu_df.h"



#define MAX_GPU_INSTANCE		16
@@ -881,6 +882,9 @@ struct amdgpu_device { 
	/* mmhub */

	struct amdgpu_mmhub		mmhub;



	/* gfxhub */

	struct amdgpu_gfxhub		gfxhub;



	/* gfx */

	struct amdgpu_gfx		gfx;

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

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "v10_structs.h"

#include "nv.h"

#include "nvd.h"

#include "gfxhub_v2_0.h"



enum hqd_dequeue_request_type {

	NO_ACTION = 0,
@@ -753,7 +752,7 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, 
	}



	/* SDMA is on gfxhub as well for Navi1* series */

	gfxhub_v2_0_setup_vm_pt_regs(adev, vmid, page_table_base);

	adev->gfxhub.funcs->setup_vm_pt_regs(adev, vmid, page_table_base);

}



const struct kfd2kgd_calls gfx_v10_kfd2kgd = {

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

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "v10_structs.h"

#include "nv.h"

#include "nvd.h"

#include "gfxhub_v2_1.h"



enum hqd_dequeue_request_type {

	NO_ACTION = 0,
@@ -657,7 +656,7 @@ static void set_vm_context_page_table_base_v10_3(struct kgd_dev *kgd, uint32_t v 
	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	/* SDMA is on gfxhub as well for Navi1* series */

	gfxhub_v2_1_setup_vm_pt_regs(adev, vmid, page_table_base);

	adev->gfxhub.funcs->setup_vm_pt_regs(adev, vmid, page_table_base);

}



#if 0

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

+1 −4
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#include "v9_structs.h"

#include "soc15.h"

#include "soc15d.h"

#include "mmhub_v1_0.h"

#include "gfxhub_v1_0.h"





enum hqd_dequeue_request_type {

	NO_ACTION = 0,
@@ -703,7 +700,7 @@ void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, 


	adev->mmhub.funcs->setup_vm_pt_regs(adev, vmid, page_table_base);



	gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base);

	adev->gfxhub.funcs->setup_vm_pt_regs(adev, vmid, page_table_base);

}



const struct kfd2kgd_calls gfx_v9_kfd2kgd = {

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

0 → 100644
+43 −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.

 *

 */

#ifndef __AMDGPU_GFXHUB_H__

#define __AMDGPU_GFXHUB_H__



struct amdgpu_gfxhub_funcs {

	u64 (*get_fb_location)(struct amdgpu_device *adev);

	u64 (*get_mc_fb_offset)(struct amdgpu_device *adev);

	void (*setup_vm_pt_regs)(struct amdgpu_device *adev, uint32_t vmid,

			uint64_t page_table_base);

	int (*gart_enable)(struct amdgpu_device *adev);



	void (*gart_disable)(struct amdgpu_device *adev);

	void (*set_fault_enable_default)(struct amdgpu_device *adev, bool value);

	void (*init)(struct amdgpu_device *adev);

	int (*get_xgmi_info)(struct amdgpu_device *adev);

};



struct amdgpu_gfxhub {

	const struct amdgpu_gfxhub_funcs *funcs;

};



#endif