diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2013-09-18 09:39:41 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-09-20 17:32:58 -0400 |
| commit | a537314e0b539e22934d3cffeb0b1f476e56491c (patch) | |
| tree | c344b6d4416d0a891d2f0defa5a6c33dde93956f /drivers | |
| parent | 328a50c7b09d313ab9278f972950da414d348eb1 (diff) | |
drm/radeon/cik: Fix encoding of number of banks in tiling configuration info
There are multiple valid values, not just 0 or 1. Required
to properly support 2D tiling in the userspace drivers.
Cc: stable@vger.kernel.org
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
| -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 c0714d72610b..5e6802d8a59a 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c | |||
| @@ -2845,10 +2845,8 @@ static void cik_gpu_init(struct radeon_device *rdev) | |||
| 2845 | rdev->config.cik.tile_config |= (3 << 0); | 2845 | rdev->config.cik.tile_config |= (3 << 0); |
| 2846 | break; | 2846 | break; |
| 2847 | } | 2847 | } |
| 2848 | if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) | 2848 | rdev->config.cik.tile_config |= |
| 2849 | rdev->config.cik.tile_config |= 1 << 4; | 2849 | ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; |
| 2850 | else | ||
| 2851 | rdev->config.cik.tile_config |= 0 << 4; | ||
| 2852 | rdev->config.cik.tile_config |= | 2850 | rdev->config.cik.tile_config |= |
| 2853 | ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; | 2851 | ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; |
| 2854 | rdev->config.cik.tile_config |= | 2852 | rdev->config.cik.tile_config |= |