[kernel] r16732 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series
Maximilian Attems
maks at alioth.debian.org
Wed Dec 22 07:57:48 UTC 2010
Author: maks
Date: Wed Dec 22 07:57:43 2010
New Revision: 16732
Log:
drm/radeon/kms: fix typos in disabled vbios code
2.6.35 stable patch
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/30
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Wed Dec 22 04:38:11 2010 (r16731)
+++ dists/sid/linux-2.6/debian/changelog Wed Dec 22 07:57:43 2010 (r16732)
@@ -24,6 +24,7 @@
* drm/i915: Free hardware status page on unload when physically mapped.
* drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
* drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode().
+ * drm/radeon/kms: fix typos in disabled vbios code.
* drm/radeon/kms: add workaround for dce3 ddc line vbios bug.
* drm/radeon/kms: fix interlaced and doublescan handling.
* drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable.
Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch Wed Dec 22 07:57:43 2010 (r16732)
@@ -0,0 +1,92 @@
+From 9fd4dc9d82bd6f261f4cb8de6d21cc7e49afda1d Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue, 30 Nov 2010 19:11:45 -0500
+Subject: [PATCH] drm/radeon/kms: fix typos in disabled vbios code
+
+commit 0ec80d645661dda50acd417bdfcb33df2e5dd31e upstream.
+
+6xx/7xx was hitting the wrong BUS_CNTL reg and bits.
+
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+Signed-off-by: maximilian attems <max at stro.at>
+---
+ drivers/gpu/drm/radeon/r600_reg.h | 1 +
+ drivers/gpu/drm/radeon/radeon_bios.c | 12 ++++++------
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/r600_reg.h b/drivers/gpu/drm/radeon/r600_reg.h
+index d0e28ff..fb3dfef 100644
+--- a/drivers/gpu/drm/radeon/r600_reg.h
++++ b/drivers/gpu/drm/radeon/r600_reg.h
+@@ -86,6 +86,7 @@
+ #define R600_HDP_NONSURFACE_BASE 0x2c04
+
+ #define R600_BUS_CNTL 0x5420
++# define R600_BIOS_ROM_DIS (1 << 1)
+ #define R600_CONFIG_CNTL 0x5424
+ #define R600_CONFIG_MEMSIZE 0x5428
+ #define R600_CONFIG_F0_BASE 0x542C
+diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
+index 9069217..cd734bd 100644
+--- a/drivers/gpu/drm/radeon/radeon_bios.c
++++ b/drivers/gpu/drm/radeon/radeon_bios.c
+@@ -106,7 +106,7 @@ static bool r700_read_disabled_bios(struct radeon_device *rdev)
+ bool r;
+
+ viph_control = RREG32(RADEON_VIPH_CONTROL);
+- bus_cntl = RREG32(RADEON_BUS_CNTL);
++ bus_cntl = RREG32(R600_BUS_CNTL);
+ d1vga_control = RREG32(AVIVO_D1VGA_CONTROL);
+ d2vga_control = RREG32(AVIVO_D2VGA_CONTROL);
+ vga_render_control = RREG32(AVIVO_VGA_RENDER_CONTROL);
+@@ -115,7 +115,7 @@ static bool r700_read_disabled_bios(struct radeon_device *rdev)
+ /* disable VIP */
+ WREG32(RADEON_VIPH_CONTROL, (viph_control & ~RADEON_VIPH_EN));
+ /* enable the rom */
+- WREG32(RADEON_BUS_CNTL, (bus_cntl & ~RADEON_BUS_BIOS_DIS_ROM));
++ WREG32(R600_BUS_CNTL, (bus_cntl & ~R600_BIOS_ROM_DIS));
+ /* Disable VGA mode */
+ WREG32(AVIVO_D1VGA_CONTROL,
+ (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
+@@ -154,7 +154,7 @@ static bool r700_read_disabled_bios(struct radeon_device *rdev)
+ cg_spll_status = RREG32(R600_CG_SPLL_STATUS);
+ }
+ WREG32(RADEON_VIPH_CONTROL, viph_control);
+- WREG32(RADEON_BUS_CNTL, bus_cntl);
++ WREG32(R600_BUS_CNTL, bus_cntl);
+ WREG32(AVIVO_D1VGA_CONTROL, d1vga_control);
+ WREG32(AVIVO_D2VGA_CONTROL, d2vga_control);
+ WREG32(AVIVO_VGA_RENDER_CONTROL, vga_render_control);
+@@ -179,7 +179,7 @@ static bool r600_read_disabled_bios(struct radeon_device *rdev)
+ bool r;
+
+ viph_control = RREG32(RADEON_VIPH_CONTROL);
+- bus_cntl = RREG32(RADEON_BUS_CNTL);
++ bus_cntl = RREG32(R600_BUS_CNTL);
+ d1vga_control = RREG32(AVIVO_D1VGA_CONTROL);
+ d2vga_control = RREG32(AVIVO_D2VGA_CONTROL);
+ vga_render_control = RREG32(AVIVO_VGA_RENDER_CONTROL);
+@@ -194,7 +194,7 @@ static bool r600_read_disabled_bios(struct radeon_device *rdev)
+ /* disable VIP */
+ WREG32(RADEON_VIPH_CONTROL, (viph_control & ~RADEON_VIPH_EN));
+ /* enable the rom */
+- WREG32(RADEON_BUS_CNTL, (bus_cntl & ~RADEON_BUS_BIOS_DIS_ROM));
++ WREG32(R600_BUS_CNTL, (bus_cntl & ~R600_BIOS_ROM_DIS));
+ /* Disable VGA mode */
+ WREG32(AVIVO_D1VGA_CONTROL,
+ (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
+@@ -225,7 +225,7 @@ static bool r600_read_disabled_bios(struct radeon_device *rdev)
+
+ /* restore regs */
+ WREG32(RADEON_VIPH_CONTROL, viph_control);
+- WREG32(RADEON_BUS_CNTL, bus_cntl);
++ WREG32(R600_BUS_CNTL, bus_cntl);
+ WREG32(AVIVO_D1VGA_CONTROL, d1vga_control);
+ WREG32(AVIVO_D2VGA_CONTROL, d2vga_control);
+ WREG32(AVIVO_VGA_RENDER_CONTROL, vga_render_control);
+--
+1.7.2.3
+
Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30 Wed Dec 22 04:38:11 2010 (r16731)
+++ dists/sid/linux-2.6/debian/patches/series/30 Wed Dec 22 07:57:43 2010 (r16732)
@@ -11,6 +11,7 @@
+ bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch
+ bugfix/all/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch
+ bugfix/all/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
++ bugfix/all/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch
+ bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
+ bugfix/all/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
+ bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
More information about the Kernel-svn-changes
mailing list