diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 11aab2a..eaef049 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -877,7 +877,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
 	case CHIP_ARUBA:
 	default:
 		rdev->config.cayman.max_shader_engines = 1;
-		rdev->config.cayman.max_pipes_per_simd = 4;
+		rdev->config.cayman.max_pipes_per_simd = 2;
 		rdev->config.cayman.max_tile_pipes = 2;
 		if ((rdev->pdev->device == 0x9900) ||
 		    (rdev->pdev->device == 0x9901) ||
@@ -919,17 +919,17 @@ static void cayman_gpu_init(struct radeon_device *rdev)
 			rdev->config.cayman.max_simds_per_se = 2;
 			rdev->config.cayman.max_backends_per_se = 1;
 		}
-		rdev->config.cayman.max_texture_channel_caches = 2;
+		rdev->config.cayman.max_texture_channel_caches = 2;
 		rdev->config.cayman.max_gprs = 256;
 		rdev->config.cayman.max_threads = 256;
-		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.max_gs_threads = 8;
+		rdev->config.cayman.max_stack_entries = 128;
+		rdev->config.cayman.sx_num_of_sets = 2;
+		rdev->config.cayman.sx_max_export_size = 64;
+		rdev->config.cayman.sx_max_export_pos_size = 16;
+		rdev->config.cayman.sx_max_export_smx_size = 48;
+		rdev->config.cayman.max_hw_contexts = 2;
+		rdev->config.cayman.sq_num_cf_insts = 2;
 
 		rdev->config.cayman.sc_prim_fifo_size = 0x40;
 		rdev->config.cayman.sc_hiz_tile_fifo_size = 0x30;