amdgpu: psp update prep for S3 suspend/resume for vega10
Subsystems (2)
cover amdgpu: psp update prep for S3 suspend/resume for vega10
Hi all,
These patches are preparing for firmware save/restore command and debugging reloading. Please review.
After that, I will send vega10 S3 patches later.
Thanks,
Rui
Huang Rui (6):
drm/amdgpu: split tmr init function
drm/amdgpu: add firmware private memory
drm/amdgpu: use private memory to store psp firmware data drm/amdgpu: split asd function
drm/amdgpu: split psp ring init function
drm/amdgpu: add hw_start and non-psp firmware loading into resume
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 208 ++++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 15 ++- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 59 +++------ drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 2 + 4 files changed, 162 insertions(+), 122 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1491037248-16146-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
PATCH 1/6 drm/amdgpu: split tmr init function
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +17 -10
@@ -152,11 +152,6 @@ static void psp_prep_tmr_cmd_buf(struct psp_gfx_cmd_resp *cmd,static int psp_tmr_init (struct psp_context *psp) {int ret; -struct psp_gfx_cmd_resp *cmd; - - cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL ); -if (!cmd) -return -ENOMEM ;/* * Allocate 3M memory aligned to 1M from Frame Buffer (local
@@ -168,22 +163,30 @@ static int psp_tmr_init(struct psp_context *psp) ret =amdgpu_bo_create_kernel (psp->adev,0x300000 ,0x100000 ,AMDGPU_GEM_DOMAIN_VRAM , &psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf); -if (ret) - goto failed; + +return ret; +} + +static int psp_tmr_load (struct psp_context *psp) +{ +int ret; +struct psp_gfx_cmd_resp *cmd; + + cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL ); +if (!cmd) +return -ENOMEM ;psp_prep_tmr_cmd_buf (cmd, psp->tmr_mc_addr,0x300000 ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr,1 );if (ret) - goto failed_mem; + goto failed;kfree (cmd);return 0 ; -failed_mem: -amdgpu_bo_free_kernel (&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf); failed:kfree (cmd);return ret;
@@ -298,6 +301,10 @@ static int psp_load_fw(struct amdgpu_device *adev)if (ret) goto failed_mem; + ret =psp_tmr_load (psp); +if (ret) + goto failed_mem; + ret =psp_asd_load (psp);if (ret) goto failed_mem;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/6 drm/amdgpu: add firmware private memory
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 23 +++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 ++++++ 2 files changed, 25 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +19 -4
@@ -275,17 +275,25 @@ static int psp_load_fw(struct amdgpu_device *adev)if (!cmd)return -ENOMEM ; - ret =psp_bootloader_load_sysdrv (psp); + ret =amdgpu_bo_create_kernel (adev,PSP_1_MEG ,PSP_1_MEG , +AMDGPU_GEM_DOMAIN_GTT , + &psp->fw_pri_bo, + &psp->fw_pri_mc_addr, + &psp->fw_pri_buf);if (ret) goto failed; + ret =psp_bootloader_load_sysdrv (psp); +if (ret) + goto failed_mem1; + ret =psp_bootloader_load_sos (psp);if (ret) - goto failed; + goto failed_mem1; ret =psp_ring_init (psp,PSP_RING_TYPE__KM );if (ret) - goto failed; + goto failed_mem1; ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
@@ -293,7 +301,7 @@ static int psp_load_fw(struct amdgpu_device *adev) &psp->fence_buf_mc_addr, &psp->fence_buf);if (ret) - goto failed; + goto failed_mem1;memset (psp->fence_buf,0 ,PSP_FENCE_BUFFER_SIZE );
@@ -343,6 +351,9 @@ static int psp_load_fw(struct amdgpu_device *adev) failed_mem:amdgpu_bo_free_kernel (&psp->fence_buf_bo, &psp->fence_buf_mc_addr, &psp->fence_buf); +failed_mem1: +amdgpu_bo_free_kernel (&psp->fw_pri_bo, + &psp->fw_pri_mc_addr, &psp->fw_pri_buf); failed:kfree (cmd);return ret;
@@ -392,6 +403,10 @@ static int psp_hw_fini(void *handle)if (psp->tmr_buf)amdgpu_bo_free_kernel (&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf); +if (psp->fw_pri_buf) +amdgpu_bo_free_kernel (&psp->fw_pri_bo, + &psp->fw_pri_mc_addr, &psp->fw_pri_buf); +return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
@@ -32,6 +32,7 @@#define PSP_CMD_BUFFER_SIZE 0x1000#define PSP_ASD_BIN_SIZE 0x40000#define PSP_ASD_SHARED_MEM_SIZE 0x4000 +#define PSP_1_MEG 0x100000enum psp_ring_type {
@@ -71,6 +72,11 @@ struct psp_context enum AMDGPU_UCODE_ID ucode_type);bool (*smu_reload_quirk)(struct psp_context *psp); +/* fence buffer */ +struct amdgpu_bo *fw_pri_bo; +uint64_t fw_pri_mc_addr; +void *fw_pri_buf; +/* sos firmware */ const struct firmware *sos_fw;uint32_t sos_fw_version;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu: use private memory to store psp firmware data
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 28 ++++++------------- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 - drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 48 ++++++--------------------------- 3 files changed, 16 insertions(+), 61 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +8 -20
@@ -209,9 +209,9 @@ static void psp_prep_asd_cmd_buf(struct psp_gfx_cmd_resp *cmd,static int psp_asd_load (struct psp_context *psp) {int ret; -struct amdgpu_bo *asd_bo, *asd_shared_bo; -uint64_t asd_mc_addr, asd_shared_mc_addr; -void *asd_buf, *asd_shared_buf; +struct amdgpu_bo *asd_shared_bo; +uint64_t asd_shared_mc_addr; +void *asd_shared_buf;struct psp_gfx_cmd_resp *cmd; cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL );
@@ -224,38 +224,26 @@ static int psp_asd_load(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_ASD_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &asd_shared_bo, &asd_shared_mc_addr, &asd_buf); + &asd_shared_bo, &asd_shared_mc_addr, &asd_shared_buf);if (ret) goto failed; -/* -* Allocate 256k memory aligned to 4k from Frame Buffer (local -* physical) for ASD firmware -*/ - ret =amdgpu_bo_create_kernel (psp->adev,PSP_ASD_BIN_SIZE ,PAGE_SIZE , -AMDGPU_GEM_DOMAIN_VRAM , - &asd_bo, &asd_mc_addr, &asd_buf); -if (ret) - goto failed_mem; +memset (psp->fw_pri_buf,0 ,PSP_1_MEG ); +memcpy (psp->fw_pri_buf, psp->asd_start_addr, psp->asd_ucode_size); -memcpy (asd_buf, psp->asd_start_addr, psp->asd_ucode_size); - -psp_prep_asd_cmd_buf (cmd, asd_mc_addr, asd_shared_mc_addr, +psp_prep_asd_cmd_buf (cmd, psp->fw_pri_mc_addr, asd_shared_mc_addr, psp->asd_ucode_size,PSP_ASD_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr,2 );if (ret) - goto failed_mem1; + goto failed_mem; -amdgpu_bo_free_kernel (&asd_bo, &asd_mc_addr, &asd_buf);amdgpu_bo_free_kernel (&asd_shared_bo, &asd_shared_mc_addr, &asd_shared_buf);kfree (cmd);return 0 ; -failed_mem1: -amdgpu_bo_free_kernel (&asd_bo, &asd_mc_addr, &asd_buf); failed_mem:amdgpu_bo_free_kernel (&asd_shared_bo, &asd_shared_mc_addr, &asd_shared_buf); failed:
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0 -1
@@ -30,7 +30,6 @@#define PSP_FENCE_BUFFER_SIZE 0x1000#define PSP_CMD_BUFFER_SIZE 0x1000 -#define PSP_ASD_BIN_SIZE 0x40000#define PSP_ASD_SHARED_MEM_SIZE 0x4000#define PSP_1_MEG 0x100000
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +8 -40
96 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu: split asd function
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 45 ++++++++++++++++----------------- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 +++- 2 files changed, 26 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +22 -23
@@ -206,48 +206,43 @@ static void psp_prep_asd_cmd_buf(struct psp_gfx_cmd_resp *cmd, cmd->cmd.cmd_load_ta.cmd_buf_len = shared_size; } +static int psp_asd_init (struct psp_context *psp) +{ +int ret; + +/* +* Allocate 16k memory aligned to 4k from Frame Buffer (local +* physical) for shared ASD <-> Driver +*/ + ret =amdgpu_bo_create_kernel (psp->adev,PSP_ASD_SHARED_MEM_SIZE , +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , + &psp->asd_shared_bo, + &psp->asd_shared_mc_addr, + &psp->asd_shared_buf); + +return ret; +} +static int psp_asd_load (struct psp_context *psp) {int ret; -struct amdgpu_bo *asd_shared_bo; -uint64_t asd_shared_mc_addr; -void *asd_shared_buf;struct psp_gfx_cmd_resp *cmd; cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL );if (!cmd)return -ENOMEM ; -/* -* Allocate 16k memory aligned to 4k from Frame Buffer (local -* physical) for shared ASD <-> Driver -*/ - ret =amdgpu_bo_create_kernel (psp->adev,PSP_ASD_SHARED_MEM_SIZE ,PAGE_SIZE , -AMDGPU_GEM_DOMAIN_VRAM , - &asd_shared_bo, &asd_shared_mc_addr, &asd_shared_buf); -if (ret) - goto failed; -memset (psp->fw_pri_buf,0 ,PSP_1_MEG );memcpy (psp->fw_pri_buf, psp->asd_start_addr, psp->asd_ucode_size); -psp_prep_asd_cmd_buf (cmd, psp->fw_pri_mc_addr, asd_shared_mc_addr, +psp_prep_asd_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->asd_shared_mc_addr, psp->asd_ucode_size,PSP_ASD_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr,2 ); -if (ret) - goto failed_mem; -amdgpu_bo_free_kernel (&asd_shared_bo, &asd_shared_mc_addr, &asd_shared_buf);kfree (cmd); -return 0 ; - -failed_mem: -amdgpu_bo_free_kernel (&asd_shared_bo, &asd_shared_mc_addr, &asd_shared_buf); -failed: -kfree (cmd);return ret; }
@@ -301,6 +296,10 @@ static int psp_load_fw(struct amdgpu_device *adev)if (ret) goto failed_mem; + ret =psp_asd_init (psp); +if (ret) + goto failed_mem; + ret =psp_asd_load (psp);if (ret) goto failed_mem;
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +4 -1
@@ -90,12 +90,15 @@ struct psp_contextuint64_t tmr_mc_addr;void *tmr_buf; -/* asd firmware */ +/* asd firmware and buffer */ const struct firmware *asd_fw;uint32_t asd_fw_version;uint32_t asd_feature_version;uint32_t asd_ucode_size;uint8_t *asd_start_addr; +struct amdgpu_bo *asd_shared_bo; +uint64_t asd_shared_mc_addr; +void *asd_shared_buf;/* fence buffer */ struct amdgpu_bo *fence_buf_bo;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu: split psp ring init function
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 115 ++++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 11 ++- drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 2 + 4 files changed, 87 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +72 -43
@@ -55,6 +55,7 @@ static int psp_sw_init(void *handle) psp->bootloader_load_sos = psp_v3_1_bootloader_load_sos; psp->prep_cmd_buf = psp_v3_1_prep_cmd_buf; psp->ring_init = psp_v3_1_ring_init; + psp->ring_create = psp_v3_1_ring_create; psp->cmd_submit = psp_v3_1_cmd_submit; psp->compare_sram_data = psp_v3_1_compare_sram_data; psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;
@@ -246,18 +247,79 @@ static int psp_asd_load(struct psp_context *psp)return ret; } -static int psp_load_fw (struct amdgpu_device *adev) +static int psp_hw_start (struct psp_context *psp) {int ret; -struct psp_gfx_cmd_resp *cmd; -int i; + + ret =psp_bootloader_load_sysdrv (psp); +if (ret) +return ret; + + ret =psp_bootloader_load_sos (psp); +if (ret) +return ret; + + ret =psp_ring_create (psp,PSP_RING_TYPE__KM ); +if (ret) +return ret; + + ret =psp_tmr_load (psp); +if (ret) +return ret; + + ret =psp_asd_load (psp); +if (ret) +return ret; + +return 0 ; +} + +static int psp_np_fw_load (struct psp_context *psp) +{ +int i, ret;struct amdgpu_firmware_info *ucode; +struct amdgpu_device * adev = psp->adev; + +for (i =0 ; i < adev->firmware.max_ucodes; i++) { + ucode = &adev->firmware.ucode[i]; +if (!ucode->fw) +continue ; + +if (ucode->ucode_id ==AMDGPU_UCODE_ID_SMC && +psp_smu_reload_quirk (psp)) +continue ; + + ret =psp_prep_cmd_buf (ucode, psp->cmd); +if (ret) +return ret; + + ret =psp_cmd_submit_buf (psp, ucode, psp->cmd, + psp->fence_buf_mc_addr, i +3 ); +if (ret) +return ret; + +#if 0 +/* check if firmware loaded sucessfully */ +if (!amdgpu_psp_check_fw_loading_status (adev, i)) +return -EINVAL ; +#endif + } + +return 0 ; +} + +static int psp_load_fw (struct amdgpu_device *adev) +{ +int ret;struct psp_context *psp = &adev->psp; +struct psp_gfx_cmd_resp *cmd; cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL );if (!cmd)return -ENOMEM ; + psp->cmd = cmd; + ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG, AMDGPU_GEM_DOMAIN_GTT, &psp->fw_pri_bo,
@@ -266,18 +328,6 @@ static int psp_load_fw(struct amdgpu_device *adev)if (ret) goto failed; - ret =psp_bootloader_load_sysdrv (psp); -if (ret) - goto failed_mem1; - - ret =psp_bootloader_load_sos (psp); -if (ret) - goto failed_mem1; - - ret =psp_ring_init (psp,PSP_RING_TYPE__KM ); -if (ret) - goto failed_mem1; - ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &psp->fence_buf_bo,
@@ -288,11 +338,11 @@ static int psp_load_fw(struct amdgpu_device *adev)memset (psp->fence_buf,0 ,PSP_FENCE_BUFFER_SIZE ); - ret =psp_tmr_init (psp); + ret =psp_ring_init (psp,PSP_RING_TYPE__KM );if (ret) - goto failed_mem; + goto failed_mem1; - ret =psp_tmr_load (psp); + ret =psp_tmr_init (psp);if (ret) goto failed_mem;
@@ -300,34 +350,13 @@ static int psp_load_fw(struct amdgpu_device *adev)if (ret) goto failed_mem; - ret =psp_asd_load (psp); + ret =psp_hw_start (psp);if (ret) goto failed_mem; -for (i =0 ; i < adev->firmware.max_ucodes; i++) { - ucode = &adev->firmware.ucode[i]; -if (!ucode->fw) -continue ; - -if (ucode->ucode_id ==AMDGPU_UCODE_ID_SMC && -psp_smu_reload_quirk (psp)) -continue ; - - ret =psp_prep_cmd_buf (ucode, cmd); -if (ret) - goto failed_mem; - - ret =psp_cmd_submit_buf (psp, ucode, cmd, - psp->fence_buf_mc_addr, i +3 ); -if (ret) - goto failed_mem; - -#if 0 -/* check if firmware loaded sucessfully */ -if (!amdgpu_psp_check_fw_loading_status (adev, i)) -return -EINVAL ; -#endif - } + ret =psp_np_fw_load (psp); +if (ret) + goto failed_mem;amdgpu_bo_free_kernel (&psp->fence_buf_bo, &psp->fence_buf_mc_addr, &psp->fence_buf);
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +3 -0
@@ -57,6 +57,7 @@ struct psp_context {struct amdgpu_device *adev;struct psp_ring km_ring; +struct psp_gfx_cmd_resp *cmd;int (*init_microcode)(struct psp_context *psp);int (*bootloader_load_sysdrv)(struct psp_context *psp);
@@ -64,6 +65,7 @@ struct psp_contextint (*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 (*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,
@@ -113,6 +115,7 @@ struct amdgpu_psp_funcs {#define psp_prep_cmd_buf (ucode, type) (psp)->prep_cmd_buf((ucode), (type))#define psp_ring_init (psp, type) (psp)->ring_init((psp), (type)) +#define psp_ring_create (psp, type) (psp)->ring_create((psp), (type))#define psp_cmd_submit (psp, ucode, cmd_mc, fence_mc, index) \ (psp)->cmd_submit((psp), (ucode), (cmd_mc), (fence_mc), (index))#define psp_compare_sram_data (psp, ucode, type) \
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +10 -1
@@ -268,7 +268,6 @@ int psp_v3_1_prep_cmd_buf(struct amdgpu_firmware_info *ucode, struct psp_gfx_cmdint psp_v3_1_ring_init (struct psp_context *psp,enum psp_ring_type ring_type) {int ret =0 ; -unsigned int psp_ring_reg =0 ;struct psp_ring *ring;struct amdgpu_device *adev = psp->adev;
@@ -288,6 +287,16 @@ int psp_v3_1_ring_init(struct psp_context *psp, enum psp_ring_type ring_type)return ret; } +return 0 ; +} + +int psp_v3_1_ring_create (struct psp_context *psp,enum psp_ring_type ring_type) +{ +int ret =0 ; +unsigned int psp_ring_reg =0 ; +struct psp_ring *ring = &psp->km_ring; +struct amdgpu_device *adev = psp->adev; +/* Write low address of the ring to C2PMSG_69 */ psp_ring_reg =lower_32_bits (ring->ring_mem_mc_addr);WREG32 (SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_69), psp_ring_reg);
drivers/gpu/drm/amd/amdgpu/psp_v3_1.h +2 -0
@@ -39,6 +39,8 @@ extern int psp_v3_1_prep_cmd_buf(struct amdgpu_firmware_info *ucode, struct psp_gfx_cmd_resp *cmd);extern int psp_v3_1_ring_init (struct psp_context *psp,enum psp_ring_type ring_type); +extern int psp_v3_1_ring_create (struct psp_context *psp, +enum psp_ring_type ring_type); extern int psp_v3_1_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode, uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: add hw_start and non-psp firmware loading into resume
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +14 -2
@@ -435,18 +435,30 @@ static int psp_resume(void *handle) {int ret;struct amdgpu_device *adev = (struct amdgpu_device *)handle; +struct psp_context *psp = &adev->psp;if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP )return 0 ; +DRM_INFO ("PSP is resuming...\n" ); +mutex_lock (&adev->firmware.mutex); - ret =psp_load_fw (adev); + ret =psp_hw_start (psp);if (ret) -DRM_ERROR ("PSP resume failed\n" ); + goto failed; + + ret =psp_np_fw_load (psp); +if (ret) + goto failed;mutex_unlock (&adev->firmware.mutex); +return 0 ; + +failed: +DRM_ERROR ("PSP resume failed\n" ); +mutex_unlock (&adev->firmware.mutex);return ret; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byQuoted 5 lines · Huang Rui
Hi all,
These patches are preparing for firmware save/restore command and debugging reloading. Please review.
After that, I will send vega10 S3 patches later.
Quoted 18 lines
Thanks,
RuiHuang Rui (6):
drm/amdgpu: split tmr init function
drm/amdgpu: add firmware private memory
drm/amdgpu: use private memory to store psp firmware data drm/amdgpu: split asd function
drm/amdgpu: split psp ring init function
drm/amdgpu: addhw_startand non-psp firmware loading into resumedrivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 208 ++++++++++++++++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 15 ++- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 59 +++------ drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 2 + 4 files changed, 162 insertions(+), 122 deletions(-)
Quoted 7 lines
--
2.7.4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx