drm/amdgpu: reserved buffer is not needed with ip discovery enabled

When IP discovery enabled, the reserved buffer has been alloacted.

Signed-off-by: Aaron Liu <aaron.liu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 86d28dca4f1d4235e14b8089ce385cdab8275772..4fc1515381f55d072583b6785869edb8eedc25bf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -790,14 +790,17 @@ void amdgpu_gmc_get_reserved_allocation(struct amdgpu_device *adev)
 {
        /* Some ASICs need to reserve a region of video memory to avoid access
         * from driver */
+       adev->mman.stolen_reserved_offset = 0;
+       adev->mman.stolen_reserved_size = 0;
+
        switch (adev->asic_type) {
        case CHIP_YELLOW_CARP:
-               adev->mman.stolen_reserved_offset = 0x1ffb0000;
-               adev->mman.stolen_reserved_size = 64 * PAGE_SIZE;
+               if (amdgpu_discovery == 0) {
+                       adev->mman.stolen_reserved_offset = 0x1ffb0000;
+                       adev->mman.stolen_reserved_size = 64 * PAGE_SIZE;
+               }
                break;
        default:
-               adev->mman.stolen_reserved_offset = 0;
-               adev->mman.stolen_reserved_size = 0;
                break;
        }
 }