diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2013-09-18 15:39:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 07:17:57 -0700 |
| commit | 5b1f6871463a38198bf157bf386cc73f7586af4c (patch) | |
| tree | a4fcc100939c86d9bfdb346f00b24874d02ecec8 | |
| parent | f503f67311be922baef9af505c967acebdc2a13e (diff) | |
drm/radeon/cik: Fix encoding of number of banks in tiling configuration info
commit a537314e0b539e22934d3cffeb0b1f476e56491c upstream.
There are multiple valid values, not just 0 or 1. Required
to properly support 2D tiling in the userspace drivers.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 0712c0366bdf..91adeb8c1507 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -2008,10 +2008,8 @@ static void cik_gpu_init(struct radeon_device *rdev) rdev->config.cik.tile_config |= (3 << 0); break; } - if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) - rdev->config.cik.tile_config |= 1 << 4; - else - rdev->config.cik.tile_config |= 0 << 4; + rdev->config.cik.tile_config |= + ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; rdev->config.cik.tile_config |= ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; rdev->config.cik.tile_config |= |