drm/amdgpu: Add extended stolen vga reserve-region

Use reserve region helpers for initializing/reserving extended stolen
vga region.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 2d7e5c137902303cf6fe534fb57af6dddc57f058..4d066955be8568254ad9743761cbdd5176464fc8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -1101,11 +1101,12 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)
        if (size > AMDGPU_VBIOS_VGA_ALLOCATION) {
                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;
+               amdgpu_ttm_init_vram_resv(adev, AMDGPU_RESV_STOLEN_EXTENDED,
+                                         AMDGPU_VBIOS_VGA_ALLOCATION,
+                                         size - AMDGPU_VBIOS_VGA_ALLOCATION, false);
        } else {
                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 57804625702f7564e6463ebd14dc96ecbd25410e..256bf490ee15b65968182f3055df6ab00b05ff7a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2210,12 +2210,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
                if (r)
                        return r;
 
-               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);
-
+               r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED);
                if (r)
                        return r;
 
@@ -2341,7 +2336,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
        /* return the stolen vga memory back to VRAM */
        if (!adev->gmc.is_app_apu) {
                amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_VGA);
-               amdgpu_bo_free_kernel(&adev->mman.stolen_extended_memory, NULL, NULL);
+               amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED);
                /* return the FW reserved memory back to VRAM */
                amdgpu_bo_free_kernel(&adev->mman.fw_reserved_memory, NULL,
                                      NULL);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index 826db85d133eed7ba2750270cccad5a2738a6e55..b62f9208eb9a7d518b153d5afc9ca957522c3e3e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -103,8 +103,6 @@ struct amdgpu_mman {
        struct amdgpu_gtt_mgr gtt_mgr;
        struct ttm_resource_manager preempt_mgr;
 
-       uint64_t                stolen_extended_size;
-       struct amdgpu_bo        *stolen_extended_memory;
        bool                    keep_stolen_vga_memory;
 
        struct amdgpu_bo        *stolen_reserved_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 19d8a5fc5def0dabb29593abf9d14f977f51a71f..1816007f10400600fd5f4a0a8e0d833c65176fb4 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -11200,7 +11200,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
                /* return the stolen vga memory back to VRAM */
                if (!adev->mman.keep_stolen_vga_memory)
                        amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_VGA);
-               amdgpu_bo_free_kernel(&adev->mman.stolen_extended_memory, NULL, NULL);
+               amdgpu_ttm_unmark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED);
        }
 
        /*