rpms/kernel/devel drm-modesetting-radeon.patch, 1.48, 1.49 kernel.spec, 1.1108, 1.1109

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv641

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
- drm-modesetting-radeon.patch: fix modeset reporting for pm-utils


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- drm-modesetting-radeon.patch	31 Oct 2008 04:50:56 -0000	1.48
+++ drm-modesetting-radeon.patch	3 Nov 2008 01:28:04 -0000	1.49
@@ -1,3 +1,9 @@
+commit 96b17b8573d9d8d9507602c9dfb0a1b87e6ff1f5
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 3 09:56:02 2008 +1100
+
+    radeon: if modesetting state is unknown make it known so pm-utils can use it
+
 commit 73487c9e856db6613b465827372ac618dca4447e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Oct 31 14:40:12 2008 +1000
@@ -23300,7 +23306,7 @@
 +	return NULL;
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 59a2132..2dc0c7e 100644
+index 59a2132..f3810bc 100644
 --- a/drivers/gpu/drm/radeon/radeon_cp.c
 +++ b/drivers/gpu/drm/radeon/radeon_cp.c
 @@ -31,6 +31,7 @@
@@ -24872,22 +24878,26 @@
  	switch (flags & RADEON_FAMILY_MASK) {
  	case CHIP_R100:
  	case CHIP_RV200:
-@@ -1743,6 +2670,14 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1743,6 +2670,18 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  		break;
  	}
  
 +	/* FEDORA HACKS - don't enable modesetting on pre-r300
 + 	 * until we have a mesa driver in place
 + 	 */
-+	if ((radeon_modeset == -1) && (dev_priv->chip_family <= CHIP_RV280)) {
-+		dev->driver->driver_features &= ~DRIVER_MODESET;
-+		drm_put_minor(&dev->control);
++	if (radeon_modeset == -1) {
++		if (dev_priv->chip_family <= CHIP_RV280) {
++			dev->driver->driver_features &= ~DRIVER_MODESET;
++			drm_put_minor(&dev->control);
++			radeon_modeset = 0;
++		} else
++			radeon_modeset = 1;
 +	}
 +
  	if (drm_device_is_agp(dev))
  		dev_priv->flags |= RADEON_IS_AGP;
  	else if (drm_device_is_pcie(dev))
-@@ -1752,7 +2687,119 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1752,7 +2691,119 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  
  	DRM_DEBUG("%s card detected\n",
  		  ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
@@ -25007,7 +25017,7 @@
  }
  
  /* Create mappings for registers and framebuffer so userland doesn't necessarily
-@@ -1760,25 +2807,10 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -1760,25 +2811,10 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
   */
  int radeon_driver_firstopen(struct drm_device *dev)
  {
@@ -25033,7 +25043,7 @@
  	return 0;
  }
  
-@@ -1786,9 +2818,44 @@ int radeon_driver_unload(struct drm_device *dev)
+@@ -1786,9 +2822,44 @@ int radeon_driver_unload(struct drm_device *dev)
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1108
retrieving revision 1.1109
diff -u -r1.1108 -r1.1109
--- kernel.spec	3 Nov 2008 01:18:57 -0000	1.1108
+++ kernel.spec	3 Nov 2008 01:28:04 -0000	1.1109
@@ -1889,6 +1889,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Nov 03 2008 Dave Airlie <airlied at redhat.com> 2.6.27.4-73
+- drm-modesetting-radeon.patch: fix modeset reporting for pm-utils
+
 * Mon Nov 03 2008 Dave Airlie <airlied at redhat.com> 2.6.27.4-72
 - backport upstream fixes to make 64-bit Intel GEM useable (#469584)