drm/amdgpu: rename DBG_DRV to HAD_DRV for psp v14

Add a psp bl command enum for HAD_DRV.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 66b3f88fbecdd3351335a602f77917bc758e63d5..3635303e65484c26319a20acb74acba4856be336 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -73,6 +73,7 @@ enum psp_bootloader_cmd {
        PSP_BL__LOAD_KEY_DATABASE       = 0x80000,
        PSP_BL__LOAD_SOCDRV             = 0xB0000,
        PSP_BL__LOAD_DBGDRV             = 0xC0000,
+       PSP_BL__LOAD_HADDRV             = PSP_BL__LOAD_DBGDRV,
        PSP_BL__LOAD_INTFDRV            = 0xD0000,
        PSP_BL__LOAD_RASDRV             = 0xE0000,
        PSP_BL__LOAD_IPKEYMGRDRV        = 0xF0000,

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
index 241d5ff2ef3cdbf7e1db634863fb8e71f40a7035..f08a32c186946074cdd5ab70d003878d31499ea8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v14_0.c
@@ -169,7 +169,8 @@ static int psp_v14_0_bootloader_load_intf_drv(struct psp_context *psp)
 
 static int psp_v14_0_bootloader_load_dbg_drv(struct psp_context *psp)
 {
-       return psp_v14_0_bootloader_load_component(psp, &psp->dbg_drv, PSP_BL__LOAD_DBGDRV);
+       /* dbg_drv was renamed to had_drv in psp v14 */
+       return psp_v14_0_bootloader_load_component(psp, &psp->dbg_drv, PSP_BL__LOAD_HADDRV);
 }
 
 static int psp_v14_0_bootloader_load_ras_drv(struct psp_context *psp)