rpms/kernel/F-12 drm-nouveau-nvac-noaccel.patch, 1.1, 1.2 kernel.spec, 1.1975, 1.1976
Ben Skeggs
bskeggs at fedoraproject.org
Tue Jan 12 01:29:49 UTC 2010
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27735
Modified Files:
drm-nouveau-nvac-noaccel.patch kernel.spec
Log Message:
nouveau: fix borked patch from previous commit
drm-nouveau-nvac-noaccel.patch:
b/firmware/Makefile | 3
firmware/nouveau/nvac.ctxprog.ihex | 79 --------
firmware/nouveau/nvac.ctxvals.ihex | 363 -------------------------------------
3 files changed, 1 insertion(+), 444 deletions(-)
Index: drm-nouveau-nvac-noaccel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/drm-nouveau-nvac-noaccel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-nouveau-nvac-noaccel.patch 12 Jan 2010 00:14:08 -0000 1.1
+++ drm-nouveau-nvac-noaccel.patch 12 Jan 2010 01:29:47 -0000 1.2
@@ -1,124 +1,30 @@
-From 89aee1bfe529ae0c1a8e2b907aa9257c1e48e690 Mon Sep 17 00:00:00 2001
+From 64e5badc040755a5ebbc48351f9f0e50ebc6e390 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
-Date: Fri, 8 Jan 2010 16:23:11 +1000
+Date: Tue, 12 Jan 2010 11:23:52 +1000
Subject: [PATCH 6/6] drm/nouveau: remove ctxprog/ctxvals for NVAC, accel is broken there
---
- drivers/gpu/drm/nouveau/nv50_graph.c | 88 ++++++++
- firmware/nouveau/nvac.ctxprog.ihex | 79 --------
- firmware/nouveau/nvac.ctxvals.ihex | 362 ----------------------------------
- 3 files changed, 88 insertions(+), 441 deletions(-)
+ firmware/Makefile | 3 +-
+ firmware/nouveau/nvac.ctxprog.ihex | 79 --------
+ firmware/nouveau/nvac.ctxvals.ihex | 362 ------------------------------------
+ 3 files changed, 1 insertions(+), 443 deletions(-)
delete mode 100644 firmware/nouveau/nvac.ctxprog.ihex
delete mode 100644 firmware/nouveau/nvac.ctxvals.ihex
-diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
-index ca79f32..7f43a50 100644
---- a/drivers/gpu/drm/nouveau/nv50_graph.c
-+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
-@@ -111,8 +111,50 @@ nv50_graph_init_ctxctl(struct drm_device *dev)
-
- NV_DEBUG(dev, "\n");
-
-+<<<<<<< HEAD
- nouveau_grctx_prog_load(dev);
- if (!dev_priv->engine.graph.ctxprog)
-+=======
-+ switch (dev_priv->chipset) {
-+ case 0x50:
-+ voodoo = nv50_ctxprog;
-+ break;
-+ case 0x84:
-+ voodoo = nv84_ctxprog;
-+ break;
-+ case 0x86:
-+ voodoo = nv86_ctxprog;
-+ break;
-+ case 0x92:
-+ voodoo = nv92_ctxprog;
-+ break;
-+ case 0x94:
-+ case 0x96:
-+ voodoo = nv94_ctxprog;
-+ break;
-+ case 0x98:
-+ voodoo = nv98_ctxprog;
-+ break;
-+ case 0xa0:
-+ voodoo = nva0_ctxprog;
-+ break;
-+ case 0xa5:
-+ voodoo = nva5_ctxprog;
-+ break;
-+ case 0xa8:
-+ voodoo = nva8_ctxprog;
-+ break;
-+ case 0xaa:
-+ voodoo = nvaa_ctxprog;
-+ break;
-+#if 0 /* block accel for now, it won't work */
-+ case 0xac:
-+ voodoo = nvac_ctxprog;
-+ break;
-+#endif
-+ default:
-+ NV_ERROR(dev, "no ctxprog for chipset NV%02x\n", dev_priv->chipset);
-+>>>>>>> drm/nv50: block accel on nvac for the moment, it's broken
- dev_priv->engine.graph.accel_blocked = true;
-
- nv_wr32(dev, 0x400320, 4);
-@@ -210,6 +252,52 @@ nv50_graph_create_context(struct nouveau_channel *chan)
- nv_wo32(dev, ramin, (hdr + 0x14)/4, 0x00010000);
- dev_priv->engine.instmem.finish_access(dev);
-
-+<<<<<<< HEAD
-+=======
-+ switch (dev_priv->chipset) {
-+ case 0x50:
-+ ctxvals = nv50_ctxvals;
-+ break;
-+ case 0x84:
-+ ctxvals = nv84_ctxvals;
-+ break;
-+ case 0x86:
-+ ctxvals = nv86_ctxvals;
-+ break;
-+ case 0x92:
-+ ctxvals = nv92_ctxvals;
-+ break;
-+ case 0x94:
-+ ctxvals = nv94_ctxvals;
-+ break;
-+ case 0x96:
-+ ctxvals = nv96_ctxvals;
-+ break;
-+ case 0x98:
-+ ctxvals = nv98_ctxvals;
-+ break;
-+ case 0xa0:
-+ ctxvals = nva0_ctxvals;
-+ break;
-+ case 0xa5:
-+ ctxvals = nva5_ctxvals;
-+ break;
-+ case 0xa8:
-+ ctxvals = nva8_ctxvals;
-+ break;
-+ case 0xaa:
-+ ctxvals = nvaa_ctxvals;
-+ break;
-+#if 0 /* block accel for now, it won't work */
-+ case 0xac:
-+ ctxvals = nvac_ctxvals;
-+ break;
-+#endif
-+ default:
-+ break;
-+ }
-+
-+>>>>>>> drm/nv50: block accel on nvac for the moment, it's broken
- dev_priv->engine.instmem.prepare_access(dev, true);
- nouveau_grctx_vals_load(dev, ctx);
- nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12);
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 7766c96..26ecab2 100644
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -72,8 +72,7 @@ fw-shipped-$(CONFIG_DRM_NOUVEAU) += nouveau/nv50.ctxprog nouveau/nv50.ctxvals \
+ nouveau/nva0.ctxprog nouveau/nva0.ctxvals \
+ nouveau/nva5.ctxprog nouveau/nva5.ctxvals \
+ nouveau/nva8.ctxprog nouveau/nva8.ctxvals \
+- nouveau/nvaa.ctxprog nouveau/nvaa.ctxvals \
+- nouveau/nvac.ctxprog nouveau/nvac.ctxvals
++ nouveau/nvaa.ctxprog nouveau/nvaa.ctxvals
+ fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
+ fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
+ fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
diff --git a/firmware/nouveau/nvac.ctxprog.ihex b/firmware/nouveau/nvac.ctxprog.ihex
deleted file mode 100644
index 41b1bea..0000000
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1975
retrieving revision 1.1976
diff -u -p -r1.1975 -r1.1976
--- kernel.spec 12 Jan 2010 00:14:08 -0000 1.1975
+++ kernel.spec 12 Jan 2010 01:29:47 -0000 1.1976
@@ -2010,6 +2010,9 @@ fi
# and build.
%changelog
+* Tue Jan 12 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.32.3-16
+- nouveau: fix nvac noaccel patch, not sure what happened there!
+
* Tue Jan 12 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.32.3-15
- nouveau: patches and firmware from F12 that aren't in upstream kernel
More information about the scm-commits
mailing list