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

Commit 395d1fb9 authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Alex Deucher
Browse files

drm/amdgpu: add amdgpu.cg_mask and amdgpu.pg_mask parameters 



They allow disabling clock and power gating from the kernel command line,
which hopefully helps with diagnosing problems in the field.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarNicolai Hähnle <Nicolai.Haehnle@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f4b373f4

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

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ extern int amdgpu_powerplay; 
extern int amdgpu_powercontainment;

extern unsigned amdgpu_pcie_gen_cap;

extern unsigned amdgpu_pcie_lane_cap;

extern unsigned amdgpu_cg_mask;

extern unsigned amdgpu_pg_mask;



#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000

#define AMDGPU_MAX_USEC_TIMEOUT			100000	/* 100 ms */

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

+3 −0
Original line number Diff line number Diff line
@@ -1213,6 +1213,9 @@ static int amdgpu_early_init(struct amdgpu_device *adev) 
		}

	}



	adev->cg_flags &= amdgpu_cg_mask;

	adev->pg_flags &= amdgpu_pg_mask;



	return 0;

}

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

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ int amdgpu_powerplay = -1; 
int amdgpu_powercontainment = 1;

unsigned amdgpu_pcie_gen_cap = 0;

unsigned amdgpu_pcie_lane_cap = 0;

unsigned amdgpu_cg_mask = 0xffffffff;

unsigned amdgpu_pg_mask = 0xffffffff;



MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes");

module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
@@ -172,6 +174,12 @@ module_param_named(pcie_gen_cap, amdgpu_pcie_gen_cap, uint, 0444); 
MODULE_PARM_DESC(pcie_lane_cap, "PCIE Lane Caps (0: autodetect (default))");

module_param_named(pcie_lane_cap, amdgpu_pcie_lane_cap, uint, 0444);



MODULE_PARM_DESC(cg_mask, "Clockgating flags mask (0 = disable clock gating)");

module_param_named(cg_mask, amdgpu_cg_mask, uint, 0444);



MODULE_PARM_DESC(pg_mask, "Powergating flags mask (0 = disable power gating)");

module_param_named(pg_mask, amdgpu_pg_mask, uint, 0444);



static const struct pci_device_id pciidlist[] = {

#ifdef CONFIG_DRM_AMDGPU_CIK

	/* Kaveri */