drm/amdgpu: use a define for the memory size of the vga emulator

Rather than open coding it everywhere.

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 75631b3396a3c6c7a152abceedc10831c5a023c3..5d605e47331924c84f8d273baeffd09b2792c640 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -214,6 +214,8 @@ extern int amdgpu_num_kcq;
 #define AMDGPUFB_CONN_LIMIT                    4
 #define AMDGPU_BIOS_NUM_SCRATCH                        16
 
+#define AMDGPU_VBIOS_VGA_ALLOCATION            (9 * 1024 * 1024) /* reserve 8MB for vga emulator and 1 MB for FB */
+
 /* hard reset data */
 #define AMDGPU_ASIC_RESET_DATA                  0x39d5e86b
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index dd91a93de62aed4e63e13cc2c9ff21ae335b8f99..943773e0c3c3dbc4bdd39b8a43c6bc8869de08b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -747,7 +747,7 @@ static unsigned gmc_v10_0_get_vbios_fb_size(struct amdgpu_device *adev)
        unsigned size;
 
        if (REG_GET_FIELD(d1vga_control, D1VGA_CONTROL, D1VGA_MODE_ENABLE)) {
-               size = 9 * 1024 * 1024; /* reserve 8MB for vga emulator and 1 MB for FB */
+               size = AMDGPU_VBIOS_VGA_ALLOCATION;
        } else {
                u32 viewport;
                u32 pitch;

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 538e7ee35cdf2d7c7f374e04e23213fb4e1ae6c2..4de996868d3266fe8f6311088b317e084bd5e3ee 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -805,7 +805,7 @@ static unsigned gmc_v6_0_get_vbios_fb_size(struct amdgpu_device *adev)
        unsigned size;
 
        if (REG_GET_FIELD(d1vga_control, D1VGA_CONTROL, D1VGA_MODE_ENABLE)) {
-               size = 9 * 1024 * 1024; /* reserve 8MB for vga emulator and 1 MB for FB */
+               size = AMDGPU_VBIOS_VGA_ALLOCATION;
        } else {
                u32 viewport = RREG32(mmVIEWPORT_SIZE);
                size = (REG_GET_FIELD(viewport, VIEWPORT_SIZE, VIEWPORT_HEIGHT) *

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 0f8e8aff9114cfe75c3c8890e0b5e29a6f1ee424..4113f2d33b75fd2843c549d4b5c1ed43cca1086c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -970,7 +970,7 @@ static unsigned gmc_v7_0_get_vbios_fb_size(struct amdgpu_device *adev)
        unsigned size;
 
        if (REG_GET_FIELD(d1vga_control, D1VGA_CONTROL, D1VGA_MODE_ENABLE)) {
-               size = 9 * 1024 * 1024; /* reserve 8MB for vga emulator and 1 MB for FB */
+               size = AMDGPU_VBIOS_VGA_ALLOCATION;
        } else {
                u32 viewport = RREG32(mmVIEWPORT_SIZE);
                size = (REG_GET_FIELD(viewport, VIEWPORT_SIZE, VIEWPORT_HEIGHT) *

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index abe64010f0d57f5cda160cb302035526d74e594b..f29ff9afcc108825eee77bb131e059866b653f76 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -1087,7 +1087,7 @@ static unsigned gmc_v8_0_get_vbios_fb_size(struct amdgpu_device *adev)
        unsigned size;
 
        if (REG_GET_FIELD(d1vga_control, D1VGA_CONTROL, D1VGA_MODE_ENABLE)) {
-               size = 9 * 1024 * 1024; /* reserve 8MB for vga emulator and 1 MB for FB */
+               size = AMDGPU_VBIOS_VGA_ALLOCATION;
        } else {
                u32 viewport = RREG32(mmVIEWPORT_SIZE);
                size = (REG_GET_FIELD(viewport, VIEWPORT_SIZE, VIEWPORT_HEIGHT) *

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index c5f94bab4a0106133a0b30b6d39edf1f3ec6550a..ac15d7678d245fdb51882af7467a3ab2a28fc0cc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1077,11 +1077,11 @@ static unsigned gmc_v9_0_get_vbios_fb_size(struct amdgpu_device *adev)
         * Check related code in gmc_v9_0_sw_fini
         * */
        if (gmc_v9_0_keep_stolen_memory(adev))
-               return 9 * 1024 * 1024;
+               return AMDGPU_VBIOS_VGA_ALLOCATION;
 
        d1vga_control = RREG32_SOC15(DCE, 0, mmD1VGA_CONTROL);
        if (REG_GET_FIELD(d1vga_control, D1VGA_CONTROL, D1VGA_MODE_ENABLE)) {
-               size = 9 * 1024 * 1024; /* reserve 8MB for vga emulator and 1 MB for FB */
+               size = AMDGPU_VBIOS_VGA_ALLOCATION;
        } else {
                u32 viewport;