diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-29 12:00:13 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-29 12:00:13 -0700 |
commit | 3e1ba189fe798c045318fa62224244233bdb081b (patch) | |
tree | 8ffce2de2dbd1243b108ef25f7abd940a4110682 | |
parent | e3d39eb9b986efb8763fb10e54e5cb95a5d6c8af (diff) | |
download | stable-queue-3e1ba189fe798c045318fa62224244233bdb081b.tar.gz |
remove 2 patches as they shouldn't be there just yet
-rw-r--r-- | queue-3.0/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch | 36 | ||||
-rw-r--r-- | queue-3.0/series | 3 | ||||
-rw-r--r-- | queue-3.0/sfi-table-irq-0xff-means-no-interrupt.patch | 39 |
3 files changed, 1 insertions, 77 deletions
diff --git a/queue-3.0/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch b/queue-3.0/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch deleted file mode 100644 index 37dbf80356..0000000000 --- a/queue-3.0/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 18b4fada275dd2b6dd9db904ddf70fe39e272222 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 16 Sep 2011 12:04:07 -0400 -Subject: drm/radeon/kms: fix typo in r100_blit_copy -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Alex Deucher <alexander.deucher@amd.com> - -commit 18b4fada275dd2b6dd9db904ddf70fe39e272222 upstream. - -cur_pages is the number of pages per loop iteration. - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> -Signed-off-by: Dave Airlie <airlied@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/gpu/drm/radeon/r100.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/radeon/r100.c -+++ b/drivers/gpu/drm/radeon/r100.c -@@ -773,8 +773,8 @@ int r100_copy_blit(struct radeon_device - radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16)); - radeon_ring_write(rdev, 0); - radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16)); -- radeon_ring_write(rdev, num_pages); -- radeon_ring_write(rdev, num_pages); -+ radeon_ring_write(rdev, cur_pages); -+ radeon_ring_write(rdev, cur_pages); - radeon_ring_write(rdev, cur_pages | (stride_pixels << 16)); - } - radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0)); diff --git a/queue-3.0/series b/queue-3.0/series index aadf6f9d24..482e47418a 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -1,7 +1,6 @@ kernel-printk-do-not-turn-off-bootconsole-in-printk_late_init-if-keep_bootcon.patch rapidio-fix-use-of-non-compatible-registers.patch arch-powerpc-sysdev-fsl_rio.c-correct-iecsr-register-clear.patch -sfi-table-irq-0xff-means-no-interrupt.patch asoc-soc-jack-fix-checking-return-value-of-request_any_context_irq.patch asoc-ad193x-fix-registers-definition.patch asoc-ad193x-fix-dac-word-len-setting.patch @@ -131,7 +130,6 @@ ibmveth-fix-dma-unmap-error.patch ibmveth-fix-issue-with-dma-mapping-failure.patch ibmveth-checksum-offload-is-always-disabled.patch firewire-ohci-add-no-msi-quirk-for-o2micro-controller.patch -drm-radeon-kms-fix-typo-in-r100_blit_copy.patch drm-radeon-kms-make-gpu-cpu-page-size-handling-consistent-in-blit-code-v2.patch usb-xhci-set-change-bit-when-warm-reset-change-is-set.patch iwlagn-fix-command-queue-timeout.patch @@ -242,3 +240,4 @@ iwlagn-fix-dangling-scan-request.patch bnx2x-fix-hw-attention-handling.patch bnx2x-add-missing-break-in-bnx2x_dcbnl_get_cap.patch block-free-queue-resources-at-blk_release_queue.patch +alsa-hda-add-support-for-idt-92hd93.patch diff --git a/queue-3.0/sfi-table-irq-0xff-means-no-interrupt.patch b/queue-3.0/sfi-table-irq-0xff-means-no-interrupt.patch deleted file mode 100644 index f7fd36ff60..0000000000 --- a/queue-3.0/sfi-table-irq-0xff-means-no-interrupt.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a94cc4e6c0a26a7c8f79a432ab2c89534aa674d5 Mon Sep 17 00:00:00 2001 -From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> -Date: Fri, 26 Aug 2011 12:20:59 +0100 -Subject: sfi: table irq 0xFF means 'no interrupt' - -From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - -commit a94cc4e6c0a26a7c8f79a432ab2c89534aa674d5 upstream. - -According to the SFI specification irq number 0xFF means device has no -interrupt or interrupt attached via GPIO. - -Currently, we don't handle this special case and set irq field in -*_board_info structs to 255. It leads to confusion in some drivers. -Accelerometer driver tries to register interrupt 255, fails and prints -"Cannot get IRQ" to dmesg. - -Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> -Signed-off-by: Alan Cox <alan@linux.intel.com> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - arch/x86/platform/mrst/mrst.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/arch/x86/platform/mrst/mrst.c -+++ b/arch/x86/platform/mrst/mrst.c -@@ -689,7 +689,9 @@ static int __init sfi_parse_devs(struct - irq_attr.trigger = 1; - irq_attr.polarity = 1; - io_apic_set_pci_routing(NULL, pentry->irq, &irq_attr); -- } -+ } else -+ pentry->irq = 0; /* No irq */ -+ - switch (pentry->type) { - case SFI_DEV_TYPE_IPC: - /* ID as IRQ is a hack that will go away */ |