Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44f1bb1f authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: avoid to use SOC15_REG_OFFSET in static array for navi10 



Move to the header file.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a644d85a

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

+0 −9
Original line number Diff line number Diff line
@@ -274,15 +274,6 @@ static bool soc15_read_bios_from_rom(struct amdgpu_device *adev, 
	return true;

}



struct soc15_allowed_register_entry {

	uint32_t hwip;

	uint32_t inst;

	uint32_t seg;

	uint32_t reg_offset;

	bool grbm_indexed;

};





static struct soc15_allowed_register_entry soc15_allowed_read_registers[] = {

	{ SOC15_REG_ENTRY(GC, 0, mmGRBM_STATUS)},

	{ SOC15_REG_ENTRY(GC, 0, mmGRBM_STATUS2)},

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

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,14 @@ struct soc15_reg_entry { 
	uint32_t instance;

};



struct soc15_allowed_register_entry {

	uint32_t hwip;

	uint32_t inst;

	uint32_t seg;

	uint32_t reg_offset;

	bool grbm_indexed;

};



#define SOC15_REG_ENTRY(ip, inst, reg)	ip##_HWIP, inst, reg##_BASE_IDX, reg



#define SOC15_REG_ENTRY_OFFSET(entry)	(adev->reg_offset[entry.hwip][entry.inst][entry.seg] + entry.reg_offset)