Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfc230f9 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: adjust default radeon_vm_block_size v2 



v2: rebase on vm_size scale change. Adjust vm_size default to 8,
    Better handle the default and smaller values.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f77c4f02

drivers/gpu/drm/radeon/radeon_device.c

+13 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,19 @@ static void radeon_check_arguments(struct radeon_device *rdev) 
	/* defines number of bits in page table versus page directory,

	 * a page is 4KB so we have 12 bits offset, minimum 9 bits in the

	 * page table and the remaining bits are in the page directory */

	if (radeon_vm_block_size < 9) {

	if (radeon_vm_block_size == -1) {



		/* Total bits covered by PD + PTs */

		unsigned bits = ilog2(radeon_vm_size) + 17;



		/* Make sure the PD is 4K in size up to 8GB address space.

		   Above that split equal between PD and PTs */

		if (radeon_vm_size <= 8)

			radeon_vm_block_size = bits - 9;

		else

			radeon_vm_block_size = (bits + 3) / 2;



	} else if (radeon_vm_block_size < 9) {

		dev_warn(rdev->dev, "VM page table size (%d) too small\n",

			 radeon_vm_block_size);

		radeon_vm_block_size = 9;

drivers/gpu/drm/radeon/radeon_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ int radeon_dpm = -1; 
int radeon_aspm = -1;

int radeon_runtime_pm = -1;

int radeon_hard_reset = 0;

int radeon_vm_size = 4;

int radeon_vm_block_size = 9;

int radeon_vm_size = 8;

int radeon_vm_block_size = -1;

int radeon_deep_color = 0;



MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
@@ -248,7 +248,7 @@ module_param_named(hard_reset, radeon_hard_reset, int, 0444); 
MODULE_PARM_DESC(vm_size, "VM address space size in gigabytes (default 4GB)");

module_param_named(vm_size, radeon_vm_size, int, 0444);



MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default 9)");

MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default depending on vm_size)");

module_param_named(vm_block_size, radeon_vm_block_size, int, 0444);



MODULE_PARM_DESC(deep_color, "Deep Color support (1 = enable, 0 = disable (default))");