This is a note to let you know that I've just added the patch titled
drm/radeon/cik: Fix encoding of number of banks in tiling configuration info
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-cik-fix-encoding-of-number-of-banks-in-tiling-configuration-info.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a537314e0b539e22934d3cffeb0b1f476e56491c Mon Sep 17 00:00:00 2001
From: Michel Dänzer <michel.daenzer@xxxxxxx>
Date: Wed, 18 Sep 2013 15:39:41 +0200
Subject: drm/radeon/cik: Fix encoding of number of banks in tiling configuration info
From: Michel Dänzer <michel.daenzer@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/cik.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- 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_d
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 |=
Patches currently in stable-queue which might be from michel.daenzer@xxxxxxx are
queue-3.11/drm-radeon-cik-fix-printing-of-client-name-on-vm-protection-fault.patch
queue-3.11/drm-radeon-cik-fix-encoding-of-number-of-banks-in-tiling-configuration-info.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html