Commit 422fe8d2 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gmc6: switch to using amdgpu_gmc_get_vbios_allocations 



The new helper centralizes the logic in one place.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dd285c5d

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

+2 −4
Original line number Diff line number Diff line
@@ -812,9 +812,6 @@ static unsigned gmc_v6_0_get_vbios_fb_size(struct amdgpu_device *adev) 
			REG_GET_FIELD(viewport, VIEWPORT_SIZE, VIEWPORT_WIDTH) *

			4);

	}

	/* return 0 if the pre-OS buffer uses up most of vram */

	if ((adev->gmc.real_vram_size - size) < (8 * 1024 * 1024))

		return 0;

	return size;

}
@@ -862,7 +859,7 @@ static int gmc_v6_0_sw_init(void *handle) 
	if (r)

		return r;



	adev->gmc.stolen_vga_size = gmc_v6_0_get_vbios_fb_size(adev);

	amdgpu_gmc_get_vbios_allocations(adev);



	r = amdgpu_bo_init(adev);

	if (r)
@@ -1136,6 +1133,7 @@ static const struct amdgpu_gmc_funcs gmc_v6_0_gmc_funcs = { 
	.set_prt = gmc_v6_0_set_prt,

	.get_vm_pde = gmc_v6_0_get_vm_pde,

	.get_vm_pte = gmc_v6_0_get_vm_pte,

	.get_vbios_fb_size = gmc_v6_0_get_vbios_fb_size,

};



static const struct amdgpu_irq_src_funcs gmc_v6_0_irq_funcs = {