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

Commit 6f8941a2 authored by Nicolai Hähnle's avatar Nicolai Hähnle Committed by Alex Deucher
Browse files

drm/amdgpu: add disable_cu parameter 



This parameter will allow disabling individual CUs on module load, e.g.
amdgpu.disable_cu=2.0.3,2.0.4 to disable CUs 3 and 4 of SE2.

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 8b2ac103

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

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ extern unsigned amdgpu_pcie_gen_cap; 
extern unsigned amdgpu_pcie_lane_cap;

extern unsigned amdgpu_cg_mask;

extern unsigned amdgpu_pg_mask;

extern char *amdgpu_disable_cu;



#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000

#define AMDGPU_MAX_USEC_TIMEOUT			100000	/* 100 ms */

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

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ unsigned amdgpu_pcie_gen_cap = 0; 
unsigned amdgpu_pcie_lane_cap = 0;

unsigned amdgpu_cg_mask = 0xffffffff;

unsigned amdgpu_pg_mask = 0xffffffff;

char *amdgpu_disable_cu = NULL;



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

module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
@@ -180,6 +181,9 @@ 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);



MODULE_PARM_DESC(disable_cu, "Disable CUs (se.sh.cu,...)");

module_param_named(disable_cu, amdgpu_disable_cu, charp, 0444);



static const struct pci_device_id pciidlist[] = {

#ifdef CONFIG_DRM_AMDGPU_CIK

	/* Kaveri */

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

+44 −0
Original line number Diff line number Diff line
@@ -70,3 +70,47 @@ void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg) 
		}

	}

}



/**

 * amdgpu_gfx_parse_disable_cu - Parse the disable_cu module parameter

 *

 * @mask: array in which the per-shader array disable masks will be stored

 * @max_se: number of SEs

 * @max_sh: number of SHs

 *

 * The bitmask of CUs to be disabled in the shader array determined by se and

 * sh is stored in mask[se * max_sh + sh].

 */

void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh)

{

	unsigned se, sh, cu;

	const char *p;



	memset(mask, 0, sizeof(*mask) * max_se * max_sh);



	if (!amdgpu_disable_cu || !*amdgpu_disable_cu)

		return;



	p = amdgpu_disable_cu;

	for (;;) {

		char *next;

		int ret = sscanf(p, "%u.%u.%u", &se, &sh, &cu);

		if (ret < 3) {

			DRM_ERROR("amdgpu: could not parse disable_cu\n");

			return;

		}



		if (se < max_se && sh < max_sh && cu < 16) {

			DRM_INFO("amdgpu: disabling CU %u.%u.%u\n", se, sh, cu);

			mask[se * max_sh + sh] |= 1u << cu;

		} else {

			DRM_ERROR("amdgpu: disable_cu %u.%u.%u is out of range\n",

				  se, sh, cu);

		}



		next = strchr(p, ',');

		if (!next)

			break;

		p = next + 1;

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -27,4 +27,6 @@ 
int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg);

void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg);



unsigned amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh);



#endif