Commit 21470d97 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amdgpu: remove gfxhub_v1_1_funcs set 



remove duplicate gfxhub v1.1 function set.
put function of gfxhub_v1_1_get_xgmi_info to gfxhub v1_0 function set.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92aeeafb

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 */

#include "amdgpu.h"

#include "gfxhub_v1_0.h"

#include "gfxhub_v1_1.h"



#include "gc/gc_9_0_offset.h"

#include "gc/gc_9_0_sh_mask.h"
@@ -412,4 +413,5 @@ const struct amdgpu_gfxhub_funcs gfxhub_v1_0_funcs = { 
	.gart_disable = gfxhub_v1_0_gart_disable,

	.set_fault_enable_default = gfxhub_v1_0_set_fault_enable_default,

	.init = gfxhub_v1_0_init,

	.get_xgmi_info = gfxhub_v1_1_get_xgmi_info,

};

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

+1 −12
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
 *

 */

#include "amdgpu.h"

#include "gfxhub_v1_0.h"

#include "gfxhub_v1_1.h"



#include "gc/gc_9_2_1_offset.h"
@@ -29,7 +28,7 @@ 


#include "soc15_common.h"



static int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev)

int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev)

{

	u32 xgmi_lfb_cntl = RREG32_SOC15(GC, 0, mmMC_VM_XGMI_LFB_CNTL);

	u32 max_region =
@@ -67,13 +66,3 @@ static int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev) 


	return 0;

}
 


const struct amdgpu_gfxhub_funcs gfxhub_v1_1_funcs = {

	.get_mc_fb_offset = gfxhub_v1_0_get_mc_fb_offset,

	.setup_vm_pt_regs = gfxhub_v1_0_setup_vm_pt_regs,

	.gart_enable = gfxhub_v1_0_gart_enable,

	.gart_disable = gfxhub_v1_0_gart_disable,

	.set_fault_enable_default = gfxhub_v1_0_set_fault_enable_default,

	.init = gfxhub_v1_0_init,

	.get_xgmi_info = gfxhub_v1_1_get_xgmi_info,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ 
#ifndef __GFXHUB_V1_1_H__

#define __GFXHUB_V1_1_H__



extern const struct amdgpu_gfxhub_funcs gfxhub_v1_1_funcs;

int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev);



#endif

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

+1 −9
Original line number Diff line number Diff line
@@ -1166,15 +1166,7 @@ static void gmc_v9_0_set_mmhub_funcs(struct amdgpu_device *adev) 


static void gmc_v9_0_set_gfxhub_funcs(struct amdgpu_device *adev)

{

	switch (adev->asic_type) {

	case CHIP_ARCTURUS:

	case CHIP_VEGA20:

		adev->gfxhub.funcs = &gfxhub_v1_1_funcs;

		break;

	default:

	adev->gfxhub.funcs = &gfxhub_v1_0_funcs;

		break;

	}

}



static int gmc_v9_0_early_init(void *handle)

CRA Git | Maintained and supported by SUSTech CRA and CCSE