Commit 81b54fb7 authored Jul 28, 2020 by Alex Deucher

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>

parent adb5be81

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) *

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) *

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) *