This is a note to let you know that I've just added the patch titled
drm/radeon/kms: fix s/r issues with bios scratch regs
to the 2.6.37-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-kms-fix-s-r-issues-with-bios-scratch-regs.patch
and it can be found in the queue-2.6.37 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 87364760de5d631390c478fcbac8db1b926e0adf Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 2 Feb 2011 19:46:06 -0500
Subject: drm/radeon/kms: fix s/r issues with bios scratch regs
From: Alex Deucher <[email protected]>
commit 87364760de5d631390c478fcbac8db1b926e0adf upstream.
The accelerate mode bit gets checked by certain atom
command tables to set up some register state. It needs
to be clear when setting modes and set when not.
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=26942
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/radeon_atombios.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -2357,7 +2357,7 @@ void radeon_atom_initialize_bios_scratch
bios_2_scratch &= ~ATOM_S2_VRI_BRIGHT_ENABLE;
/* tell the bios not to handle mode switching */
- bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH | ATOM_S6_ACC_MODE);
+ bios_6_scratch |= ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH;
if (rdev->family >= CHIP_R600) {
WREG32(R600_BIOS_2_SCRATCH, bios_2_scratch);
@@ -2408,10 +2408,13 @@ void radeon_atom_output_lock(struct drm_
else
bios_6_scratch = RREG32(RADEON_BIOS_6_SCRATCH);
- if (lock)
+ if (lock) {
bios_6_scratch |= ATOM_S6_CRITICAL_STATE;
- else
+ bios_6_scratch &= ~ATOM_S6_ACC_MODE;
+ } else {
bios_6_scratch &= ~ATOM_S6_CRITICAL_STATE;
+ bios_6_scratch |= ATOM_S6_ACC_MODE;
+ }
if (rdev->family >= CHIP_R600)
WREG32(R600_BIOS_6_SCRATCH, bios_6_scratch);
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.37/drm-radeon-kms-fix-s-r-issues-with-bios-scratch-regs.patch
queue-2.6.37/drm-radeon-remove-0x4243-pci-id.patch
queue-2.6.37/drm-radeon-kms-switch-back-to-min-max-pll-post-divider-iteration.patch
queue-2.6.37/drm-radeon-kms-add-new-pll-algo-for-avivo-asics.patch
queue-2.6.37/drm-radeon-kms-add-pll-debugging-output.patch
queue-2.6.37/drm-radeon-kms-enable-new-pll-calculation-for-avivo-asics.patch
queue-2.6.37/drm-radeon-kms-evergreen-always-set-certain-vgt-regs-at-cp-init.patch
queue-2.6.37/drm-radeon-kms-adjust-quirk-for-acer-laptop.patch
queue-2.6.37/drm-radeon-kms-make-the-mac-rv630-quirk-generic.patch
queue-2.6.37/drm-radeon-kms-re-emit-full-context-state-for-evergreen-blits.patch
queue-2.6.37/drm-radeon-kms-add-quirk-for-mac-radeon-hd-2600-card.patch
queue-2.6.37/radeon-kms-fix-dp-displayport-mode-validation.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
