rpms/kernel/devel drm-nouveau.patch, 1.29, 1.30 kernel.spec, 1.1476, 1.1477

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
Fri Mar 27 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: do nothing for dac_{prepare,commit}, it's useless
  and breaks some things in strange ways.



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- drm-nouveau.patch	27 Mar 2009 02:11:39 -0000	1.29
+++ drm-nouveau.patch	27 Mar 2009 07:13:58 -0000	1.30
@@ -18895,10 +18895,10 @@
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
 new file mode 100644
-index 0000000..31c73d2
+index 0000000..0458e05
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_dac.c
-@@ -0,0 +1,284 @@
+@@ -0,0 +1,279 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -19080,15 +19080,10 @@
 +
 +static void nv50_dac_prepare(struct drm_encoder *drm_encoder)
 +{
-+	struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder);
-+
-+	nv50_dac_dpms(drm_encoder, DRM_MODE_DPMS_OFF);
-+	nv50_dac_disconnect(encoder);
 +}
 +
 +static void nv50_dac_commit(struct drm_encoder *drm_encoder)
 +{
-+	nv50_dac_dpms(drm_encoder, DRM_MODE_DPMS_ON);
 +}
 +
 +static void nv50_dac_mode_set(struct drm_encoder *drm_encoder,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1476
retrieving revision 1.1477
diff -u -r1.1476 -r1.1477
--- kernel.spec	27 Mar 2009 02:11:39 -0000	1.1476
+++ kernel.spec	27 Mar 2009 07:13:58 -0000	1.1477
@@ -1824,6 +1824,10 @@
 
 %changelog
 * Fri Mar 27 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: do nothing for dac_{prepare,commit}, it's useless
+  and breaks some things in strange ways.
+
+* Fri Mar 27 2009 Ben Skeggs <bskeggs at redhat.com>
 - nv50: clear 0x1900/8 on init, possible fix for rh#492240
 - forcibly disable GEM also if KMS requested where not supported
 - inform the user if we disable KMS because of it not being supported