On Tue, Jul 31, 2012 at 7:48 AM, Christian König deathsimple@vodafone.de wrote:
The sixteen bank case wasn't handled here, leading to GPU crashes because of userspace miscalculation.
You mean a GPU hang or a segfault in userspace? IIRC, from the hw perspective numbers of banks over 8 are considered 8 for tiling.
Alex
Signed-off-by: Christian König deathsimple@vodafone.de Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/si.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 0b02792..0182fc8 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -1639,11 +1639,19 @@ static void si_gpu_init(struct radeon_device *rdev) /* XXX what about 12? */ rdev->config.si.tile_config |= (3 << 0); break;
}if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT)rdev->config.si.tile_config |= 1 << 4;else
}switch ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) {case 0: /* four banks */ rdev->config.si.tile_config |= 0 << 4;break;case 1: /* eight banks */rdev->config.si.tile_config |= 1 << 4;break;case 2: /* sixteen banks */default:rdev->config.si.tile_config |= 2 << 4;break;} rdev->config.si.tile_config |= ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; rdev->config.si.tile_config |=-- 1.7.9.5
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel