rpms/kernel/F-11 drm-nouveau.patch, 1.53, 1.54 kernel.spec, 1.1655, 1.1656

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Thu Jun 18 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-194
- drm-nouveau.patch: un-break DPMS after DRM changes



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- drm-nouveau.patch	16 Jun 2009 00:37:11 -0000	1.53
+++ drm-nouveau.patch	18 Jun 2009 00:26:55 -0000	1.54
@@ -23819,10 +23819,10 @@ index 0000000..87c6213
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c
 new file mode 100644
-index 0000000..8074cb8
+index 0000000..fffb8f2
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
-@@ -0,0 +1,498 @@
+@@ -0,0 +1,491 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -23990,14 +23990,6 @@ index 0000000..8074cb8
 +	struct nouveau_connector *connector = to_nouveau_connector(drm_connector);
 +	int rval;
 +
-+	/* DPMS */
-+	if (property == dev->mode_config.dpms_property) {
-+		if (value > 3)
-+			return -EINVAL;
-+
-+		drm_helper_set_connector_dpms(drm_connector, value);
-+	}
-+
 +	/* Scaling mode */
 +	if (property == dev->mode_config.scaling_mode_property) {
 +		struct nouveau_crtc *crtc = NULL;
@@ -24217,6 +24209,7 @@ index 0000000..8074cb8
 +};
 +
 +static const struct drm_connector_funcs nv50_connector_funcs = {
++	.dpms = drm_helper_connector_dpms,
 +	.save = NULL,
 +	.restore = NULL,
 +	.detect = nv50_connector_detect,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1655
retrieving revision 1.1656
diff -u -p -r1.1655 -r1.1656
--- kernel.spec	17 Jun 2009 23:43:04 -0000	1.1655
+++ kernel.spec	18 Jun 2009 00:26:57 -0000	1.1656
@@ -2070,6 +2070,9 @@ fi
 # and build.
 
 %changelog
+* Thu Jun 18 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-194
+- drm-nouveau.patch: un-break DPMS after DRM changes
+
 * Thu Jun 18 2009 Dave Airlie <airlied at redhat.com> 2.6.29.5-193
 - drm-radeon-cs-oops-fix.patch: fix oops if CS path called from non-kms