drm/amdgpu: Group filling reserve region details

Add a function which groups filling of reserve region information. It
may not cover all as info on some regions are still filled outside like
those from atomfirmware tables.

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 c3b83d9f110e558e23845cd25ccd33fe41c6e787..285e217fba040b039a2a667c9b8000023611d146 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -1033,10 +1033,13 @@ void amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type,
        }
 }
 
-void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)
+void amdgpu_gmc_init_vga_resv_regions(struct amdgpu_device *adev)
 {
        unsigned size;
 
+       if (adev->gmc.is_app_apu)
+               return;
+
        /*
         * Some ASICs need to reserve a region of video memory to avoid access
         * from driver

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index 32e73e8ba778c9a61c878056db0f1effb3b9ad38..6ab4c1e297fce7e966e9306c357a5802301db7b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -456,7 +456,7 @@ extern void
 amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type,
                              bool enable);
 
-void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev);
+void amdgpu_gmc_init_vga_resv_regions(struct amdgpu_device *adev);
 
 void amdgpu_gmc_init_pdb0(struct amdgpu_device *adev);
 uint64_t amdgpu_gmc_vram_mc2pa(struct amdgpu_device *adev, uint64_t mc_addr);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 9f02b9e3eea1c8cf71e6ffe97e9b0342d747dc96..a6364a50a2eb8a85563fdb5a73dc3e42b786bc31 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1687,6 +1687,16 @@ void amdgpu_ttm_init_vram_resv(struct amdgpu_device *adev,
        resv->needs_cpu_map = needs_cpu_map;
 }
 
+static void amdgpu_ttm_init_vram_resv_regions(struct amdgpu_device *adev)
+{
+       /* Initialize memory reservations as required for VGA.
+        * This is used for VGA emulation and pre-OS scanout buffers to
+        * avoid display artifacts while transitioning between pre-OS
+        * and driver.
+        */
+       amdgpu_gmc_init_vga_resv_regions(adev);
+}
+
 int amdgpu_ttm_mark_vram_reserved(struct amdgpu_device *adev,
                                  enum amdgpu_resv_region_id id)
 {
@@ -2086,6 +2096,8 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
                                adev->gmc.visible_vram_size);
 #endif
 
+       amdgpu_ttm_init_vram_resv_regions(adev);
+
        /*
         *The reserved vram for firmware must be pinned to the specified
         *place on the VRAM, so reserve it early.
@@ -2123,26 +2135,17 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
                        return r;
        }
 
-       /* allocate memory as required for VGA
-        * This is used for VGA emulation and pre-OS scanout buffers to
-        * avoid display artifacts while transitioning between pre-OS
-        * and driver.
-        */
-       if (!adev->gmc.is_app_apu) {
-               r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_VGA);
-               if (r)
-                       return r;
+       r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_VGA);
+       if (r)
+               return r;
 
-               r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED);
-               if (r)
-                       return r;
+       r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_EXTENDED);
+       if (r)
+               return r;
 
-               r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_RESERVED);
-               if (r)
-                       return r;
-       } else {
-               DRM_DEBUG_DRIVER("Skipped stolen memory reservation\n");
-       }
+       r = amdgpu_ttm_mark_vram_reserved(adev, AMDGPU_RESV_STOLEN_RESERVED);
+       if (r)
+               return r;
 
        dev_info(adev->dev, " %uM of VRAM memory ready\n",
                 (unsigned int)(adev->gmc.real_vram_size / (1024 * 1024)));

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index fd691b2a6e2122ee6af5c489950ef800a3f45589..e1ace7d44ffdfd247b1c3ec2c979155ddd02653e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -860,8 +860,6 @@ static int gmc_v10_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
        /* Memory manager */
        r = amdgpu_bo_init(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
index e6db87b94eb1d7827ecf453635867d1d843ecffb..94d6631ce0bce62be858625bcc8420475b9d3234 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
@@ -834,8 +834,6 @@ static int gmc_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
        /* Memory manager */
        r = amdgpu_bo_init(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
index 6e184ea069ef216df2e166f3e2ba70cf029eb659..e10ac9788d13a7c3414ae5779ce4801a7af86e61 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
@@ -924,8 +924,6 @@ static int gmc_v12_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
 #ifdef HAVE_ACPI_DEV_GET_FIRST_MATCH_DEV
        if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 1, 0)) {
                r = amdgpu_gmc_init_mem_ranges(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 886bf77309a5406dfff4974af105e6c136154558..cc272a96fcef010db0aef26318bf003b9724c655 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -854,8 +854,6 @@ static int gmc_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
        r = amdgpu_bo_init(adev);
        if (r)
                return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index d25fdedb0d9f178787ab94733bd028302a7fcd7c..bb16ba2ef6fd90deb2c6f7e5329a7cccf1460745 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -1034,8 +1034,6 @@ static int gmc_v7_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
        /* Memory manager */
        r = amdgpu_bo_init(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 4910e5557a67382bccc5aeda404c3baa1790d292..a59174f6bcc18bb1df632d282d608c044aab5235 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -1149,8 +1149,6 @@ static int gmc_v8_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
        /* Memory manager */
        r = amdgpu_bo_init(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index d865059e884aa69dfefb88cf3bc20fdae85e274d..e7b78027002beefb52f377119aa864b448e9d865 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -2010,8 +2010,6 @@ static int gmc_v9_0_sw_init(struct amdgpu_ip_block *ip_block)
        if (r)
                return r;
 
-       amdgpu_gmc_get_vbios_allocations(adev);
-
        if (amdgpu_is_multi_aid(adev)) {
                r = amdgpu_gmc_init_mem_ranges(adev);
                if (r)