This is a note to let you know that I've just added the patch titled

    drm/radeon: fix backend map setup on 1 RB sumo boards

to the 3.7-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-fix-backend-map-setup-on-1-rb-sumo-boards.patch
and it can be found in the queue-3.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From f7eb97300832f4fe5fe916c5d84cd2e25169330e Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 30 Jan 2013 13:57:40 -0500
Subject: drm/radeon: fix backend map setup on 1 RB sumo boards

From: Alex Deucher <[email protected]>

commit f7eb97300832f4fe5fe916c5d84cd2e25169330e upstream.

Need to adjust the backend map depending on which
RB is enabled.

Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=892233

Reported-by: Mikko Tiihonen <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpu/drm/radeon/evergreen.c |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2045,9 +2045,20 @@ static void evergreen_gpu_init(struct ra
        WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
        WREG32(HDP_ADDR_CONFIG, gb_addr_config);
 
-       tmp = gb_addr_config & NUM_PIPES_MASK;
-       tmp = r6xx_remap_render_backend(rdev, tmp, 
rdev->config.evergreen.max_backends,
-                                       EVERGREEN_MAX_BACKENDS, 
disabled_rb_mask);
+       if ((rdev->config.evergreen.max_backends == 1) &&
+           (rdev->flags & RADEON_IS_IGP)) {
+               if ((disabled_rb_mask & 3) == 1) {
+                       /* RB0 disabled, RB1 enabled */
+                       tmp = 0x11111111;
+               } else {
+                       /* RB1 disabled, RB0 enabled */
+                       tmp = 0x00000000;
+               }
+       } else {
+               tmp = gb_addr_config & NUM_PIPES_MASK;
+               tmp = r6xx_remap_render_backend(rdev, tmp, 
rdev->config.evergreen.max_backends,
+                                               EVERGREEN_MAX_BACKENDS, 
disabled_rb_mask);
+       }
        WREG32(GB_BACKEND_MAP, tmp);
 
        WREG32(CGTS_SYS_TCC_DISABLE, 0);


Patches currently in stable-queue which might be from [email protected] 
are

queue-3.7/drm-radeon-fix-backend-map-setup-on-1-rb-sumo-boards.patch
queue-3.7/drm-radeon-protect-against-div-by-0-in-backend-setup.patch
queue-3.7/drm-radeon-fix-mc-blackout-on-evergreen.patch
queue-3.7/drm-radeon-add-quirk-for-rv100-board.patch
queue-3.7/drm-radeon-calling-object_unrefer-when-creating-fb-failure.patch
queue-3.7/drm-radeon-evergreen-wait-for-the-mc-to-settle-after-mc-blackout.patch
queue-3.7/drm-radeon-prevent-crash-in-the-ring-space-allocation.patch
queue-3.7/drm-radeon-add-wait_until-to-the-non-vm-safe-regs-list-for-cayman-tn.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to