diff options
| author |   Alex Deucher <alexdeucher@gmail.com> | 2010-03-05 14:50:37 -0500 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2010-03-31 09:53:53 +1000 |
| commit | f867c60def7a8dcd86657fd38a8920a4354f305e (patch) | |
| tree | 5dde8663e0af76bcb220ec3c3bf0c1111569e787 /drivers/gpu/drm/radeon/rv770.c | |
| parent | drm/radeon/kms/pm: fix segfault in clock code (diff) | |
| download | linux-dev-f867c60def7a8dcd86657fd38a8920a4354f305e.tar.xz linux-dev-f867c60def7a8dcd86657fd38a8920a4354f305e.zip | |
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/rv770.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2f917db49f23..86d39cb35fe2 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -648,10 +648,13 @@ static void rv770_gpu_init(struct radeon_device *rdev) WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); + WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); WREG32(CGTS_SYS_TCC_DISABLE, 0); WREG32(CGTS_TCC_DISABLE, 0); + WREG32(CGTS_USER_SYS_TCC_DISABLE, 0); + WREG32(CGTS_USER_TCC_DISABLE, 0); num_qd_pipes = R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); |