Hi Guchun,
Thanks very much for your suggestion.
I will refine it and send it out later.
Rico
________________________________
From: Chen, Guchun <guchun.c...@amd.com>
Sent: Tuesday, December 17, 2019 22:11
To: Yin, Tianci (Rico) <tianci....@amd.com>; amd-gfx@lists.freedesktop.org
<amd-gfx@lists.freedesktop.org>
Cc: Long, Gang <gang.l...@amd.com>; Yin, Tianci (Rico) <tianci....@amd.com>;
Xu, Feifei <feifei...@amd.com>; Wang, Kevin(Yang) <kevin1.w...@amd.com>;
Tuikov, Luben <luben.tui...@amd.com>; Deucher, Alexander
<alexander.deuc...@amd.com>; Zhang, Hawking <hawking.zh...@amd.com>; Koenig,
Christian <christian.koe...@amd.com>; Yuan, Xiaojie <xiaojie.y...@amd.com>
Subject: RE: [PATCH 2/2] drm/amdgpu: remove memory training p2c buffer
reservation
[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Tianci Yin
Sent: Tuesday, December 17, 2019 7:23 PM
To: amd-gfx@lists.freedesktop.org
Cc: Long, Gang <gang.l...@amd.com>; Yin, Tianci (Rico) <tianci....@amd.com>;
Xu, Feifei <feifei...@amd.com>; Wang, Kevin(Yang) <kevin1.w...@amd.com>;
Tuikov, Luben <luben.tui...@amd.com>; Deucher, Alexander
<alexander.deuc...@amd.com>; Zhang, Hawking <hawking.zh...@amd.com>; Koenig,
Christian <christian.koe...@amd.com>; Yuan, Xiaojie <xiaojie.y...@amd.com>
Subject: [PATCH 2/2] drm/amdgpu: remove memory training p2c buffer reservation
From: "Tianci.Yin" <tianci....@amd.com>
IP discovery TMR(occupied the top VRAM with size DISCOVERY_TMR_SIZE) has been
reserved, and the p2c buffer is in the range of this TMR, so the p2c buffer
reservation is unnecessary.
Change-Id: Ib1f2f2b4a1f3869c03ffe22e2836cdbee17ba99f
Signed-off-by: Tianci.Yin <tianci....@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 -
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 --------------
2 files changed, 15 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 5f8fd3e3535b..3265487b859f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -202,7 +202,6 @@ struct psp_memory_training_context {
/*vram offset of the p2c training data*/
u64 p2c_train_data_offset;
- struct amdgpu_bo *p2c_bo;
/*vram offset of the c2p training data*/
u64 c2p_train_data_offset;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ce5cb854bdb9..6f0ad1d1d4d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1681,9 +1681,6 @@ static int amdgpu_ttm_training_reserve_vram_fini(struct
amdgpu_device *adev)
amdgpu_bo_free_kernel(&ctx->c2p_bo, NULL, NULL);
ctx->c2p_bo = NULL;
- amdgpu_bo_free_kernel(&ctx->p2c_bo, NULL, NULL);
- ctx->p2c_bo = NULL;
-
return 0;
}
@@ -1718,17 +1715,6 @@ static int amdgpu_ttm_training_reserve_vram_init(struct
amdgpu_device *adev)
ctx->p2c_train_data_offset,
ctx->c2p_train_data_offset);
- ret = amdgpu_bo_create_kernel_at(adev,
- ctx->p2c_train_data_offset,
- ctx->train_data_size,
- AMDGPU_GEM_DOMAIN_VRAM,
- &ctx->p2c_bo,
- NULL);
- if (ret) {
- DRM_ERROR("alloc p2c_bo failed(%d)!\n", ret);
- goto Err_out;
- }
-
ret = amdgpu_bo_create_kernel_at(adev,
ctx->c2p_train_data_offset,
ctx->train_data_size,
[Guchun] If we have to remove such buffer reservation, from coding style's
perspective, I suggest removing error handler code by "goto" too in
amdgpu_ttm_training_reserve_vram_init.
After removing p2c buffer reservation from this function, there is only one
buffer reservation case for c2p. So direct error handle and return should be
better.
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cguchun.chen%40amd.com%7C888c561716c342aa9ecc08d782e397d0%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637121786693411170&sdata=pH1rob4R5ljvEGo8PSjn1te7ctWLG1Wctv30lNCLyx4%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
