* debian/changelog: Set version to 2.6.31~rc6-1~experimental.1.
* debian/patches/features/all/drivers-gpu-drm-radeon-request_firmware.patch: Update. * debian/patches/series/base: Remove merged patch. svn path=/dists/trunk/linux-2.6/; revision=14115
This commit is contained in:
parent
2a022b3670
commit
bc52b06655
|
@ -1,4 +1,4 @@
|
|||
linux-2.6 (2.6.31~rc5-1~experimental.1) UNRELEASED; urgency=low
|
||||
linux-2.6 (2.6.31~rc6-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
- support for W83627DHG-P (closes: #535646).
|
||||
|
|
|
@ -122,7 +122,7 @@ index bc9d09d..4620b1b 100644
|
|||
r600_do_cp_stop(dev_priv);
|
||||
|
||||
RADEON_WRITE(R600_CP_RB_CNTL,
|
||||
@@ -292,114 +364,18 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
|
||||
@@ -292,115 +364,18 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
|
||||
DRM_UDELAY(15000);
|
||||
RADEON_WRITE(R600_GRBM_SOFT_RESET, 0);
|
||||
|
||||
|
@ -223,8 +223,9 @@ index bc9d09d..4620b1b 100644
|
|||
- DRM_INFO("Loading RV670 PFP Microcode\n");
|
||||
- for (i = 0; i < PFP_UCODE_SIZE; i++)
|
||||
- RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]);
|
||||
- } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
|
||||
- DRM_INFO("Loading RS780 CP Microcode\n");
|
||||
- } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
|
||||
- ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
|
||||
- DRM_INFO("Loading RS780/RS880 CP Microcode\n");
|
||||
- for (i = 0; i < PM4_UCODE_SIZE; i++) {
|
||||
- RADEON_WRITE(R600_CP_ME_RAM_DATA,
|
||||
- RS780_cp_microcode[i][0]);
|
||||
|
@ -239,7 +240,7 @@ index bc9d09d..4620b1b 100644
|
|||
+ be32_to_cpup(fw_data++));
|
||||
|
||||
- RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
|
||||
- DRM_INFO("Loading RS780 PFP Microcode\n");
|
||||
- DRM_INFO("Loading RS780/RS880 PFP Microcode\n");
|
||||
- for (i = 0; i < PFP_UCODE_SIZE; i++)
|
||||
- RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]);
|
||||
- }
|
||||
|
|
|
@ -29,4 +29,3 @@
|
|||
### stuff that will hopefully be fixed in the next rc
|
||||
#+ bugfix/arm/export-flush_dcache_page.patch
|
||||
+ bugfix/all/add-missing-mtd-include.patch
|
||||
+ bugfix/mips/fix-smp.patch
|
||||
|
|
Loading…
Reference in New Issue