aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-01-08 22:43:03 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-01-16 15:35:28 -0500
commit8159e509203c50d0684483b4311b20e5d40553e8 (patch)
tree356a6fee5895b748922fc47be5c746798673940b
parentd33bba4d5d2cc26b2400fb9ec770b9044ab8ed30 (diff)
drm/radeon: fill in rb backend map on evergreen/ni.
This looks to have never gotten filled in, and it seems to trigger a bug in mesa. Reviewed-by: Roland Scheidegger <sroland@vmware.com> Reported-by: Roland Scheidegger <sroland@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c1
-rw-r--r--drivers/gpu/drm/radeon/ni.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 24fe66c89dfb..5712d63dca20 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3513,6 +3513,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
3513 tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.evergreen.max_backends, 3513 tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.evergreen.max_backends,
3514 EVERGREEN_MAX_BACKENDS, disabled_rb_mask); 3514 EVERGREEN_MAX_BACKENDS, disabled_rb_mask);
3515 } 3515 }
3516 rdev->config.evergreen.backend_map = tmp;
3516 WREG32(GB_BACKEND_MAP, tmp); 3517 WREG32(GB_BACKEND_MAP, tmp);
3517 3518
3518 WREG32(CGTS_SYS_TCC_DISABLE, 0); 3519 WREG32(CGTS_SYS_TCC_DISABLE, 0);
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 9eccd0c81d88..381b0255ff02 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1148,6 +1148,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
1148 rdev->config.cayman.max_shader_engines, 1148 rdev->config.cayman.max_shader_engines,
1149 CAYMAN_MAX_BACKENDS, disabled_rb_mask); 1149 CAYMAN_MAX_BACKENDS, disabled_rb_mask);
1150 } 1150 }
1151 rdev->config.cayman.backend_map = tmp;
1151 WREG32(GB_BACKEND_MAP, tmp); 1152 WREG32(GB_BACKEND_MAP, tmp);
1152 1153
1153 cgts_tcc_disable = 0xffff0000; 1154 cgts_tcc_disable = 0xffff0000;