rpms/kernel/F-11 drm-radeon-reorder-bm.patch, NONE, 1.1 kernel.spec, 1.1498, 1.1499

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21375

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-reorder-bm.patch 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
- drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards


drm-radeon-reorder-bm.patch:

--- NEW FILE drm-radeon-reorder-bm.patch ---
>From 79a5ca0c53c2a149f51f71352a6bbf73bcdc40df Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 1 Apr 2009 22:34:53 +1000
Subject: [PATCH] radeon: reorder bm enable vs mode set

---
 drivers/gpu/drm/radeon/radeon_pm.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index ac7bc0a..0d2f4a5 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -111,8 +111,6 @@ int radeon_resume(struct drm_device *dev)
 	if (pci_enable_device(dev->pdev))
 		return -1;
 
-	/* Turn on bus mastering -todo fix properly */
-	radeon_enable_bm(dev_priv);
 
 	DRM_ERROR("\n");
 	/* on atom cards re init the whole card 
@@ -125,7 +123,6 @@ int radeon_resume(struct drm_device *dev)
 		radeon_combios_asic_init(dev);
 	}
 
-	pci_set_master(dev->pdev);
 
 	for (i = 0; i < 8; i++)
 		RADEON_WRITE(RADEON_BIOS_0_SCRATCH + (i * 4), dev_priv->pmregs.bios_scratch[i]);
@@ -150,6 +147,10 @@ int radeon_resume(struct drm_device *dev)
 	
 	radeon_init_memory_map(dev);
 
+	pci_set_master(dev->pdev);
+	/* Turn on bus mastering -todo fix properly */
+	radeon_enable_bm(dev_priv);
+
 	if (dev_priv->flags & RADEON_IS_PCIE) {
 		memcpy_toio(dev_priv->mm.pcie_table.kmap.virtual, dev_priv->mm.pcie_table_backup, dev_priv->gart_info.table_size);
 	}
-- 
1.6.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -r1.1498 -r1.1499
--- kernel.spec	1 Apr 2009 04:01:36 -0000	1.1498
+++ kernel.spec	1 Apr 2009 12:42:24 -0000	1.1499
@@ -667,6 +667,7 @@
 Patch1816: drm-no-gem-on-i8xx.patch
 Patch1818: drm-i915-resume-force-mode.patch
 Patch1819: drm-intel-big-hammer.patch
+Patch1820: drm-radeon-reorder-bm.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1259,6 +1260,7 @@
 ApplyPatch drm-no-gem-on-i8xx.patch
 ApplyPatch drm-i915-resume-force-mode.patch
 ApplyPatch drm-intel-big-hammer.patch
+ApplyPatch drm-radeon-reorder-bm.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1870,6 +1872,9 @@
 # and build.
 
 %changelog
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com>
+- drm-radeon-reorder-bm.patch: attempt PM fix for PCI/AGP cards
+
 * Tue Mar 31 2009 Matthew Garrett <mjg at redhat.com> 2.6.29.1-35.rc1
 - linux-2.6.29-alsa-update-quirks.patch: Backport some HDA quirk support