diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-03-05 14:50:37 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-30 19:53:53 -0400 |
| commit | f867c60def7a8dcd86657fd38a8920a4354f305e (patch) | |
| tree | 5dde8663e0af76bcb220ec3c3bf0c1111569e787 /drivers/gpu/drm/radeon/r600.c | |
| parent | 57f50d70e27f99a9a785c760b2123cdf6a68e2de (diff) | |
drm/radeon/kms: gfx init fixes for r6xx/r7xx
This fixes some issues with the last gfx init patch.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 5aee7fe4717f..d568262160e1 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -1133,6 +1133,7 @@ void r600_gpu_init(struct radeon_device *rdev) | |||
| 1133 | /* Setup pipes */ | 1133 | /* Setup pipes */ |
| 1134 | WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 1134 | WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1135 | WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | 1135 | WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); |
| 1136 | WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | ||
| 1136 | 1137 | ||
| 1137 | tmp = R6XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); | 1138 | tmp = R6XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); |
| 1138 | WREG32(VGT_OUT_DEALLOC_CNTL, (tmp * 4) & DEALLOC_DIST_MASK); | 1139 | WREG32(VGT_OUT_DEALLOC_CNTL, (tmp * 4) & DEALLOC_DIST_MASK); |