rpms/kernel/devel drm-nouveau.patch, 1.28, 1.29 kernel.spec, 1.1475, 1.1476
Ben Skeggs
bskeggs at fedoraproject.org
Fri Mar 27 02:11:40 UTC 2009
- Previous message: rpms/rt3/EL-5 rt3.spec,1.22,1.23
- Next message: rpms/sepostgresql/F-9 sepostgresql-pg_dump-8.3.7-2.patch, NONE, 1.1 sepostgresql-policy-8.3.7-2.patch, NONE, 1.1 sepostgresql-sepgsql-8.3.7-2.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sepostgresql.init, 1.32, 1.33 sepostgresql.spec, 1.34, 1.35 sources, 1.10, 1.11 sepostgresql-pg_dump-8.3.6-2.patch, 1.1, NONE sepostgresql-policy-8.3.6-2.patch, 1.3, NONE sepostgresql-sepgsql-8.3.6-2.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10197
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* 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
drm-nouveau.patch:
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- drm-nouveau.patch 25 Mar 2009 01:49:54 -0000 1.28
+++ drm-nouveau.patch 27 Mar 2009 02:11:39 -0000 1.29
@@ -10467,10 +10467,10 @@
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
new file mode 100644
-index 0000000..e3efc05
+index 0000000..b07d332
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,1039 @@
+@@ -0,0 +1,1042 @@
+/*
+ * Copyright 2005 Stephane Marchesin
+ * Copyright 2008 Stuart Bennett
@@ -11127,8 +11127,11 @@
+#endif
+
+ /* For those who think they want to be funny. */
-+ if (dev_priv->card_type < NV_50)
-+ dev->driver->driver_features &= ~DRIVER_MODESET;
++ if (dev_priv->card_type < NV_50) {
++ DRM_ERROR("Kernel modesetting requested but not supported "
++ "on this chipset.\n");
++ dev->driver->driver_features &= ~(DRIVER_MODESET|DRIVER_GEM);
++ }
+
+ /* Special flags */
+ if (dev->pci_device == 0x01a0) {
@@ -42216,10 +42219,10 @@
+#endif /* __NV50_I2C_H__ */
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
new file mode 100644
-index 0000000..545196b
+index 0000000..b11d7c8
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
-@@ -0,0 +1,376 @@
+@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
+ *
@@ -42398,6 +42401,9 @@
+ nv_wr32(NV50_PUNK_BAR3_CTXDMA, (priv->pramin_bar->instance >> 4) |
+ NV50_PUNK_BAR3_CTXDMA_VALID);
+
++ for (i = 0; i < 8; i++)
++ nv_wr32(0x1900 + (i*4), 0);
++
+ /* Assume that praying isn't enough, check that we can re-read the
+ * entire fake channel back from the PRAMIN BAR */
+ dev_priv->engine.instmem.prepare_access(dev, false);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1475
retrieving revision 1.1476
diff -u -r1.1475 -r1.1476
--- kernel.spec 26 Mar 2009 19:23:57 -0000 1.1475
+++ kernel.spec 27 Mar 2009 02:11:39 -0000 1.1476
@@ -1823,6 +1823,11 @@
# and build.
%changelog
+* 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
+
* Thu Mar 26 2009 Matthew Garrett <mjg at redhat.com>
- linux-2.6-relatime-by-default.patch: Backport relatime code from 2.6.30
- Previous message: rpms/rt3/EL-5 rt3.spec,1.22,1.23
- Next message: rpms/sepostgresql/F-9 sepostgresql-pg_dump-8.3.7-2.patch, NONE, 1.1 sepostgresql-policy-8.3.7-2.patch, NONE, 1.1 sepostgresql-sepgsql-8.3.7-2.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 sepostgresql.init, 1.32, 1.33 sepostgresql.spec, 1.34, 1.35 sources, 1.10, 1.11 sepostgresql-pg_dump-8.3.6-2.patch, 1.1, NONE sepostgresql-policy-8.3.6-2.patch, 1.3, NONE sepostgresql-sepgsql-8.3.6-2.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list