[kernel] r16986 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series
Maximilian Attems
maks at alioth.debian.org
Sat Mar 5 13:19:14 UTC 2011
Author: maks
Date: Sat Mar 5 13:19:06 2011
New Revision: 16986
Log:
Update to 2.6.32.28+drm33.13
add the missing patches.
Added:
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-add-dependency-on-config_tmpfs.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-lvds-add-aopen-i915gmm-hfs-to-the-list-of-false-positive-lvds.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-pll-debugging-output.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-quirk-for-mac-radeon-hd-2600-card.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-s-r-issues-with-bios-scratch-regs.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-make-the-mac-rv630-quirk-generic.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-remove-0x4243-pci-id.patch
Modified:
dists/squeeze/linux-2.6/debian/changelog
dists/squeeze/linux-2.6/debian/patches/series/31
Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog Sat Mar 5 13:03:40 2011 (r16985)
+++ dists/squeeze/linux-2.6/debian/changelog Sat Mar 5 13:19:06 2011 (r16986)
@@ -81,6 +81,14 @@
- sctp: Fix oops when sending queued ASCONF chunks (CVE-2010-1173).
- drm/ttm: Fix two race conditions + fix busy codepaths (closes: #591061)
* Add Slovak translation by Slavko. (closes: #608684)
+ * Add drm changes from 2.6.32.28+drm33.13:
+ - drm/i915: Add dependency on CONFIG_TMPFS.
+ - drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS.
+ - drm/radeon/kms: add pll debugging output.
+ - drm/radeon/kms: add quirk for Mac Radeon HD 2600 card.
+ - drm/radeon/kms: fix s/r issues with bios scratch regs.
+ - drm/radeon/kms: make the mac rv630 quirk generic.
+ - drm/radeon: remove 0x4243 pci id.
[ Aurelien Jarno ]
* init: fix race between init and kthreadd, fixes a kernel panic on
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-add-dependency-on-config_tmpfs.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-add-dependency-on-config_tmpfs.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,57 @@
+From f7ab9b407b3bc83161c2aa74c992ba4782e87c9c Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Thu, 20 Jan 2011 10:03:24 +0000
+Subject: drm/i915: Add dependency on CONFIG_TMPFS
+
+From: Chris Wilson <chris at chris-wilson.co.uk>
+
+commit f7ab9b407b3bc83161c2aa74c992ba4782e87c9c upstream.
+
+Without tmpfs, shmem_readpage() is not compiled in causing an OOPS as
+soon as we try to allocate some swappable pages for GEM.
+
+Jan 19 22:52:26 harlie kernel: Modules linked in: i915(+) drm_kms_helper cfbcopyarea video backlight cfbimgblt cfbfillrect
+Jan 19 22:52:26 harlie kernel:
+Jan 19 22:52:26 harlie kernel: Pid: 1125, comm: modprobe Not tainted 2.6.37Harlie #10 To be filled by O.E.M./To be filled by O.E.M.
+Jan 19 22:52:26 harlie kernel: EIP: 0060:[<00000000>] EFLAGS: 00010246 CPU: 3
+Jan 19 22:52:26 harlie kernel: EIP is at 0x0
+Jan 19 22:52:26 harlie kernel: EAX: 00000000 EBX: f7b7d000 ECX: f3383100 EDX: f7b7d000
+Jan 19 22:52:26 harlie kernel: ESI: f1456118 EDI: 00000000 EBP: f2303c98 ESP: f2303c7c
+Jan 19 22:52:26 harlie kernel: DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
+Jan 19 22:52:26 harlie kernel: Process modprobe (pid: 1125, ti=f2302000 task=f259cd80 task.ti=f2302000)
+Jan 19 22:52:26 harlie kernel: Stack:
+Jan 19 22:52:26 harlie udevd-work[1072]: '/sbin/modprobe -b pci:v00008086d00000046sv00000000sd00000000bc03sc00i00' unexpected exit with status 0x0009
+Jan 19 22:52:26 harlie kernel: c1074061 000000d0 f2f42b80 00000000 000a13d2 f2d5dcc0 00000001 f2303cac
+Jan 19 22:52:26 harlie kernel: c107416f 00000000 000a13d2 00000000 f2303cd4 f8d620ed f2cee620 00001000
+Jan 19 22:52:26 harlie kernel: 00000000 000a13d2 f1456118 f2d5dcc0 f1a40000 00001000 f2303d04 f8d637ab
+Jan 19 22:52:26 harlie kernel: Call Trace:
+Jan 19 22:52:26 harlie kernel: [<c1074061>] ? do_read_cache_page+0x71/0x160
+Jan 19 22:52:26 harlie kernel: [<c107416f>] ? read_cache_page_gfp+0x1f/0x30
+Jan 19 22:52:26 harlie kernel: [<f8d620ed>] ? i915_gem_object_get_pages+0xad/0x1d0 [i915]
+Jan 19 22:52:26 harlie kernel: [<f8d637ab>] ? i915_gem_object_bind_to_gtt+0xeb/0x2d0 [i915]
+Jan 19 22:52:26 harlie kernel: [<f8d65961>] ? i915_gem_object_pin+0x151/0x190 [i915]
+Jan 19 22:52:26 harlie kernel: [<c11e16ed>] ? drm_gem_object_init+0x3d/0x60
+Jan 19 22:52:26 harlie kernel: [<f8d65aa5>] ? i915_gem_init_ringbuffer+0x105/0x1e0 [i915]
+Jan 19 22:52:26 harlie kernel: [<f8d571b7>] ? i915_driver_load+0x667/0x1160 [i915]
+
+Reported-by: John J. Stimson-III <john at idsfa.net>
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/Kconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -94,7 +94,10 @@ config DRM_I830
+ config DRM_I915
+ tristate "i915 driver"
+ depends on AGP_INTEL
++ # we need shmfs for the swappable backing store, and in particular
++ # the shmem_readpage() which depends upon tmpfs
+ select SHMEM
++ select TMPFS
+ select DRM_KMS_HELPER
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-lvds-add-aopen-i915gmm-hfs-to-the-list-of-false-positive-lvds.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-i915-lvds-add-aopen-i915gmm-hfs-to-the-list-of-false-positive-lvds.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,34 @@
+From 22ab70d3262ddb6e69b3c246a34e2967ba5eb1e8 Mon Sep 17 00:00:00 2001
+From: Knut Petersen <knut_petersen at t-online.de>
+Date: Fri, 14 Jan 2011 15:38:10 +0000
+Subject: drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS
+
+From: Knut Petersen <knut_petersen at t-online.de>
+
+commit 22ab70d3262ddb6e69b3c246a34e2967ba5eb1e8 upstream.
+
+Signed-off-by: Knut Petersen <knut_petersen at t-online.de>
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -894,6 +894,14 @@ static const struct dmi_system_id intel_
+ },
+ {
+ .callback = intel_no_lvds_dmi_callback,
++ .ident = "AOpen i915GMm-HFS",
++ .matches = {
++ DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
++ DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
++ },
++ },
++ {
++ .callback = intel_no_lvds_dmi_callback,
+ .ident = "Aopen i945GTt-VFA",
+ .matches = {
+ DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"),
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-pll-debugging-output.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-pll-debugging-output.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,30 @@
+From 51d4bf840a27fe02c883ddc6d9708af056773769 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon, 31 Jan 2011 16:48:51 -0500
+Subject: drm/radeon/kms: add pll debugging output
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit 51d4bf840a27fe02c883ddc6d9708af056773769 upstream.
+
+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>
+
+---
+ drivers/gpu/drm/radeon/radeon_display.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -578,6 +578,10 @@ void radeon_compute_pll(struct radeon_pl
+ *frac_fb_div_p = best_frac_feedback_div;
+ *ref_div_p = best_ref_div;
+ *post_div_p = best_post_div;
++ DRM_DEBUG_KMS("%d %d, pll dividers - fb: %d.%d ref: %d, post %d\n",
++ freq, best_freq / 1000, best_feedback_div, best_frac_feedback_div,
++ best_ref_div, best_post_div);
++
+ }
+
+ void radeon_compute_pll_avivo(struct radeon_pll *pll,
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-quirk-for-mac-radeon-hd-2600-card.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-quirk-for-mac-radeon-hd-2600-card.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,41 @@
+From f598aa7593427ffe3a61e7767c34bd695a5e7ed0 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue, 4 Jan 2011 00:43:39 -0500
+Subject: drm/radeon/kms: add quirk for Mac Radeon HD 2600 card
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit f598aa7593427ffe3a61e7767c34bd695a5e7ed0 upstream.
+
+Reported-by: 屋国遥 <hyagni at gmail.com>
+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>
+
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/radeon_atombios.c
++++ b/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -259,6 +259,17 @@ static bool radeon_atom_apply_quirks(str
+ return false;
+ }
+
++ /* mac rv630 */
++ if ((dev->pdev->device == 0x9588) &&
++ (dev->pdev->subsystem_vendor == 0x106b) &&
++ (dev->pdev->subsystem_device == 0x00a6)) {
++ if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&
++ (*connector_type == DRM_MODE_CONNECTOR_DVII)) {
++ *connector_type = DRM_MODE_CONNECTOR_9PinDIN;
++ *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;
++ }
++ }
++
+ /* ASUS HD 3600 XT board lists the DVI port as HDMI */
+ if ((dev->pdev->device == 0x9598) &&
+ (dev->pdev->subsystem_vendor == 0x1043) &&
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-s-r-issues-with-bios-scratch-regs.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-s-r-issues-with-bios-scratch-regs.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,51 @@
+From 87364760de5d631390c478fcbac8db1b926e0adf Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed, 2 Feb 2011 19:46:06 -0500
+Subject: drm/radeon/kms: fix s/r issues with bios scratch regs
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+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 <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ 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
+@@ -1487,7 +1487,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);
+@@ -1538,10 +1538,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);
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-make-the-mac-rv630-quirk-generic.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-make-the-mac-rv630-quirk-generic.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,43 @@
+From be23da8ad219650517cbbb7acbeaeb235667113a Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue, 18 Jan 2011 18:26:11 +0000
+Subject: drm/radeon/kms: make the mac rv630 quirk generic
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit be23da8ad219650517cbbb7acbeaeb235667113a upstream.
+
+Seems some other boards do this as well.
+
+Reported-by: Andrea Merello <andrea.merello at gmail.com>
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_atombios.c
++++ b/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -259,15 +259,11 @@ static bool radeon_atom_apply_quirks(str
+ return false;
+ }
+
+- /* mac rv630 */
+- if ((dev->pdev->device == 0x9588) &&
+- (dev->pdev->subsystem_vendor == 0x106b) &&
+- (dev->pdev->subsystem_device == 0x00a6)) {
+- if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&
+- (*connector_type == DRM_MODE_CONNECTOR_DVII)) {
+- *connector_type = DRM_MODE_CONNECTOR_9PinDIN;
+- *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;
+- }
++ /* mac rv630, rv730, others */
++ if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&
++ (*connector_type == DRM_MODE_CONNECTOR_DVII)) {
++ *connector_type = DRM_MODE_CONNECTOR_9PinDIN;
++ *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;
+ }
+
+ /* ASUS HD 3600 XT board lists the DVI port as HDMI */
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-remove-0x4243-pci-id.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-radeon-remove-0x4243-pci-id.patch Sat Mar 5 13:19:06 2011 (r16986)
@@ -0,0 +1,32 @@
+From 63a507800c8aca5a1891d598ae13f829346e8e39 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue, 1 Feb 2011 19:06:46 -0500
+Subject: drm/radeon: remove 0x4243 pci id
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit 63a507800c8aca5a1891d598ae13f829346e8e39 upstream.
+
+0x4243 is a PCI bridge, not a GPU.
+
+Fixes:
+https://bugs.freedesktop.org/show_bug.cgi?id=33815
+
+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>
+
+---
+ include/drm/drm_pciids.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/include/drm/drm_pciids.h
++++ b/include/drm/drm_pciids.h
+@@ -28,7 +28,6 @@
+ {0x1002, 0x4156, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
+ {0x1002, 0x4237, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP}, \
+ {0x1002, 0x4242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
+- {0x1002, 0x4243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
+ {0x1002, 0x4336, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
+ {0x1002, 0x4337, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
+ {0x1002, 0x4437, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31 Sat Mar 5 13:03:40 2011 (r16985)
+++ dists/squeeze/linux-2.6/debian/patches/series/31 Sat Mar 5 13:19:06 2011 (r16986)
@@ -42,3 +42,10 @@
+ bugfix/all/stable/2.6.32.31.patch
+ bugfix/all/stable/2.6.32.32-rc1.patch
+ debian/drm-Avoid-ABI-change-from-fix-for-CVE-2011-1013.patch
++ bugfix/all/drm-i915-add-dependency-on-config_tmpfs.patch
++ bugfix/all/drm-i915-lvds-add-aopen-i915gmm-hfs-to-the-list-of-false-positive-lvds.patch
++ bugfix/all/drm-radeon-kms-add-pll-debugging-output.patch
++ bugfix/all/drm-radeon-kms-add-quirk-for-mac-radeon-hd-2600-card.patch
++ bugfix/all/drm-radeon-kms-fix-s-r-issues-with-bios-scratch-regs.patch
++ bugfix/all/drm-radeon-kms-make-the-mac-rv630-quirk-generic.patch
++ bugfix/all/drm-radeon-remove-0x4243-pci-id.patch
More information about the Kernel-svn-changes
mailing list