[PATCH] drm/amdgpu/psp: update define to better align with its meaning

[Zhang, Hawking]

[AMD Official Use Only - General]

Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>

Regards,
Hawking
-----Original Message-----
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Friday, February 9, 2024 05:15
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: [PATCH] drm/amdgpu/psp: update define to better align with its meaning

MEM_TRAINING_ENCROACHED_SIZE is for BIST training data.  It's not memory type specific.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 +-  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c  | 2 +-  drivers/gpu/drm/amd/amdgpu/psp_v13_0.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 9951bdd022de..47ffaa796264 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -203,7 +203,7 @@ struct psp_ras_context {
 #define GDDR6_MEM_TRAINING_DATA_SIZE_IN_BYTES  0x1000
 #define GDDR6_MEM_TRAINING_OFFSET              0x8000
 /*Define the VRAM size that will be encroached by BIST training.*/
-#define GDDR6_MEM_TRAINING_ENCROACHED_SIZE     0x2000000
+#define BIST_MEM_TRAINING_ENCROACHED_SIZE      0x2000000

 enum psp_memory_training_init_flag {
        PSP_MEM_TRAIN_NOT_SUPPORT       = 0x0,
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index efa37e3b7931..2395f1856962 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -506,7 +506,7 @@ static int psp_v11_0_memory_training(struct psp_context *psp, uint32_t ops)
                 * before training, and restore it after training to avoid
                 * VRAM corruption.
                 */
-               sz = GDDR6_MEM_TRAINING_ENCROACHED_SIZE;
+               sz = BIST_MEM_TRAINING_ENCROACHED_SIZE;

                if (adev->gmc.visible_vram_size < sz || !adev->mman.aper_base_kaddr) {
                        DRM_ERROR("visible_vram_size %llx or aper_base_kaddr %p is not initialized.\n", diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
index 722b6066ce07..0e4329640ecb 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
@@ -561,7 +561,7 @@ static int psp_v13_0_memory_training(struct psp_context *psp, uint32_t ops)
                 * before training, and restore it after training to avoid
                 * VRAM corruption.
                 */
-               sz = GDDR6_MEM_TRAINING_ENCROACHED_SIZE;
+               sz = BIST_MEM_TRAINING_ENCROACHED_SIZE;

                if (adev->gmc.visible_vram_size < sz || !adev->mman.aper_base_kaddr) {
                        dev_err(adev->dev, "visible_vram_size %llx or aper_base_kaddr %p is not initialized.\n",
--
2.42.0