rpms/kernel/F-11 drm-nouveau.patch, 1.49, 1.50 kernel.spec, 1.1624, 1.1625

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue May 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.4-163
- drm-nouveau.patch: fix sor dpms (rh#501877)



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- drm-nouveau.patch	7 May 2009 00:50:34 -0000	1.49
+++ drm-nouveau.patch	27 May 2009 01:23:03 -0000	1.50
@@ -103,7 +103,7 @@ index f1c386c..fd62fd9 100644
  	if (mask & ~fence->type) {
  		DRM_ERROR("Wait trying to extend fence type"
 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
-index c1173d8..2e4e667 100644
+index 4984aa8..dee9b40 100644
 --- a/drivers/gpu/drm/drm_gem.c
 +++ b/drivers/gpu/drm/drm_gem.c
 @@ -280,48 +280,58 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
@@ -13276,7 +13276,7 @@ index 0000000..c3ad906
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
 new file mode 100644
-index 0000000..44b3b34
+index 0000000..21bb4d5
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
 @@ -0,0 +1,1073 @@
@@ -23793,7 +23793,7 @@ 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..771c7ab
+index 0000000..8074cb8
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
 @@ -0,0 +1,498 @@
@@ -25546,10 +25546,10 @@ index 0000000..ecd16d2
 +
 diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
 new file mode 100644
-index 0000000..ac51e1a
+index 0000000..fd253c5
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_display.c
-@@ -0,0 +1,423 @@
+@@ -0,0 +1,421 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -25743,7 +25743,6 @@ index 0000000..ac51e1a
 +		}
 +	}
 +
-+#if 0
 +	nv_wr32(NV50_PDISPLAY_UNK200_CTRL, 0);
 +	nv_wr32(NV50_PDISPLAY_CTRL_STATE, 0);
 +	if (!nv_wait(NV50_PDISPLAY_UNK200_CTRL, 0x1e0000, 0)) {
@@ -25751,7 +25750,6 @@ index 0000000..ac51e1a
 +		NV_ERROR(dev, "0x610200 = 0x%08x\n",
 +			  nv_rd32(NV50_PDISPLAY_UNK200_CTRL));
 +	}
-+#endif
 +
 +	for (i = 0; i < NV50_PDISPLAY_SOR_REGS__LEN; i++) {
 +		if (!nv_wait(NV50_PDISPLAY_SOR_REGS_DPMS_STATE(i),
@@ -48519,10 +48517,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..69a07e2
+index 0000000..f26cc7b
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
-@@ -0,0 +1,286 @@
+@@ -0,0 +1,292 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -48639,6 +48637,12 @@ index 0000000..69a07e2
 +
 +	nv_wr32(NV50_PDISPLAY_SOR_REGS_DPMS_CTRL(or), val |
 +		NV50_PDISPLAY_SOR_REGS_DPMS_CTRL_PENDING);
++	if (!nv_wait(NV50_PDISPLAY_SOR_REGS_DPMS_STATE(or),
++		     NV50_PDISPLAY_SOR_REGS_DPMS_STATE_WAIT, 0)) {
++		NV_ERROR(dev, "timeout: SOR_DPMS_STATE_WAIT(%d) == 0\n", or);
++		NV_ERROR(dev, "SOR_DPMS_STATE(%d) = 0x%08x\n", or,
++			 nv_rd32(NV50_PDISPLAY_SOR_REGS_DPMS_STATE(or)));
++	}
 +}
 +
 +static void nv50_sor_save(struct drm_encoder *drm_encoder)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1624
retrieving revision 1.1625
diff -u -p -r1.1624 -r1.1625
--- kernel.spec	25 May 2009 20:15:52 -0000	1.1624
+++ kernel.spec	27 May 2009 01:23:04 -0000	1.1625
@@ -2010,6 +2010,9 @@ fi
 # and build.
 
 %changelog
+* Tue May 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.4-163
+- drm-nouveau.patch: fix sor dpms (rh#501877)
+
 * Mon May 25 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.4-162
 - keys-Handle-there-being-no-fallback-destination-key.patch:
   fix oops at boot with autofs/krb/cifs rhbz#501588.