* [PATCH v2 2/3] drm/amdgpu: fix missed asd bo free when hw_fini
[not found] ` <1499232741-4015-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
@ 2017-07-05 5:32 ` Huang Rui
2017-07-05 5:32 ` [PATCH v2 3/3] drm/amdgpu: make psp cmd buffer as a reserve memory Huang Rui
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Huang Rui @ 2017-07-05 5:32 UTC (permalink / raw)
To: Alex Deucher, Christian König,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Huang Rui
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---
Changes from V1 -> V2
- amdgpu_bo_free_kernel is safe even the bo is NULL, so remove the "if" check.
Thanks,
Ray
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index d0104c7..95f5d250 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -440,6 +440,8 @@ static int psp_hw_fini(void *handle)
&psp->fw_pri_mc_addr, &psp->fw_pri_buf);
amdgpu_bo_free_kernel(&psp->fence_buf_bo,
&psp->fence_buf_mc_addr, &psp->fence_buf);
+ amdgpu_bo_free_kernel(&psp->asd_shared_bo, &psp->asd_shared_mc_addr,
+ &psp->asd_shared_buf);
kfree(psp->cmd);
psp->cmd = NULL;
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/3] drm/amdgpu: make psp cmd buffer as a reserve memory
[not found] ` <1499232741-4015-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-07-05 5:32 ` [PATCH v2 2/3] drm/amdgpu: fix missed asd bo free when hw_fini Huang Rui
@ 2017-07-05 5:32 ` Huang Rui
2017-07-05 5:56 ` [PATCH v2 1/3] drm/amdgpu: remove superfluous check Zhang, Jerry (Junwei)
2017-07-05 7:24 ` Christian König
3 siblings, 0 replies; 5+ messages in thread
From: Huang Rui @ 2017-07-05 5:32 UTC (permalink / raw)
To: Alex Deucher, Christian König,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Huang Rui
Signed-off-by: Huang Rui <ray.huang@amd.com>
---
Changes from V1 -> V2
- amdgpu_bo_free_kernel is safe even the bo is NULL, so remove the "if" check.
- error handling of ring_init should be returned as failed_mem.
Thanks,
Ray
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 38 ++++++++++++++++-----------------
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 +++++
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 95f5d250..ba743d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -118,33 +118,18 @@ psp_cmd_submit_buf(struct psp_context *psp,
int index)
{
int ret;
- struct amdgpu_bo *cmd_buf_bo;
- uint64_t cmd_buf_mc_addr;
- struct psp_gfx_cmd_resp *cmd_buf_mem;
- struct amdgpu_device *adev = psp->adev;
-
- ret = amdgpu_bo_create_kernel(adev, PSP_CMD_BUFFER_SIZE, PAGE_SIZE,
- AMDGPU_GEM_DOMAIN_VRAM,
- &cmd_buf_bo, &cmd_buf_mc_addr,
- (void **)&cmd_buf_mem);
- if (ret)
- return ret;
- memset(cmd_buf_mem, 0, PSP_CMD_BUFFER_SIZE);
+ memset(psp->cmd_buf_mem, 0, PSP_CMD_BUFFER_SIZE);
- memcpy(cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp));
+ memcpy(psp->cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp));
- ret = psp_cmd_submit(psp, ucode, cmd_buf_mc_addr,
+ ret = psp_cmd_submit(psp, ucode, psp->cmd_buf_mc_addr,
fence_mc_addr, index);
while (*((unsigned int *)psp->fence_buf) != index) {
msleep(1);
}
- amdgpu_bo_free_kernel(&cmd_buf_bo,
- &cmd_buf_mc_addr,
- (void **)&cmd_buf_mem);
-
return ret;
}
@@ -352,13 +337,20 @@ static int psp_load_fw(struct amdgpu_device *adev)
&psp->fence_buf_mc_addr,
&psp->fence_buf);
if (ret)
+ goto failed_mem2;
+
+ ret = amdgpu_bo_create_kernel(adev, PSP_CMD_BUFFER_SIZE, PAGE_SIZE,
+ AMDGPU_GEM_DOMAIN_VRAM,
+ &psp->cmd_buf_bo, &psp->cmd_buf_mc_addr,
+ (void **)&psp->cmd_buf_mem);
+ if (ret)
goto failed_mem1;
memset(psp->fence_buf, 0, PSP_FENCE_BUFFER_SIZE);
ret = psp_ring_init(psp, PSP_RING_TYPE__KM);
if (ret)
- goto failed_mem1;
+ goto failed_mem;
ret = psp_tmr_init(psp);
if (ret)
@@ -379,9 +371,13 @@ static int psp_load_fw(struct amdgpu_device *adev)
return 0;
failed_mem:
+ amdgpu_bo_free_kernel(&psp->cmd_buf_bo,
+ &psp->cmd_buf_mc_addr,
+ (void **)&psp->cmd_buf_mem);
+failed_mem1:
amdgpu_bo_free_kernel(&psp->fence_buf_bo,
&psp->fence_buf_mc_addr, &psp->fence_buf);
-failed_mem1:
+failed_mem2:
amdgpu_bo_free_kernel(&psp->fw_pri_bo,
&psp->fw_pri_mc_addr, &psp->fw_pri_buf);
failed:
@@ -442,6 +438,8 @@ static int psp_hw_fini(void *handle)
&psp->fence_buf_mc_addr, &psp->fence_buf);
amdgpu_bo_free_kernel(&psp->asd_shared_bo, &psp->asd_shared_mc_addr,
&psp->asd_shared_buf);
+ amdgpu_bo_free_kernel(&psp->cmd_buf_bo, &psp->cmd_buf_mc_addr,
+ (void **)&psp->cmd_buf_mem);
kfree(psp->cmd);
psp->cmd = NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 1a1c8b4..538fa9d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -108,6 +108,11 @@ struct psp_context
struct amdgpu_bo *fence_buf_bo;
uint64_t fence_buf_mc_addr;
void *fence_buf;
+
+ /* cmd buffer */
+ struct amdgpu_bo *cmd_buf_bo;
+ uint64_t cmd_buf_mc_addr;
+ struct psp_gfx_cmd_resp *cmd_buf_mem;
};
struct amdgpu_psp_funcs {
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/3] drm/amdgpu: remove superfluous check
[not found] ` <1499232741-4015-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-07-05 5:32 ` [PATCH v2 2/3] drm/amdgpu: fix missed asd bo free when hw_fini Huang Rui
2017-07-05 5:32 ` [PATCH v2 3/3] drm/amdgpu: make psp cmd buffer as a reserve memory Huang Rui
@ 2017-07-05 5:56 ` Zhang, Jerry (Junwei)
2017-07-05 7:24 ` Christian König
3 siblings, 0 replies; 5+ messages in thread
From: Zhang, Jerry (Junwei) @ 2017-07-05 5:56 UTC (permalink / raw)
To: Huang Rui, Alex Deucher, Christian König,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
the series is
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Jerry
On 07/05/2017 01:32 PM, Huang Rui wrote:
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>
> Changes from V1 -> V2
> - amdgpu_bo_free_kernel is safe even the bo is NULL, so remove the "if" check.
>
> Thanks,
> Ray
>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 15 +++++----------
> drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 8 ++++----
> 2 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 79db294..d0104c7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -435,16 +435,11 @@ static int psp_hw_fini(void *handle)
>
> psp_ring_destroy(psp, PSP_RING_TYPE__KM);
>
> - 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);
> -
> - if (psp->fence_buf_bo)
> - amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> - &psp->fence_buf_mc_addr, &psp->fence_buf);
> + amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
> + amdgpu_bo_free_kernel(&psp->fw_pri_bo,
> + &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
> + amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> + &psp->fence_buf_mc_addr, &psp->fence_buf);
>
> kfree(psp->cmd);
> psp->cmd = NULL;
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> index 988ebd9..2718e86 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -341,10 +341,10 @@ int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
> 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);
> + amdgpu_bo_free_kernel(&adev->firmware.rbuf,
> + &ring->ring_mem_mc_addr,
> + (void **)&ring->ring_mem);
> +
> return ret;
> }
>
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/3] drm/amdgpu: remove superfluous check
[not found] ` <1499232741-4015-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
` (2 preceding siblings ...)
2017-07-05 5:56 ` [PATCH v2 1/3] drm/amdgpu: remove superfluous check Zhang, Jerry (Junwei)
@ 2017-07-05 7:24 ` Christian König
3 siblings, 0 replies; 5+ messages in thread
From: Christian König @ 2017-07-05 7:24 UTC (permalink / raw)
To: Huang Rui, Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Patch #1 and #2 are Reviewed-by: Christian König <christian.koenig@amd.com>.
Patch #3 is Acked-by: Christian König <christian.koenig@amd.com>.
Regards,
Christian.
Am 05.07.2017 um 07:32 schrieb Huang Rui:
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>
> Changes from V1 -> V2
> - amdgpu_bo_free_kernel is safe even the bo is NULL, so remove the "if" check.
>
> Thanks,
> Ray
>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 15 +++++----------
> drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 8 ++++----
> 2 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 79db294..d0104c7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -435,16 +435,11 @@ static int psp_hw_fini(void *handle)
>
> psp_ring_destroy(psp, PSP_RING_TYPE__KM);
>
> - 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);
> -
> - if (psp->fence_buf_bo)
> - amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> - &psp->fence_buf_mc_addr, &psp->fence_buf);
> + amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
> + amdgpu_bo_free_kernel(&psp->fw_pri_bo,
> + &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
> + amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> + &psp->fence_buf_mc_addr, &psp->fence_buf);
>
> kfree(psp->cmd);
> psp->cmd = NULL;
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> index 988ebd9..2718e86 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -341,10 +341,10 @@ int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
> 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);
> + amdgpu_bo_free_kernel(&adev->firmware.rbuf,
> + &ring->ring_mem_mc_addr,
> + (void **)&ring->ring_mem);
> +
> return ret;
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread