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

Commit 52da51f0 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix active_cu mask on SI and CIK after re-init (v3) 

Need to initialize the mask to 0 on init, otherwise it
keeps increasing.

bug:
https://bugzilla.kernel.org/show_bug.cgi?id=82581



v2: also fix cu count
v3: split count fix into separate patch

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Cc: stable@vger.kernel.org
parent 6101b3ae

drivers/gpu/drm/radeon/cik.c

+1 −0
Original line number Diff line number Diff line
@@ -3672,6 +3672,7 @@ static void cik_gpu_init(struct radeon_device *rdev) 
		     rdev->config.cik.max_sh_per_se,

		     rdev->config.cik.max_backends_per_se);



	rdev->config.cik.active_cus = 0;

	for (i = 0; i < rdev->config.cik.max_shader_engines; i++) {

		for (j = 0; j < rdev->config.cik.max_sh_per_se; j++) {

			rdev->config.cik.active_cus +=

drivers/gpu/drm/radeon/si.c

+1 −0
Original line number Diff line number Diff line
@@ -3255,6 +3255,7 @@ static void si_gpu_init(struct radeon_device *rdev) 
		     rdev->config.si.max_sh_per_se,

		     rdev->config.si.max_cu_per_sh);



	rdev->config.si.active_cus = 0;

	for (i = 0; i < rdev->config.si.max_shader_engines; i++) {

		for (j = 0; j < rdev->config.si.max_sh_per_se; j++) {

			rdev->config.si.active_cus +=