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

Commit 55560046 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: move firmware definitions into amdgpu_ucode header 



Demangle amdgpu.h.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb7743bc

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

+0 −27
Original line number Diff line number Diff line
@@ -714,33 +714,6 @@ struct amdgpu_wb { 
int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);

void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb);



/*

 * Firmware

 */

enum amdgpu_firmware_load_type {

	AMDGPU_FW_LOAD_DIRECT = 0,

	AMDGPU_FW_LOAD_SMU,

	AMDGPU_FW_LOAD_PSP,

};



struct amdgpu_firmware {

	struct amdgpu_firmware_info ucode[AMDGPU_UCODE_ID_MAXIMUM];

	enum amdgpu_firmware_load_type load_type;

	struct amdgpu_bo *fw_buf;

	unsigned int fw_size;

	unsigned int max_ucodes;

	/* firmwares are loaded by psp instead of smu from vega10 */

	const struct amdgpu_psp_funcs *funcs;

	struct amdgpu_bo *rbuf;

	struct mutex mutex;



	/* gpu info firmware data pointer */

	const struct firmware *gpu_info_fw;



	void *fw_buf_ptr;

	uint64_t fw_buf_mc;

};



/*

 * Benchmarking

 */

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

+24 −0
Original line number Diff line number Diff line
@@ -205,6 +205,12 @@ enum AMDGPU_UCODE_STATUS { 
	AMDGPU_UCODE_STATUS_LOADED,

};



enum amdgpu_firmware_load_type {

	AMDGPU_FW_LOAD_DIRECT = 0,

	AMDGPU_FW_LOAD_SMU,

	AMDGPU_FW_LOAD_PSP,

};



/* conform to smu_ucode_xfer_cz.h */

#define AMDGPU_SDMA0_UCODE_LOADED	0x00000001

#define AMDGPU_SDMA1_UCODE_LOADED	0x00000002
@@ -232,6 +238,24 @@ struct amdgpu_firmware_info { 
	uint32_t tmr_mc_addr_hi;

};



struct amdgpu_firmware {

	struct amdgpu_firmware_info ucode[AMDGPU_UCODE_ID_MAXIMUM];

	enum amdgpu_firmware_load_type load_type;

	struct amdgpu_bo *fw_buf;

	unsigned int fw_size;

	unsigned int max_ucodes;

	/* firmwares are loaded by psp instead of smu from vega10 */

	const struct amdgpu_psp_funcs *funcs;

	struct amdgpu_bo *rbuf;

	struct mutex mutex;



	/* gpu info firmware data pointer */

	const struct firmware *gpu_info_fw;



	void *fw_buf_ptr;

	uint64_t fw_buf_mc;

};



void amdgpu_ucode_print_mc_hdr(const struct common_firmware_header *hdr);

void amdgpu_ucode_print_smc_hdr(const struct common_firmware_header *hdr);

void amdgpu_ucode_print_gfx_hdr(const struct common_firmware_header *hdr);