*** Prepare to support PSP v10 for Raven ***
Subsystems (2)
cover *** Prepare to support PSP v10 for Raven ***
Junwei Zhang (4):
drm/amdgpu: remove unncessary code in psp v10 ring init func drm/amdgpu: add init microcode function for psp v10 drm/amdgpu: add ring_create function for psp v10 drm/amdgpu: add ring_destroy for psp v10
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 ++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 96 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 5 ++ 3 files changed, 98 insertions(+), 6 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1500028922-20171-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
PATCH 1/4 drm/amdgpu: remove unncessary code in psp v10 ring init func
--- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0 -20
@@ -111,7 +111,6 @@ int psp_v10_0_prep_cmd_buf(struct amdgpu_firmware_info *ucode, struct psp_gfx_cmint psp_v10_0_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;
@@ -131,25 +130,6 @@ int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type)return ret; } -/* Write low address of the ring to C2PMSG_69 */ - psp_ring_reg =lower_32_bits (ring->ring_mem_mc_addr); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69, psp_ring_reg); -/* Write high address of the ring to C2PMSG_70 */ - psp_ring_reg =upper_32_bits (ring->ring_mem_mc_addr); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, psp_ring_reg); -/* Write size of ring to C2PMSG_71 */ - psp_ring_reg = ring->ring_size; -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_71, psp_ring_reg); -/* Write the ring initialization command to C2PMSG_64 */ - psp_ring_reg = ring_type; - psp_ring_reg = psp_ring_reg <<16 ; -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, psp_ring_reg); -/* Wait for response flag (bit 31) in C2PMSG_64 */ - psp_ring_reg =0 ; -while ((psp_ring_reg &0x80000000 ) ==0 ) { - psp_ring_reg =RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64); - } -return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1500028922-20171-2-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 1/4] drm/amdgpu: remove unncessary code in psp v10 ring init func
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Junwei Zhang
Sent: Friday, July 14, 2017 6:42 AM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 1/4] drm/amdgpu: remove unncessary code in psp v10 ring init funcSigned-off-by Junwei Zhang <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 20 -------------------- 1 file changed, 20 deletions(-)drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0
-0@@ -111,7 +111,6 @@ int psp_v10_0_prep_cmd_buf(struct
amdgpu_firmware_info*ucode, structpsp_gfx_cm
int psp_v10_0_ring_init(structpsp_context*psp, enumpsp_ring_typering_type)
{drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0
-10int ret =0 ; -unsigned int psp_ring_reg =0 ;struct psp_ring *ring;struct amdgpu_device *adev = psp->adev;@@ -131,25 +130,6 @@ int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type)return ret; } -/* Write low address of the ring to C2PMSG_69 */ - psp_ring_reg =lower_32_bits (ring->ring_mem_mc_addr); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69, psp_ring_reg); -/* Write high address of the ring to C2PMSG_70 */ - psp_ring_reg =upper_32_bits (ring->ring_mem_mc_addr); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, psp_ring_reg); -/* Write size of ring to C2PMSG_71 */ - psp_ring_reg = ring->ring_size; - WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_71,
psp_ring_reg);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0
-4-/* Write the ring initialization command to C2PMSG_64 */ - psp_ring_reg = ring_type; - psp_ring_reg = psp_ring_reg <<16 ; - WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_64,
psp_ring_reg);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0
-4-/* Wait for response flag (bit 31) in C2PMSG_64 */ - psp_ring_reg =0 ; -while ((psp_ring_reg &0x80000000 ) ==0 ) { - psp_ring_reg = RREG32_SOC15(MP0, 0,
mmMP0_SMN_C2PMSG_64);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0
-3- } -return 0 ; } --1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 2/4 drm/amdgpu: add init microcode function for psp v10
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 46 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 1 + 3 files changed, 48 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -0
@@ -63,6 +63,7 @@ static int psp_sw_init(void *handle) psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;break ;case CHIP_RAVEN : + psp->init_microcode = psp_v10_0_init_microcode; psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; psp->cmd_submit = psp_v10_0_cmd_submit;
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +46 -0
52 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +1 -0
@@ -27,6 +27,7 @@#include "amdgpu_psp.h" +extern int psp_v10_0_init_microcode (struct psp_context *psp);extern int psp_v10_0_prep_cmd_buf (struct amdgpu_firmware_info *ucode,struct psp_gfx_cmd_resp *cmd); extern int psp_v10_0_ring_init(struct psp_context *psp,
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1500028922-20171-3-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 2/4] drm/amdgpu: add init microcode function for psp v10
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Junwei Zhang
Sent: Friday, July 14, 2017 6:42 AM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 2/4] drm/amdgpu: add init microcode function for psp v10Signed-off-by Junwei Zhang <[email protected]>
Quoted 102 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 46 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 1 + 3 files changed, 48 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0@@ -63,6 +63,7 @@ static int psp_sw_init(void *handle) psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk;break ;case CHIP_RAVEN : + psp->init_microcode = psp_v10_0_init_microcode; psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; psp->cmd_submit = psp_v10_0_cmd_submit;drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +29
-0@@ -87,6 +87,52 @@return 0 ; } +int psp_v10_0_init_microcode (struct psp_context *psp) +{ +struct amdgpu_device *adev = psp->adev; +const char *chip_name; +char fw_name[30 ]; +int err =0 ; +const struct psp_firmware_header_v1_0 *hdr; + +DRM_DEBUG ("\n" ); + +switch (adev->asic_type) { +case CHIP_RAVEN : + chip_name ="raven" ; +break ; +default :BUG (); + } + +snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_asd.bin" , chip_name); + err =request_firmware (&adev->psp.asd_fw, fw_name, adev->dev); +if (err) + goto out; + + err =amdgpu_ucode_validate (adev->psp.asd_fw); +if (err) + goto out; + + hdr = (const struct psp_firmware_header_v1_0 *)adev- >psp.asd_fw->data; + adev->psp.asd_fw_version =le32_to_cpu (hdr- >header.ucode_version); + adev->psp.asd_feature_version = le32_to_cpu(hdr-Quoted 1 line
ucode_feature_version);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +1
-0+ adev->psp.asd_ucode_size = le32_to_cpu(hdr-Quoted 1 line
header.ucode_size_bytes);
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +2
-0+ adev->psp.asd_start_addr = (uint8_t *)hdr + + le32_to_cpu(hdr-Quoted 1 line
header.ucode_array_offset_bytes);
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +14
-0+ +return 0 ; +out: +if (err) { +dev_err (adev->dev, +"psp v10.0: Failed to load firmware \"%s\"\n" , + fw_name); +release_firmware (adev->psp.asd_fw); + adev->psp.asd_fw =NULL ; + } + +return err; +} + int psp_v10_0_prep_cmd_buf(struct amdgpu_firmware_info *ucode, struct
psp_gfx_cmd_resp*cmd)
{drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +0
-0int ret;drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +1
-0@@ -27,6 +27,7 @@#include "amdgpu_psp.h" +extern int psp_v10_0_init_microcode (struct psp_context *psp);extern int psp_v10_0_prep_cmd_buf (struct amdgpu_firmware_info *ucode,struct psp_gfx_cmd_resp *cmd);extern int psp_v10_0_ring_init(struct
psp_context*psp,
--
1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 3/4 drm/amdgpu: add ring_create function for psp v10
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 2 ++ 3 files changed, 34 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -0
@@ -66,6 +66,7 @@ static int psp_sw_init(void *handle) psp->init_microcode = psp_v10_0_init_microcode; psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; + psp->ring_create = psp_v10_0_ring_create; psp->cmd_submit = psp_v10_0_cmd_submit; psp->compare_sram_data = psp_v10_0_compare_sram_data;break ;
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +31 -0
@@ -179,6 +179,37 @@ int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type)return 0 ; } +int psp_v10_0_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 (MP0 ,0 , mmMP0_SMN_C2PMSG_69, psp_ring_reg); +/* Write high address of the ring to C2PMSG_70 */ + psp_ring_reg =upper_32_bits (ring->ring_mem_mc_addr); +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, psp_ring_reg); +/* Write size of ring to C2PMSG_71 */ + psp_ring_reg = ring->ring_size; +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_71, psp_ring_reg); +/* Write the ring initialization command to C2PMSG_64 */ + psp_ring_reg = ring_type; + psp_ring_reg = psp_ring_reg <<16 ; +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, psp_ring_reg); + +/* There might be handshake issue with hardware which needs delay */ +mdelay (20 ); + +/* Wait for response flag (bit 31) in C2PMSG_64 */ + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +0x80000000 ,0x8000FFFF , false); + +return ret; +} + int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode, uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +2 -0
@@ -32,6 +32,8 @@ extern int psp_v10_0_prep_cmd_buf(struct amdgpu_firmware_info *ucode, struct psp_gfx_cmd_resp *cmd);extern int psp_v10_0_ring_init (struct psp_context *psp,enum psp_ring_type ring_type); +extern int psp_v10_0_ring_create (struct psp_context *psp, +enum psp_ring_type ring_type); extern int psp_v10_0_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
1.9.1 _______________________________________________ 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): 1500028922-20171-4-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 3/4] drm/amdgpu: add ring_create function for psp v10
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Junwei Zhang
Sent: Friday, July 14, 2017 6:42 AM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 3/4] drm/amdgpu: addring_createfunction for psp v10Signed-off-by Junwei Zhang <[email protected]>
Quoted 91 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 2 ++ 3 files changed, 34 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0@@ -66,6 +66,7 @@ static int psp_sw_init(void *handle) psp->init_microcode = psp_v10_0_init_microcode; psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; + psp->ring_create = psp_v10_0_ring_create; psp->cmd_submit = psp_v10_0_cmd_submit; psp->compare_sram_data = psp_v10_0_compare_sram_data;drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0break ;drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +13
-0@@ -179,6 +179,37 @@ int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type)return 0 ; } +int psp_v10_0_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 (MP0 ,0 , mmMP0_SMN_C2PMSG_69, psp_ring_reg); +/* Write high address of the ring to C2PMSG_70 */ + psp_ring_reg =upper_32_bits (ring->ring_mem_mc_addr); + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_70,
psp_ring_reg);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +3
-0+/* Write size of ring to C2PMSG_71 */ + psp_ring_reg = ring->ring_size; + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_71,
psp_ring_reg);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +4
-0+/* Write the ring initialization command to C2PMSG_64 */ + psp_ring_reg = ring_type; + psp_ring_reg = psp_ring_reg <<16 ; + WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_64,
psp_ring_reg);drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +2
-0+ +/* There might be handshake issue with hardware which needs delay */
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +4
-0+mdelay (20 ); + +/* Wait for response flag (bit 31) in C2PMSG_64 */ + ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0,
mmMP0_SMN_C2PMSG_64),drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +5
-0+ 0x80000000, 0x8000FFFF, false); + +return ret; +} + int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode, uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +2
-0@@ -32,6 +32,8 @@ extern int psp_v10_0_prep_cmd_buf(structamdgpu_firmware_info *ucode, struct psp_gfx_cmd_resp *cmd);extern int psp_v10_0_ring_init (struct psp_context *psp,enum psp_ring_type ring_type); +extern int psp_v10_0_ring_create (struct psp_context *psp, +enum psp_ring_type ring_type); extern int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode,
uint64_tcmd_buf_mc_addr,uint64_tfence_mc_addr,
--
1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 4/4 drm/amdgpu: add ring_destroy for psp v10
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 27 +++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 2 ++ 3 files changed, 30 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -0
@@ -67,6 +67,7 @@ static int psp_sw_init(void *handle) psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; psp->ring_create = psp_v10_0_ring_create; + psp->ring_destroy = psp_v10_0_ring_destroy; psp->cmd_submit = psp_v10_0_cmd_submit; psp->compare_sram_data = psp_v10_0_compare_sram_data;break ;
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +27 -0
@@ -210,6 +210,33 @@ int psp_v10_0_ring_create(struct psp_context *psp, enum psp_ring_type ring_type)return ret; } +int psp_v10_0_ring_destroy (struct psp_context *psp,enum psp_ring_type ring_type) +{ +int ret =0 ; +struct psp_ring *ring; +unsigned int psp_ring_reg =0 ; +struct amdgpu_device *adev = psp->adev; + + ring = &psp->km_ring; + +/* Write the ring destroy command to C2PMSG_64 */ + psp_ring_reg =3 <<16 ; +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, psp_ring_reg); + +/* There might be handshake issue with hardware which needs delay */ +mdelay (20 ); + +/* Wait for response flag (bit 31) in C2PMSG_64 */ + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +0x80000000 ,0x80000000 , false); + +if (ring->ring_mem) +amdgpu_bo_free_kernel (&adev->firmware.rbuf, + &ring->ring_mem_mc_addr, + (void **)&ring->ring_mem); +return ret; +} + int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode, uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +2 -0
@@ -34,6 +34,8 @@ extern int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type);extern int psp_v10_0_ring_create (struct psp_context *psp,enum psp_ring_type ring_type); +extern int psp_v10_0_ring_destroy (struct psp_context *psp, +enum psp_ring_type ring_type); extern int psp_v10_0_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
1.9.1 _______________________________________________ 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): 1500028922-20171-5-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 4/4] drm/amdgpu: add ring_destroy for psp v10
Quoted 62 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Junwei Zhang
Sent: Friday, July 14, 2017 6:42 AM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 4/4] drm/amdgpu: addring_destroyfor psp v10Signed-off-by Junwei Zhang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 27 +++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 2 ++ 3 files changed, 30 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0@@ -67,6 +67,7 @@ static int psp_sw_init(void *handle) psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; psp->ring_create = psp_v10_0_ring_create; + psp->ring_destroy = psp_v10_0_ring_destroy; psp->cmd_submit = psp_v10_0_cmd_submit; psp->compare_sram_data = psp_v10_0_compare_sram_data;drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0break ;drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +14
-0@@ -210,6 +210,33 @@ int psp_v10_0_ring_create(struct psp_context *psp, enum psp_ring_type ring_type)return ret; } +int psp_v10_0_ring_destroy (struct psp_context *psp,enum psp_ring_type ring_type) +{ +int ret =0 ; +struct psp_ring *ring; +unsigned int psp_ring_reg =0 ; +struct amdgpu_device *adev = psp->adev; + + ring = &psp->km_ring; + +/* Write the ring destroy command to C2PMSG_64 */ + psp_ring_reg =3 <<16 ; +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, psp_ring_reg); + +/* There might be handshake issue with hardware which needs delay */
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +4
-0+mdelay (20 ); + +/* Wait for response flag (bit 31) in C2PMSG_64 */ + ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0,
mmMP0_SMN_C2PMSG_64),
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c int psp_v10_0_ring_create(struct psp_context *psp, enum psp_ring_type ring_type) · line 233
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +3
-0+ 0x80000000, 0x80000000, false); + +if (ring->ring_mem)
You don't have to check if the ring exists. amdgpu_bo_free_kernel handles NULL bos. With that fixed:
Quoted 28 lines
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +6
-0+amdgpu_bo_free_kernel (&adev->firmware.rbuf, + &ring->ring_mem_mc_addr, + (void **)&ring->ring_mem); +return ret; +} + int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode, uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +2
-0@@ -34,6 +34,8 @@ extern int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type);extern int psp_v10_0_ring_create (struct psp_context *psp,enum psp_ring_type ring_type); +extern int psp_v10_0_ring_destroy (struct psp_context *psp, +enum psp_ring_type ring_type); extern int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode,
uint64_tcmd_buf_mc_addr,uint64_tfence_mc_addr,
--
1.9.1
Quoted 4 lines
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1652D7270B7952D80428DCC5F7AD0-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 4/4] drm/amdgpu: add ring_destroy for psp v10
Quoted 68 lines · Alexander
Quoted 62 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Junwei Zhang
Sent: Friday, July 14, 2017 6:42 AM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 4/4] drm/amdgpu: addring_destroyfor psp v10Signed-off-by Junwei Zhang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 27 +++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 2 ++ 3 files changed, 30 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0@@ -67,6 +67,7 @@ static int psp_sw_init(void *handle) psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf; psp->ring_init = psp_v10_0_ring_init; psp->ring_create = psp_v10_0_ring_create; + psp->ring_destroy = psp_v10_0_ring_destroy; psp->cmd_submit = psp_v10_0_cmd_submit; psp->compare_sram_data = psp_v10_0_compare_sram_data;break;drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +14
-0@@ -210,6 +210,33 @@ int psp_v10_0_ring_create(struct psp_context *psp, enum psp_ring_type ring_type)return ret; } +int psp_v10_0_ring_destroy (struct psp_context *psp,enum psp_ring_type ring_type) +{ +int ret =0 ; +struct psp_ring *ring; +unsigned int psp_ring_reg =0 ; +struct amdgpu_device *adev = psp->adev; + + ring = &psp->km_ring; + +/* Write the ring destroy command to C2PMSG_64 */ + psp_ring_reg =3 <<16 ; +WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64, psp_ring_reg); + +/* There might be handshake issue with hardware which needs delay */
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +4
-0+mdelay (20 ); + +/* Wait for response flag (bit 31) in C2PMSG_64 */ + ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0,
mmMP0_SMN_C2PMSG_64),drivers/gpu/drm/amd/amdgpu/psp_v10_0.c int psp_v10_0_ring_create(struct psp_context *psp, enum psp_ring_type ring_type) · line 233
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +3
-0+ 0x80000000, 0x80000000, false); + +if (ring->ring_mem)You don't have to check if the ring exists.
amdgpu_bo_free_kernelhandles NULL bos. With that fixed:
Quoted 1 line
Reviewed-by Alex Deucher <[email protected]>
Yeah, thanks to reminder that.
I will fix it.
Jerry
Quoted 29 lines
Quoted 29 lines
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +6
-0+amdgpu_bo_free_kernel (&adev->firmware.rbuf, + &ring->ring_mem_mc_addr, + (void **)&ring->ring_mem); +return ret; +} + int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode, uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,drivers/gpu/drm/amd/amdgpu/psp_v10_0.h +2
-0@@ -34,6 +34,8 @@ extern int psp_v10_0_ring_init(struct psp_context *psp, enum psp_ring_type ring_type);extern int psp_v10_0_ring_create (struct psp_context *psp,enum psp_ring_type ring_type); +extern int psp_v10_0_ring_destroy (struct psp_context *psp, +enum psp_ring_type ring_type); extern int psp_v10_0_cmd_submit(struct psp_context *psp, struct amdgpu_firmware_info *ucode,uint64_t cmd_buf_mc_addr, uint64_t
fence_mc_addr,
--
1.9.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
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