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.

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 9951bdd022dedd2a57d4d659cd7cef68f69539e6..47ffaa796264f6e147f21804bad9f55184e56af7 100644 (file)
--- 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 efa37e3b793143a62281c451079dcd3e53d2c778..2395f1856962ad02a209bbf9e695bdfb96c07ef8 100644 (file)
--- 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 722b6066ce07c5330fa246ec81e56cd41893e064..0e4329640ecb63f254c9b0415ca0ade3d7f8f295 100644 (file)
--- 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",