Commit e2f6c88f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix asic gfx values for scrapper asics 

Fixes gfx corruption on certain TN/RL parts.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=60389



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent b67ce39a

drivers/gpu/drm/radeon/ni.c

+16 −4
Original line number Diff line number Diff line
@@ -895,6 +895,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
		    (rdev->pdev->device == 0x999C)) {

			rdev->config.cayman.max_simds_per_se = 6;

			rdev->config.cayman.max_backends_per_se = 2;

			rdev->config.cayman.max_hw_contexts = 8;

			rdev->config.cayman.sx_max_export_size = 256;

			rdev->config.cayman.sx_max_export_pos_size = 64;

			rdev->config.cayman.sx_max_export_smx_size = 192;

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

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

			   (rdev->pdev->device == 0x990A) ||
@@ -905,6 +909,10 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
			   (rdev->pdev->device == 0x999D)) {

			rdev->config.cayman.max_simds_per_se = 4;

			rdev->config.cayman.max_backends_per_se = 2;

			rdev->config.cayman.max_hw_contexts = 8;

			rdev->config.cayman.sx_max_export_size = 256;

			rdev->config.cayman.sx_max_export_pos_size = 64;

			rdev->config.cayman.sx_max_export_smx_size = 192;

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

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

			   (rdev->pdev->device == 0x9991) ||
@@ -915,9 +923,17 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
			   (rdev->pdev->device == 0x99A0)) {

			rdev->config.cayman.max_simds_per_se = 3;

			rdev->config.cayman.max_backends_per_se = 1;

			rdev->config.cayman.max_hw_contexts = 4;

			rdev->config.cayman.sx_max_export_size = 128;

			rdev->config.cayman.sx_max_export_pos_size = 32;

			rdev->config.cayman.sx_max_export_smx_size = 96;

		} else {

			rdev->config.cayman.max_simds_per_se = 2;

			rdev->config.cayman.max_backends_per_se = 1;

			rdev->config.cayman.max_hw_contexts = 4;

			rdev->config.cayman.sx_max_export_size = 128;

			rdev->config.cayman.sx_max_export_pos_size = 32;

			rdev->config.cayman.sx_max_export_smx_size = 96;

		}

		rdev->config.cayman.max_texture_channel_caches = 2;

		rdev->config.cayman.max_gprs = 256;
@@ -925,10 +941,6 @@ static void cayman_gpu_init(struct radeon_device *rdev) 
		rdev->config.cayman.max_gs_threads = 32;

		rdev->config.cayman.max_stack_entries = 512;

		rdev->config.cayman.sx_num_of_sets = 8;

		rdev->config.cayman.sx_max_export_size = 256;

		rdev->config.cayman.sx_max_export_pos_size = 64;

		rdev->config.cayman.sx_max_export_smx_size = 192;

		rdev->config.cayman.max_hw_contexts = 8;

		rdev->config.cayman.sq_num_cf_insts = 2;



		rdev->config.cayman.sc_prim_fifo_size = 0x40;