diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-10-18 23:54:56 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-26 14:47:54 +1000 |
| commit | 881fe6c1d06bf49f4ab7aef212cdaf66bd059614 (patch) | |
| tree | 53b482c43c60ba9301e312f27d05631f0780fd4c /drivers/gpu/drm/radeon/r600.c | |
| parent | 354da653233898ed1e51f20cebac9705456bf9b1 (diff) | |
| download | op-kernel-dev-881fe6c1d06bf49f4ab7aef212cdaf66bd059614.zip op-kernel-dev-881fe6c1d06bf49f4ab7aef212cdaf66bd059614.tar.gz | |
drm/radeon/kms: properly compute group_size on 6xx/7xx
Needed for tiled surfaces.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 83ba964..33952a1 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1608,8 +1608,11 @@ void r600_gpu_init(struct radeon_device *rdev) rdev->config.r600.tiling_npipes = rdev->config.r600.max_tile_pipes; rdev->config.r600.tiling_nbanks = 4 << ((ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT); tiling_config |= BANK_TILING((ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT); - tiling_config |= GROUP_SIZE(0); - rdev->config.r600.tiling_group_size = 256; + tiling_config |= GROUP_SIZE((ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT); + if ((ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT) + rdev->config.r600.tiling_group_size = 512; + else + rdev->config.r600.tiling_group_size = 256; tmp = (ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT; if (tmp > 3) { tiling_config |= ROW_TILING(3); |
