rpms/kernel/devel drm-nouveau.patch, 1.42, 1.43 kernel.spec, 1.1693, 1.1694
Ben Skeggs
bskeggs at fedoraproject.org
Wed Aug 5 05:54:38 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: respect nomodeset
drm-nouveau.patch:
drivers/gpu/drm/Kconfig | 30
drivers/gpu/drm/Makefile | 1
drivers/gpu/drm/drm_bufs.c | 28
drivers/gpu/drm/nouveau/Makefile | 27
drivers/gpu/drm/nouveau/nouveau_backlight.c | 155
drivers/gpu/drm/nouveau/nouveau_bios.c | 5056 ++++++
drivers/gpu/drm/nouveau/nouveau_bios.h | 227
drivers/gpu/drm/nouveau/nouveau_bo.c | 557
drivers/gpu/drm/nouveau/nouveau_calc.c | 622
drivers/gpu/drm/nouveau/nouveau_connector.c | 595
drivers/gpu/drm/nouveau/nouveau_connector.h | 52
drivers/gpu/drm/nouveau/nouveau_crtc.h | 88
drivers/gpu/drm/nouveau/nouveau_display.c | 115
drivers/gpu/drm/nouveau/nouveau_dma.c | 143
drivers/gpu/drm/nouveau/nouveau_dma.h | 144
drivers/gpu/drm/nouveau/nouveau_drv.c | 369
drivers/gpu/drm/nouveau/nouveau_drv.h | 1131 +
drivers/gpu/drm/nouveau/nouveau_encoder.h | 49
drivers/gpu/drm/nouveau/nouveau_fb.h | 43
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1027 +
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 49
drivers/gpu/drm/nouveau/nouveau_fence.c | 261
drivers/gpu/drm/nouveau/nouveau_fifo.c | 683
drivers/gpu/drm/nouveau/nouveau_gem.c | 751
drivers/gpu/drm/nouveau/nouveau_hw.c | 1018 +
drivers/gpu/drm/nouveau/nouveau_hw.h | 431
drivers/gpu/drm/nouveau/nouveau_i2c.c | 246
drivers/gpu/drm/nouveau/nouveau_i2c.h | 45
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 72
drivers/gpu/drm/nouveau/nouveau_irq.c | 674
drivers/gpu/drm/nouveau/nouveau_mem.c | 567
drivers/gpu/drm/nouveau/nouveau_notifier.c | 192
drivers/gpu/drm/nouveau/nouveau_object.c | 1276 +
drivers/gpu/drm/nouveau/nouveau_reg.h | 834 +
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 317
drivers/gpu/drm/nouveau/nouveau_state.c | 825 +
drivers/gpu/drm/nouveau/nouveau_swmthd.h | 33
drivers/gpu/drm/nouveau/nouveau_ttm.c | 116
drivers/gpu/drm/nouveau/nv04_crtc.c | 1143 +
drivers/gpu/drm/nouveau/nv04_cursor.c | 70
drivers/gpu/drm/nouveau/nv04_display.c | 250
drivers/gpu/drm/nouveau/nv04_fb.c | 21
drivers/gpu/drm/nouveau/nv04_fbcon.c | 291
drivers/gpu/drm/nouveau/nv04_fifo.c | 146
drivers/gpu/drm/nouveau/nv04_graph.c | 586
drivers/gpu/drm/nouveau/nv04_instmem.c | 192
drivers/gpu/drm/nouveau/nv04_mc.c | 20
drivers/gpu/drm/nouveau/nv04_output.c | 797 +
drivers/gpu/drm/nouveau/nv04_timer.c | 51
drivers/gpu/drm/nouveau/nv10_fb.c | 24
drivers/gpu/drm/nouveau/nv10_fifo.c | 177
drivers/gpu/drm/nouveau/nv10_graph.c | 945 +
drivers/gpu/drm/nouveau/nv20_graph.c | 958 +
drivers/gpu/drm/nouveau/nv40_fb.c | 62
drivers/gpu/drm/nouveau/nv40_fifo.c | 222
drivers/gpu/drm/nouveau/nv40_graph.c | 2203 ++
drivers/gpu/drm/nouveau/nv40_mc.c | 38
drivers/gpu/drm/nouveau/nv50_crtc.c | 811 +
drivers/gpu/drm/nouveau/nv50_cursor.c | 153
drivers/gpu/drm/nouveau/nv50_dac.c | 284
drivers/gpu/drm/nouveau/nv50_display.c | 849 +
drivers/gpu/drm/nouveau/nv50_display.h | 46
drivers/gpu/drm/nouveau/nv50_evo.h | 113
drivers/gpu/drm/nouveau/nv50_fbcon.c | 256
drivers/gpu/drm/nouveau/nv50_fifo.c | 475
drivers/gpu/drm/nouveau/nv50_graph.c | 437
drivers/gpu/drm/nouveau/nv50_grctx.h |22284 ++++++++++++++++++++++++++++
drivers/gpu/drm/nouveau/nv50_instmem.c | 499
drivers/gpu/drm/nouveau/nv50_mc.c | 40
drivers/gpu/drm/nouveau/nv50_sor.c | 264
drivers/gpu/drm/nouveau/nvreg.h | 503
drivers/gpu/drm/ttm/ttm_bo.c | 4
include/drm/Kbuild | 1
include/drm/drmP.h | 2
include/drm/nouveau_drm.h | 214
75 files changed, 54259 insertions(+), 21 deletions(-)
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- drm-nouveau.patch 4 Aug 2009 06:46:46 -0000 1.42
+++ drm-nouveau.patch 5 Aug 2009 05:54:37 -0000 1.43
@@ -7958,10 +7958,10 @@ index 0000000..f15873f
+#endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
new file mode 100644
-index 0000000..c9b169f
+index 0000000..62b37cb
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
-@@ -0,0 +1,363 @@
+@@ -0,0 +1,369 @@
+/*
+ * Copyright 2005 Stephane Marchesin.
+ * All Rights Reserved.
@@ -8301,12 +8301,18 @@ index 0000000..c9b169f
+{
+ driver.num_ioctls = nouveau_max_ioctl;
+
-+ if (nouveau_modeset == -1)
++ if (nouveau_modeset == -1) {
++#ifdef CONFIG_VGA_CONSOLE
++ if (vgacon_text_force())
++ nouveau_modeset = 0;
++ else
++#endif
+#if defined(CONFIG_DRM_NOUVEAU_KMS)
-+ nouveau_modeset = 1;
++ nouveau_modeset = 1;
+#else
-+ nouveau_modeset = 0;
++ nouveau_modeset = 0;
+#endif
++ }
+
+ if (nouveau_modeset == 1)
+ driver.driver_features |= DRIVER_MODESET;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1693
retrieving revision 1.1694
diff -u -p -r1.1693 -r1.1694
--- kernel.spec 5 Aug 2009 05:45:27 -0000 1.1693
+++ kernel.spec 5 Aug 2009 05:54:37 -0000 1.1694
@@ -1943,6 +1943,9 @@ fi
# and build.
%changelog
+* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: respect nomodeset
+
* Wed Aug 05 2009 Chuck Ebbert <cebbert at redhat.com>
- Fix /usr/sbin/perf script. (#515494)
More information about the fedora-extras-commits
mailing list