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

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

drm/amdgpu: move psp macro into amdgpu_psp 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 55560046

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

+0 −1
Original line number Diff line number Diff line
@@ -1353,7 +1353,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
#define amdgpu_display_add_encoder(adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c))

#define amdgpu_display_add_connector(adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r))

#define amdgpu_gds_switch(adev, r, v, d, w, a) (adev)->gds.funcs->patch_gds_switch((r), (v), (d), (w), (a))

#define amdgpu_psp_check_fw_loading_status(adev, i) (adev)->firmware.funcs->check_fw_loading_status((adev), (i))



/* Common functions */

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

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

+17 −12
Original line number Diff line number Diff line
@@ -63,13 +63,16 @@ struct psp_funcs 
	int (*prep_cmd_buf)(struct amdgpu_firmware_info *ucode,

			    struct psp_gfx_cmd_resp *cmd);

	int (*ring_init)(struct psp_context *psp, enum psp_ring_type ring_type);

	int (*ring_create)(struct psp_context *psp, enum psp_ring_type ring_type);

	int (*ring_create)(struct psp_context *psp,

			   enum psp_ring_type ring_type);

	int (*ring_stop)(struct psp_context *psp,

			    enum psp_ring_type ring_type);

	int (*ring_destroy)(struct psp_context *psp,

			    enum psp_ring_type ring_type);

	int (*cmd_submit)(struct psp_context *psp, struct amdgpu_firmware_info *ucode,

			  uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr, int index);

	int (*cmd_submit)(struct psp_context *psp,

			  struct amdgpu_firmware_info *ucode,

			  uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,

			  int index);

	bool (*compare_sram_data)(struct psp_context *psp,

				  struct amdgpu_firmware_info *ucode,

				  enum AMDGPU_UCODE_ID ucode_type);
@@ -150,6 +153,8 @@ struct amdgpu_psp_funcs { 
#define psp_mode1_reset(psp) \

		((psp)->funcs->mode1_reset ? (psp)->funcs->mode1_reset((psp)) : false)



#define amdgpu_psp_check_fw_loading_status(adev, i) (adev)->firmware.funcs->check_fw_loading_status((adev), (i))



extern const struct amd_ip_funcs psp_ip_funcs;



extern const struct amdgpu_ip_block_version psp_v3_1_ip_block;