[kernel] r13847 - in dists/trunk/linux-2.6/debian: . patches/bugfix/mips patches/debian patches/debian/dfsg patches/features/all patches/features/arm patches/series
Bastian Blank
waldi at alioth.debian.org
Sun Jun 28 12:27:39 UTC 2009
Author: waldi
Date: Sun Jun 28 12:27:36 2009
New Revision: 13847
Log:
* debian/changelog: Set version to 2.6.31~rc1-1~experimental.1.
* debian/patches: Remove merged patches, fix or disable others.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-ndelay-build-error.patch
dists/trunk/linux-2.6/debian/patches/features/all/bnx2x-Separated-FW-from-the-source.patch
dists/trunk/linux-2.6/debian/patches/features/all/bnx2x-driver-version-1.48.105-1.patch
dists/trunk/linux-2.6/debian/patches/features/arm/allow-alternative-copy-user.patch
dists/trunk/linux-2.6/debian/patches/features/arm/copy_to_user-better_threshold.patch
dists/trunk/linux-2.6/debian/patches/features/arm/lower_overhead_with_alternative.patch
dists/trunk/linux-2.6/debian/patches/features/arm/nand-setup.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-radeon-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/changelog Sun Jun 28 12:27:36 2009 (r13847)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.30-1~experimental.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.31~rc1-1~experimental.1) UNRELEASED; urgency=low
[ maximilian attems ]
* [powerpc64] Enable modular RTC_DRV_PS3, PS3_VRAM.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-gpu-drm-radeon-disable.patch Sun Jun 28 12:27:36 2009 (r13847)
@@ -1,24 +1,8 @@
-From ddea6e0d2957bd506f49d87b0ec097458fd0eb2a Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Wed, 15 Oct 2008 01:21:34 +0100
-Subject: [PATCH 04/24] radeon: Mark as broken
-
----
- drivers/gpu/drm/Kconfig | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
-index e6f4401..a93d249 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
-@@ -35,6 +35,7 @@ config DRM_R128
+@@ -35,4 +35,5 @@
config DRM_RADEON
tristate "ATI Radeon"
- depends on DRM && PCI
+ depends on BROKEN
- help
- Choose this option if you have an ATI Radeon graphics card. There
- are both PCI and AGP versions. You don't need to choose this to
---
-1.6.1.3
-
+ depends on DRM && PCI
+ select FB_CFB_FILLRECT
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Sun Jun 28 12:27:36 2009 (r13847)
@@ -2,7 +2,7 @@
index 25200d1..c3a4fa8 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,93 +20,10 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,96 +20,10 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
# accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
# But be aware that the config file might not be included at all.
@@ -18,6 +18,7 @@
- adaptec/starfire_tx.bin
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
+-fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-4.8.53.0.fw bnx2x-e1h-4.8.53.0.fw
-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-4.6.17.fw \
- bnx2/bnx2-rv2p-09-4.6.15.fw \
- bnx2/bnx2-mips-06-4.6.16.fw \
@@ -26,13 +27,15 @@
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
-fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
- cxgb3/t3c_psram-1.1.0.bin \
-- cxgb3/t3fw-7.1.0.bin
+- cxgb3/t3fw-7.4.0.bin
-fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
-fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
-fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
- e100/d102e_ucode.bin
-fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis
+-fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
+-fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
-fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
-fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
- advansys/3550.bin advansys/38C0800.bin
Modified: dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch Sun Jun 28 12:27:36 2009 (r13847)
@@ -48,6 +48,6 @@
- /* ICH8 Mobile PATA Controller */
- { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
-
- /* NOTE: The following PCI ids must be kept in sync with the
- * list in drivers/pci/quirks.c.
- */
+ /* SATA ports */
+
+ /* 82801EB (ICH5) */
Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Sun Jun 28 12:27:36 2009 (r13847)
@@ -39,8 +39,8 @@
# SHELL used by kbuild
@@ -339,6 +315,36 @@ LDFLAGS_MODULE =
- CFLAGS_KERNEL =
AFLAGS_KERNEL =
+ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
+-include $(obj)/.kernelvariables
+
Modified: dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-radeon-request_firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-radeon-request_firmware.patch Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-radeon-request_firmware.patch Sun Jun 28 12:27:36 2009 (r13847)
@@ -15,15 +15,14 @@
index b0414ee..fb97c8a 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
-@@ -37,7 +37,7 @@ config DRM_R128
+@@ -37,6 +37,6 @@ config DRM_R128
config DRM_RADEON
tristate "ATI Radeon"
- depends on DRM && PCI
- depends on BROKEN
+ depends on DRM && PCI
+ select FW_LOADER
- help
- Choose this option if you have an ATI Radeon graphics card. There
- are both PCI and AGP versions. You don't need to choose this to
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index bc9d09d..4620b1b 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
@@ -262,7 +261,7 @@
r600_do_cp_stop(dev_priv);
RADEON_WRITE(R600_CP_RB_CNTL,
-@@ -475,47 +454,18 @@ static void r700_cp_load_microcode(drm_radeon_private_t *dev_priv)
+@@ -475,48 +454,18 @@ static void r700_cp_load_microcode(drm_radeon_private_t *dev_priv)
DRM_UDELAY(15000);
RADEON_WRITE(R600_GRBM_SOFT_RESET, 0);
@@ -274,26 +273,27 @@
- if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV770)) {
- RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-- DRM_INFO("Loading RV770 PFP Microcode\n");
+- DRM_INFO("Loading RV770/RV790 PFP Microcode\n");
- for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
- RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV770_pfp_microcode[i]);
- RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-
- RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-- DRM_INFO("Loading RV770 CP Microcode\n");
+- DRM_INFO("Loading RV770/RV790 CP Microcode\n");
- for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
- RADEON_WRITE(R600_CP_ME_RAM_DATA, RV770_cp_microcode[i]);
- RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-
-- } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV730)) {
+- } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV730) ||
+- ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV740)) {
- RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-- DRM_INFO("Loading RV730 PFP Microcode\n");
+- DRM_INFO("Loading RV730/RV740 PFP Microcode\n");
- for (i = 0; i < R700_PFP_UCODE_SIZE; i++)
- RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV730_pfp_microcode[i]);
- RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-
- RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
-- DRM_INFO("Loading RV730 CP Microcode\n");
+- DRM_INFO("Loading RV730/RV740 CP Microcode\n");
- for (i = 0; i < R700_PM4_UCODE_SIZE; i++)
- RADEON_WRITE(R600_CP_ME_RAM_DATA, RV730_cp_microcode[i]);
- RADEON_WRITE(R600_CP_ME_RAM_WADDR, 0);
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Sun Jun 28 09:49:43 2009 (r13846)
+++ dists/trunk/linux-2.6/debian/patches/series/base Sun Jun 28 12:27:36 2009 (r13847)
@@ -11,8 +11,8 @@
+ features/all/drivers-gpu-drm-radeon-request_firmware.patch
# rt2860sta and rt2870sta need ITU-T CRC on bit-reversed data
+ features/all/lib-crcitut-bit-reversed.patch
-+ features/all/drivers-staging-rt2860sta-request_firmware.patch
-+ features/all/drivers-staging-rt2870sta-request_firmware.patch
+#+ features/all/drivers-staging-rt2860sta-request_firmware.patch
+#+ features/all/drivers-staging-rt2870sta-request_firmware.patch
+ features/all/export-unionfs-symbols.patch
+ bugfix/sparc/drivers_net-broken.patch
@@ -25,16 +25,4 @@
+ bugfix/powerpc/lpar-console.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
#+ features/sparc/video-sunxvr500-intergraph.patch
-+ features/arm/allow-alternative-copy-user.patch
-+ features/arm/alternative-copy-user.patch
-+ features/arm/lower_overhead_with_alternative.patch
-+ features/arm/copy_to_user-better_threshold.patch
-+ features/arm/nand-setup.patch
-+ features/arm/clock_gating.patch
-+ features/arm/kirkwood-cpu-idle.patch
+ bugfix/sparc/arch-zimage-target.patch
-+ features/all/bnx2x-Separated-FW-from-the-source.patch
-+ features/all/bnx2x-driver-version-1.48.105-1.patch
-- debian/dfsg/drivers-net-bnx2x-disable.patch
-+ bugfix/mips/fix-ndelay-build-error.patch
-+ bugfix/all/0001-xfs-fix-freeing-memory-in-xfs_getbmap.patch
More information about the Kernel-svn-changes
mailing list