Use reserve region helpers for initializing/reserving stolen vga region.
Signed-off-by: Lijo Lazar <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 +++++---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++++------
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 --
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index f165d4e401e8..c40ae1073017 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -1098,10 +1098,12 @@ void amdgpu_gmc_get_vbios_allocations(struct
amdgpu_device *adev)
size = 0;
if (size > AMDGPU_VBIOS_VGA_ALLOCATION) {
- adev->mman.stolen_vga_size = AMDGPU_VBIOS_VGA_ALLOCATION;
- adev->mman.stolen_extended_size = size -
adev->mman.stolen_vga_size;
+ amdgpu_ttm_init_vram_resv(adev, AMDGPU_RESV_STOLEN_VGA,
+ 0, AMDGPU_VBIOS_VGA_ALLOCATION,
false);
+ adev->mman.stolen_extended_size = size -
AMDGPU_VBIOS_VGA_ALLOCATION;
} else {
- adev->mman.stolen_vga_size = size;
+ amdgpu_ttm_init_vram_resv(adev, AMDGPU_RESV_STOLEN_VGA,
+ 0, size, false);
adev->mman.stolen_extended_size = 0;
}
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 7f04e53983b5..84c482cc653f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2213,14 +2213,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
* and driver.
*/
if (!adev->gmc.is_app_apu) {
- r = amdgpu_bo_create_kernel_at(adev, 0,
- adev->mman.stolen_vga_size,
- &adev->mman.stolen_vga_memory,
- NULL);
+ r = amdgpu_ttm_reserve_vram(adev, AMDGPU_RESV_STOLEN_VGA);
if (r)
return r;
- r = amdgpu_bo_create_kernel_at(adev, adev->mman.stolen_vga_size,
+ r = amdgpu_bo_create_kernel_at(adev,
+
adev->mman.resv_region[AMDGPU_RESV_STOLEN_VGA].size,
adev->mman.stolen_extended_size,
&adev->mman.stolen_extended_memory,
NULL);
@@ -2349,7 +2347,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
amdgpu_ttm_training_reserve_vram_fini(adev);
/* return the stolen vga memory back to VRAM */
if (!adev->gmc.is_app_apu) {
- amdgpu_bo_free_kernel(&adev->mman.stolen_vga_memory, NULL,
NULL);
+ amdgpu_ttm_unreserve_vram(adev, AMDGPU_RESV_STOLEN_VGA);
amdgpu_bo_free_kernel(&adev->mman.stolen_extended_memory, NULL,
NULL);
/* return the FW reserved memory back to VRAM */
amdgpu_bo_free_kernel(&adev->mman.fw_reserved_memory, NULL,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index b73f65a4bc0d..d973c96f0ebb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -99,8 +99,6 @@ struct amdgpu_mman {
struct amdgpu_gtt_mgr gtt_mgr;
struct ttm_resource_manager preempt_mgr;
- uint64_t stolen_vga_size;
- struct amdgpu_bo *stolen_vga_memory;
uint64_t stolen_extended_size;
struct amdgpu_bo *stolen_extended_memory;
bool keep_stolen_vga_memory;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index d73095ac3ab1..30521e270d71 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -11153,7 +11153,7 @@ static void amdgpu_dm_atomic_commit_tail(struct
drm_atomic_state *state)
if (!adev->in_suspend) {
/* return the stolen vga memory back to VRAM */
if (!adev->mman.keep_stolen_vga_memory)
- amdgpu_bo_free_kernel(&adev->mman.stolen_vga_memory,
NULL, NULL);
+ amdgpu_ttm_unreserve_vram(adev, AMDGPU_RESV_STOLEN_VGA);
amdgpu_bo_free_kernel(&adev->mman.stolen_extended_memory, NULL,
NULL);
}
--
2.49.0
