aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Liu <[email protected]>2021-01-13 17:14:02 +0800
committerAlex Deucher <[email protected]>2021-06-04 16:03:12 -0400
commitbea75349945f4a446d29e434dad40ec78ff5fcbc (patch)
tree5a11dadaf0086393d9d329fea709b1fb6bfced79
parente15a5fb9b6ac2556a4fe59dba5faa34c695e8b73 (diff)
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 <[email protected]> Reviewed-by: Huang Rui <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c11
1 files changed, 7 insertions, 4 deletions
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;
}
}