rpms/kernel/F-13 revert-drm-kms-toggle-poll-around-switcheroo.patch, 1.2, 1.3 kernel.spec, 1.2105, 1.2106

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32407

Modified Files:
	kernel.spec 
Added Files:
	revert-drm-kms-toggle-poll-around-switcheroo.patch 
Log Message:
* Wed Jul 21 2010 Dave Airlie <airlied at redhat.com> 2.6.31.1.22
- double drop: its a revert on top of a revert.


revert-drm-kms-toggle-poll-around-switcheroo.patch:
 i915/i915_dma.c         |    4 +---
 nouveau/nouveau_state.c |    3 ---
 radeon/radeon_device.c  |    2 --
 3 files changed, 1 insertion(+), 8 deletions(-)

Index: revert-drm-kms-toggle-poll-around-switcheroo.patch
===================================================================
RCS file: revert-drm-kms-toggle-poll-around-switcheroo.patch
diff -N revert-drm-kms-toggle-poll-around-switcheroo.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ revert-drm-kms-toggle-poll-around-switcheroo.patch	20 Jul 2010 23:28:12 -0000	1.3
@@ -0,0 +1,65 @@
+From 69b711c0c5e3d9cb3a5b9f741fb4cdc96b5739cb Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
+Subject: Revert "drm/kms: disable/enable poll around switcheroo on/off"
+
+This reverts commit fbf81762e385d3d45acad057b654d56972acf58c, mostly.
+---
+ drivers/gpu/drm/i915/i915_dma.c         |    4 +---
+ drivers/gpu/drm/nouveau/nouveau_state.c |    3 ---
+ drivers/gpu/drm/radeon/radeon_device.c  |    2 --
+
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 59a2bf8..2df3286 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1320,14 +1320,12 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_
+ 	struct drm_device *dev = pci_get_drvdata(pdev);
+ 	pm_message_t pmm = { .event = PM_EVENT_SUSPEND };
+ 	if (state == VGA_SWITCHEROO_ON) {
+-		printk(KERN_INFO "i915: switched on\n");
++		printk(KERN_INFO "i915: switched off\n");
+ 		/* i915 resume handler doesn't set to D0 */
+ 		pci_set_power_state(dev->pdev, PCI_D0);
+ 		i915_resume(dev);
+-		drm_kms_helper_poll_enable(dev);
+ 	} else {
+ 		printk(KERN_ERR "i915: switched off\n");
+-		drm_kms_helper_poll_disable(dev);
+ 		i915_suspend(dev, pmm);
+ 	}
+ }
+diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
+index b02a231..0c28266 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_state.c
++++ b/drivers/gpu/drm/nouveau/nouveau_state.c
+@@ -376,15 +376,12 @@ out_err:
+ static void nouveau_switcheroo_set_state(struct pci_dev *pdev,
+ 					 enum vga_switcheroo_state state)
+ {
+-	struct drm_device *dev = pci_get_drvdata(pdev);
+ 	pm_message_t pmm = { .event = PM_EVENT_SUSPEND };
+ 	if (state == VGA_SWITCHEROO_ON) {
+ 		printk(KERN_ERR "VGA switcheroo: switched nouveau on\n");
+ 		nouveau_pci_resume(pdev);
+-		drm_kms_helper_poll_enable(dev);
+ 	} else {
+ 		printk(KERN_ERR "VGA switcheroo: switched nouveau off\n");
+-		drm_kms_helper_poll_disable(dev);
+ 		nouveau_pci_suspend(pdev, pmm);
+ 	}
+ }
+diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
+index f10faed..225a9f2 100644
+--- a/drivers/gpu/drm/radeon/radeon_device.c
++++ b/drivers/gpu/drm/radeon/radeon_device.c
+@@ -546,10 +546,8 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
+ 		/* don't suspend or resume card normally */
+ 		rdev->powered_down = false;
+ 		radeon_resume_kms(dev);
+-		drm_kms_helper_poll_enable(dev);
+ 	} else {
+ 		printk(KERN_INFO "radeon: switched off\n");
+-		drm_kms_helper_poll_disable(dev);
+ 		radeon_suspend_kms(dev, pmm);
+ 		/* don't suspend or resume card normally */
+ 		rdev->powered_down = true;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2105
retrieving revision 1.2106
diff -u -p -r1.2105 -r1.2106
--- kernel.spec	20 Jul 2010 05:21:50 -0000	1.2105
+++ kernel.spec	20 Jul 2010 23:28:11 -0000	1.2106
@@ -693,6 +693,7 @@ Patch1555: fix_xen_guest_on_old_EC2.patc
 # DRM
 Patch1800: drm-next.patch
 Patch1801: drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch
+Patch1802: revert-drm-kms-toggle-poll-around-switcheroo.patch
 Patch1803: drm-encoder-disable.patch
 # nouveau + drm fixes
 Patch1815: drm-nouveau-updates.patch
@@ -1336,6 +1337,7 @@ ApplyPatch fix_xen_guest_on_old_EC2.patc
 
 ApplyPatch drm-next.patch
 ApplyPatch drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch
+ApplyPatch revert-drm-kms-toggle-poll-around-switcheroo.patch
 ApplyPatch drm-i915-fix-edp-panels.patch
 ApplyPatch i915-fix-crt-hotplug-regression.patch
 # RHBZ#572799
@@ -2050,6 +2052,9 @@ fi
 
 
 %changelog
+* Wed Jul 21 2010 Dave Airlie <airlied at redhat.com> 2.6.31.1.22
+- double drop: its a revert on top of a revert.
+
 * Tue Jul 20 2010 Dave Airlie <airlied at redhat.com> 2.6.34.1-21
 - drop drm revert, that can't possible cause the bug, but is causing another one.