drm/amdgpu: move stolen vga bo from amdgpu to amdgpu.gmc

Since that is where we store the other data related to
the stolen vga memory.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 5d605e47331924c84f8d273baeffd09b2792c640..af51160bcf6017bbe176fcb50128cc738464179d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -769,7 +769,6 @@ struct amdgpu_device {
        bool                            is_atom_fw;
        uint8_t                         *bios;
        uint32_t                        bios_size;
-       struct amdgpu_bo                *stolen_vga_memory;
        uint32_t                        bios_scratch_reg_offset;
        uint32_t                        bios_scratch[AMDGPU_BIOS_NUM_SCRATCH];
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index 9d58c56f6cfc4da2f3b229b266457f86afef7c3c..ddb64be670c2003f086d11e62576e6fc3219b064 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -213,7 +213,8 @@ struct amdgpu_gmc {
        uint8_t                 vram_vendor;
        uint32_t                srbm_soft_reset;
        bool                    prt_warning;
-       uint64_t                stolen_size;
+       uint64_t                stolen_vga_size;
+       struct amdgpu_bo        *stolen_vga_memory;
        uint32_t                sdpif_register;
        /* apertures */
        u64                     shared_aperture_start;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index a188216bccc2cf070c4744c80cd045f8a2fbd364..39781127d0599cd3167d8be53d44b355b996b771 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1979,9 +1979,9 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
         * This is used for VGA emulation and pre-OS scanout buffers to
         * avoid display artifacts while transitioning between pre-OS
         * and driver.  */
-       r = amdgpu_bo_create_kernel_at(adev, 0, adev->gmc.stolen_size,
+       r = amdgpu_bo_create_kernel_at(adev, 0, adev->gmc.stolen_vga_size,
                                       AMDGPU_GEM_DOMAIN_VRAM,
-                                      &adev->stolen_vga_memory,
+                                      &adev->gmc.stolen_vga_memory,
                                       &stolen_vga_buf);
        if (r)
                return r;
@@ -2043,7 +2043,7 @@ void amdgpu_ttm_late_init(struct amdgpu_device *adev)
 {
        void *stolen_vga_buf;
        /* return the VGA stolen memory (if any) back to VRAM */
-       amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
+       amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, &stolen_vga_buf);
 }
 
 /**

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 943773e0c3c3dbc4bdd39b8a43c6bc8869de08b2..187c108f2fde45f9fbccacaa358eaf337f454b7d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -860,7 +860,7 @@ static int gmc_v10_0_sw_init(void *handle)
        if (r)
                return r;
 
-       adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
+       adev->gmc.stolen_vga_size = gmc_v10_0_get_vbios_fb_size(adev);
 
        /* Memory manager */
        r = amdgpu_bo_init(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 4de996868d3266fe8f6311088b317e084bd5e3ee..28ddb41a78c8de8e62473569ef5f2897cc64f96e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -862,7 +862,7 @@ static int gmc_v6_0_sw_init(void *handle)
        if (r)
                return r;
 
-       adev->gmc.stolen_size = gmc_v6_0_get_vbios_fb_size(adev);
+       adev->gmc.stolen_vga_size = gmc_v6_0_get_vbios_fb_size(adev);
 
        r = amdgpu_bo_init(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 4113f2d33b75fd2843c549d4b5c1ed43cca1086c..8b8ecbb99d84d1c7473fa9ae6d9678285dd6f499 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -1035,7 +1035,7 @@ static int gmc_v7_0_sw_init(void *handle)
        if (r)
                return r;
 
-       adev->gmc.stolen_size = gmc_v7_0_get_vbios_fb_size(adev);
+       adev->gmc.stolen_vga_size = gmc_v7_0_get_vbios_fb_size(adev);
 
        /* Memory manager */
        r = amdgpu_bo_init(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index f29ff9afcc108825eee77bb131e059866b653f76..8e3763ec268fab1f7a50fdb26382fcc5038a2cb7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -1160,7 +1160,7 @@ static int gmc_v8_0_sw_init(void *handle)
        if (r)
                return r;
 
-       adev->gmc.stolen_size = gmc_v8_0_get_vbios_fb_size(adev);
+       adev->gmc.stolen_vga_size = gmc_v8_0_get_vbios_fb_size(adev);
 
        /* Memory manager */
        r = amdgpu_bo_init(adev);

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index ac15d7678d245fdb51882af7467a3ab2a28fc0cc..b66c60680dba90c2114b2f2f0724f598b28a6cb1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1243,7 +1243,7 @@ static int gmc_v9_0_sw_init(void *handle)
        if (r)
                return r;
 
-       adev->gmc.stolen_size = gmc_v9_0_get_vbios_fb_size(adev);
+       adev->gmc.stolen_vga_size = gmc_v9_0_get_vbios_fb_size(adev);
 
        /* Memory manager */
        r = amdgpu_bo_init(adev);
@@ -1282,7 +1282,7 @@ static int gmc_v9_0_sw_fini(void *handle)
        amdgpu_vm_manager_fini(adev);
 
        if (gmc_v9_0_keep_stolen_memory(adev))
-               amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
+               amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, &stolen_vga_buf);
 
        amdgpu_gart_table_vram_free(adev);
        amdgpu_bo_fini(adev);