rpms/kernel/F-11 drm-nouveau.patch, 1.57, 1.58 kernel.spec, 1.1666, 1.1667

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Jun 30 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-205
- nouveau: Forcibly DPMS on DAC/SORs during modeset



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- drm-nouveau.patch	29 Jun 2009 06:15:34 -0000	1.57
+++ drm-nouveau.patch	29 Jun 2009 23:43:07 -0000	1.58
@@ -25327,10 +25327,10 @@ index 0000000..763cffe
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
 new file mode 100644
-index 0000000..6386052
+index 0000000..e0569d0
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_dac.c
-@@ -0,0 +1,280 @@
+@@ -0,0 +1,287 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -25525,13 +25525,20 @@ index 0000000..6386052
 +{
 +	struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder);
 +	struct drm_device *dev = drm_encoder->dev;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_crtc *crtc = to_nouveau_crtc(drm_encoder->crtc);
 +	uint32_t offset = encoder->or * 0x80;
 +	uint32_t mode_ctl = NV50_DAC_MODE_CTRL_OFF;
 +	uint32_t mode_ctl2 = 0;
++	bool tmp;
 +
 +	NV_DEBUG(dev, "or %d\n", encoder->or);
 +
++	tmp = dev_priv->in_modeset;
++	dev_priv->in_modeset = false;
++	nv50_dac_dpms(drm_encoder, DRM_MODE_DPMS_ON);
++	dev_priv->in_modeset = tmp;
++
 +	if (crtc->index == 1)
 +		mode_ctl |= NV50_DAC_MODE_CTRL_CRTC1;
 +	else
@@ -48801,10 +48808,10 @@ index 0000000..6572f12
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
 new file mode 100644
-index 0000000..6528c9f
+index 0000000..3fa5b4d
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,303 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -48989,12 +48996,19 @@ index 0000000..6528c9f
 +{
 +	struct nouveau_encoder *encoder = to_nouveau_encoder(drm_encoder);
 +	struct drm_device *dev = drm_encoder->dev;
++	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_crtc *crtc = to_nouveau_crtc(drm_encoder->crtc);
 +	uint32_t offset = encoder->or * 0x40;
 +	uint32_t mode_ctl = NV50_SOR_MODE_CTRL_OFF;
++	bool tmp;
 +
 +	NV_DEBUG(dev, "or %d\n", encoder->or);
 +
++	tmp = dev_priv->in_modeset;
++	dev_priv->in_modeset = false;
++	nv50_sor_dpms(drm_encoder, DRM_MODE_DPMS_ON);
++	dev_priv->in_modeset = tmp;
++
 +	if (encoder->base.encoder_type == DRM_MODE_ENCODER_LVDS) {
 +		mode_ctl |= NV50_SOR_MODE_CTRL_LVDS;
 +	} else {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -p -r1.1666 -r1.1667
--- kernel.spec	29 Jun 2009 20:02:54 -0000	1.1666
+++ kernel.spec	29 Jun 2009 23:43:08 -0000	1.1667
@@ -2083,6 +2083,9 @@ fi
 # and build.
 
 %changelog
+* Tue Jun 30 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-205
+- nouveau: Forcibly DPMS on DAC/SORs during modeset
+
 * Mon Jun 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.5-204
 - Fix "port=" option in CIFS mount calls. (#506574)