All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/amdgpu: move check from cpu address to bo
@ 2017-07-04  6:10 Huang Rui
       [not found] ` <1499148650-22409-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 8+ messages in thread
From: Huang Rui @ 2017-07-04  6:10 UTC (permalink / raw)
  To: Alex Deucher, Christian König,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Ken Wang, Huang Rui

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 79db294..1469e6d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -435,10 +435,10 @@ static int psp_hw_fini(void *handle)
 
 	psp_ring_destroy(psp, PSP_RING_TYPE__KM);
 
-	if (psp->tmr_buf)
+	if (psp->tmr_bo)
 		amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
 
-	if (psp->fw_pri_buf)
+	if (psp->fw_pri_bo)
 		amdgpu_bo_free_kernel(&psp->fw_pri_bo,
 				      &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index 988ebd9..3d057d8 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -341,7 +341,7 @@ 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)
+	if (adev->firmware.rbuf)
 		amdgpu_bo_free_kernel(&adev->firmware.rbuf,
 				      &ring->ring_mem_mc_addr,
 				      (void **)&ring->ring_mem);
-- 
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] 8+ messages in thread

end of thread, other threads:[~2017-07-04 10:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-04  6:10 [PATCH 1/3] drm/amdgpu: move check from cpu address to bo Huang Rui
     [not found] ` <1499148650-22409-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-07-04  6:10   ` [PATCH 2/3] drm/amdgpu: fix missed asd bo free when hw_fini Huang Rui
     [not found]     ` <1499148650-22409-2-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-07-04  7:20       ` Christian König
2017-07-04  6:10   ` [PATCH 3/3] drm/amdgpu: make psp cmd buffer as a reserve memory Huang Rui
     [not found]     ` <1499148650-22409-3-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-07-04  8:25       ` Zhang, Jerry (Junwei)
     [not found]         ` <595B50F5.6050509-5C7GfCeVMHo@public.gmane.org>
2017-07-04 10:11           ` Huang Rui
2017-07-04  7:19   ` [PATCH 1/3] drm/amdgpu: move check from cpu address to bo Christian König
     [not found]     ` <f4402921-1085-5e4a-c6aa-582534f842eb-5C7GfCeVMHo@public.gmane.org>
2017-07-04  7:53       ` Huang Rui

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.