* [PATCH] drm/amdgpu: Adding CAP firmware initialization
@ 2023-03-16 8:36 Bill Liu
2023-03-17 10:49 ` Liu, Monk
2023-03-17 15:21 ` Alex Deucher
0 siblings, 2 replies; 3+ messages in thread
From: Bill Liu @ 2023-03-16 8:36 UTC (permalink / raw)
To: amd-gfx, Alexander.Deucher, Hawking.Zhang
Cc: Horace.Chen, Bill Liu, haijun.chang
Added CAP firmware initialization for PSP v13.0.10 under psp_init_sriov_microcode
Signed-off-by: Bill Liu <Bill.Liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 02f948adae72..0b9e99c35a05 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -148,6 +148,7 @@ static int psp_init_sriov_microcode(struct psp_context *psp)
break;
case IP_VERSION(13, 0, 10):
adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MES1_DATA;
+ ret = psp_init_cap_microcode(psp, ucode_prefix);
break;
default:
return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 380b89114341..b59c92037375 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -669,6 +669,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
return "VCN1_RAM";
case AMDGPU_UCODE_ID_DMCUB:
return "DMCUB";
+ case AMDGPU_UCODE_ID_CAP:
+ return "CAP";
default:
return "UNKNOWN UCODE";
}
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH] drm/amdgpu: Adding CAP firmware initialization
2023-03-16 8:36 [PATCH] drm/amdgpu: Adding CAP firmware initialization Bill Liu
@ 2023-03-17 10:49 ` Liu, Monk
2023-03-17 15:21 ` Alex Deucher
1 sibling, 0 replies; 3+ messages in thread
From: Liu, Monk @ 2023-03-17 10:49 UTC (permalink / raw)
To: Liu, Bill, amd-gfx, Deucher, Alexander, Zhang, Hawking
Cc: Chen, Horace, Liu, Bill, Chang, HaiJun
[AMD Official Use Only - General]
Reviewed-by: Monk Liu <monk.liu@amd.com>
Thanks
-------------------------------------------------------------------
Monk Liu | Cloud GPU & Virtualization Software | AMD
-------------------------------------------------------------------
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Bill Liu
Sent: 2023年3月16日 16:36
To: amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>
Cc: Chen, Horace <Horace.Chen@amd.com>; Liu, Bill <Bill.Liu@amd.com>; Chang, HaiJun <HaiJun.Chang@amd.com>
Subject: [PATCH] drm/amdgpu: Adding CAP firmware initialization
Added CAP firmware initialization for PSP v13.0.10 under psp_init_sriov_microcode
Signed-off-by: Bill Liu <Bill.Liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 02f948adae72..0b9e99c35a05 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -148,6 +148,7 @@ static int psp_init_sriov_microcode(struct psp_context *psp)
break;
case IP_VERSION(13, 0, 10):
adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MES1_DATA;
+ ret = psp_init_cap_microcode(psp, ucode_prefix);
break;
default:
return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 380b89114341..b59c92037375 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -669,6 +669,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
return "VCN1_RAM";
case AMDGPU_UCODE_ID_DMCUB:
return "DMCUB";
+ case AMDGPU_UCODE_ID_CAP:
+ return "CAP";
default:
return "UNKNOWN UCODE";
}
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: Adding CAP firmware initialization
2023-03-16 8:36 [PATCH] drm/amdgpu: Adding CAP firmware initialization Bill Liu
2023-03-17 10:49 ` Liu, Monk
@ 2023-03-17 15:21 ` Alex Deucher
1 sibling, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2023-03-17 15:21 UTC (permalink / raw)
To: Bill Liu
Cc: Alexander.Deucher, Horace.Chen, haijun.chang, amd-gfx, Hawking.Zhang
On Thu, Mar 16, 2023 at 4:36 AM Bill Liu <Bill.Liu@amd.com> wrote:
>
> Added CAP firmware initialization for PSP v13.0.10 under psp_init_sriov_microcode
>
> Signed-off-by: Bill Liu <Bill.Liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 02f948adae72..0b9e99c35a05 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -148,6 +148,7 @@ static int psp_init_sriov_microcode(struct psp_context *psp)
> break;
> case IP_VERSION(13, 0, 10):
> adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MES1_DATA;
> + ret = psp_init_cap_microcode(psp, ucode_prefix);
> break;
> default:
> return -EINVAL;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 380b89114341..b59c92037375 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -669,6 +669,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
> return "VCN1_RAM";
> case AMDGPU_UCODE_ID_DMCUB:
> return "DMCUB";
> + case AMDGPU_UCODE_ID_CAP:
> + return "CAP";
> default:
> return "UNKNOWN UCODE";
> }
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-17 15:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-16 8:36 [PATCH] drm/amdgpu: Adding CAP firmware initialization Bill Liu
2023-03-17 10:49 ` Liu, Monk
2023-03-17 15:21 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).