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

Commit a32168f9 authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

drm/radeon: fix KV harvesting 

commit 0b58d90f89545e021d188c289fa142e5ff9e708b upstream.

Always set the graphics values to the max for the
asic type.  E.g., some 1 RB chips are actually 1 RB chips,
others are actually harvested 2 RB chips.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99353


Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bf82a32

drivers/gpu/drm/radeon/cik.c

+2 −29
Original line number Diff line number Diff line
@@ -3244,35 +3244,8 @@ static void cik_gpu_init(struct radeon_device *rdev) 
	case CHIP_KAVERI:

		rdev->config.cik.max_shader_engines = 1;

		rdev->config.cik.max_tile_pipes = 4;

		if ((rdev->pdev->device == 0x1304) ||

		    (rdev->pdev->device == 0x1305) ||

		    (rdev->pdev->device == 0x130C) ||

		    (rdev->pdev->device == 0x130F) ||

		    (rdev->pdev->device == 0x1310) ||

		    (rdev->pdev->device == 0x1311) ||

		    (rdev->pdev->device == 0x131C)) {

		rdev->config.cik.max_cu_per_sh = 8;

		rdev->config.cik.max_backends_per_se = 2;

		} else if ((rdev->pdev->device == 0x1309) ||

			   (rdev->pdev->device == 0x130A) ||

			   (rdev->pdev->device == 0x130D) ||

			   (rdev->pdev->device == 0x1313) ||

			   (rdev->pdev->device == 0x131D)) {

			rdev->config.cik.max_cu_per_sh = 6;

			rdev->config.cik.max_backends_per_se = 2;

		} else if ((rdev->pdev->device == 0x1306) ||

			   (rdev->pdev->device == 0x1307) ||

			   (rdev->pdev->device == 0x130B) ||

			   (rdev->pdev->device == 0x130E) ||

			   (rdev->pdev->device == 0x1315) ||

			   (rdev->pdev->device == 0x1318) ||

			   (rdev->pdev->device == 0x131B)) {

			rdev->config.cik.max_cu_per_sh = 4;

			rdev->config.cik.max_backends_per_se = 1;

		} else {

			rdev->config.cik.max_cu_per_sh = 3;

			rdev->config.cik.max_backends_per_se = 1;

		}

		rdev->config.cik.max_sh_per_se = 1;

		rdev->config.cik.max_texture_channel_caches = 4;

		rdev->config.cik.max_gprs = 256;