From bea75349945f4a446d29e434dad40ec78ff5fcbc Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Wed, 13 Jan 2021 17:14:02 +0800 Subject: 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 Reviewed-by: Huang Rui Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index 86d28dca4f1d..4fc1515381f5 100644 --- 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; } } -- cgit