rpms/kernel/devel drm-nouveau.patch, 1.37, 1.38 kernel.spec, 1.1664, 1.1665

Ben Skeggs bskeggs at fedoraproject.org
Tue Jul 28 16:03:52 UTC 2009


Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19979

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: tile shared fb area on nv50



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 |  156 
 drivers/gpu/drm/nouveau/nouveau_bios.c      | 5050 ++++++
 drivers/gpu/drm/nouveau/nouveau_bios.h      |  226 
 drivers/gpu/drm/nouveau/nouveau_bo.c        |  567 
 drivers/gpu/drm/nouveau/nouveau_calc.c      |  622 
 drivers/gpu/drm/nouveau/nouveau_connector.h |   55 
 drivers/gpu/drm/nouveau/nouveau_crtc.h      |   90 
 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       |  353 
 drivers/gpu/drm/nouveau/nouveau_drv.h       | 1145 +
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |   51 
 drivers/gpu/drm/nouveau/nouveau_fb.h        |   43 
 drivers/gpu/drm/nouveau/nouveau_fbcon.c     | 1019 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.h     |   49 
 drivers/gpu/drm/nouveau/nouveau_fence.c     |  261 
 drivers/gpu/drm/nouveau/nouveau_fifo.c      |  668 
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  751 
 drivers/gpu/drm/nouveau/nouveau_hw.c        | 1019 +
 drivers/gpu/drm/nouveau/nouveau_hw.h        |  436 
 drivers/gpu/drm/nouveau/nouveau_i2c.c       |  274 
 drivers/gpu/drm/nouveau/nouveau_i2c.h       |   46 
 drivers/gpu/drm/nouveau/nouveau_ioc32.c     |   72 
 drivers/gpu/drm/nouveau/nouveau_irq.c       |  674 
 drivers/gpu/drm/nouveau/nouveau_mem.c       |  543 
 drivers/gpu/drm/nouveau/nouveau_notifier.c  |  192 
 drivers/gpu/drm/nouveau/nouveau_object.c    | 1258 +
 drivers/gpu/drm/nouveau/nouveau_reg.h       |  834 +
 drivers/gpu/drm/nouveau/nouveau_sgdma.c     |  331 
 drivers/gpu/drm/nouveau/nouveau_state.c     |  837 +
 drivers/gpu/drm/nouveau/nouveau_swmthd.h    |   33 
 drivers/gpu/drm/nouveau/nouveau_ttm.c       |  116 
 drivers/gpu/drm/nouveau/nv04_crtc.c         | 1126 +
 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      |  182 
 drivers/gpu/drm/nouveau/nv04_mc.c           |   20 
 drivers/gpu/drm/nouveau/nv04_output.c       | 1193 +
 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        | 2200 ++
 drivers/gpu/drm/nouveau/nv40_mc.c           |   38 
 drivers/gpu/drm/nouveau/nv50_connector.c    |  495 
 drivers/gpu/drm/nouveau/nv50_crtc.c         |  812 +
 drivers/gpu/drm/nouveau/nv50_cursor.c       |  153 
 drivers/gpu/drm/nouveau/nv50_dac.c          |  284 
 drivers/gpu/drm/nouveau/nv50_display.c      |  844 +
 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        |  432 
 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          |  268 
 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, 54525 insertions(+), 21 deletions(-)

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- drm-nouveau.patch	28 Jul 2009 11:24:16 -0000	1.37
+++ drm-nouveau.patch	28 Jul 2009 16:03:51 -0000	1.38
@@ -17505,10 +17505,10 @@ index 0000000..32a9452
 +}
 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
 new file mode 100644
-index 0000000..54dfe6d
+index 0000000..a09ee5e
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -0,0 +1,836 @@
+@@ -0,0 +1,837 @@
 +/*
 + * Copyright 2005 Stephane Marchesin
 + * Copyright 2008 Stuart Bennett
@@ -17552,6 +17552,7 @@ index 0000000..54dfe6d
 +{
 +	struct drm_nouveau_private *dev_priv = dev->dev_private;
 +	struct nouveau_bo *nvbo = NULL;
++	uint32_t tile_flags = dev_priv->card_type == NV_50 ? 0x7000 : 0x0000;
 +	int ret, size;
 +
 +	if (dev_priv->sfb_gem)
@@ -17563,7 +17564,7 @@ index 0000000..54dfe6d
 +	size >>= 1;
 +
 +	ret = nouveau_gem_new(dev, dev_priv->channel, size, 0, TTM_PL_FLAG_VRAM,
-+			      0, 0x0000, false, true, &nvbo);
++			      0, tile_flags, false, true, &nvbo);
 +	if (ret)
 +		return ret;
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1664
retrieving revision 1.1665
diff -u -p -r1.1664 -r1.1665
--- kernel.spec	28 Jul 2009 13:35:42 -0000	1.1664
+++ kernel.spec	28 Jul 2009 16:03:52 -0000	1.1665
@@ -1898,6 +1898,9 @@ fi
 # and build.
 
 %changelog
+* Tue Jul 28 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: tile shared fb area on nv50
+
 * Tue Jul 28 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.101.rc4.git2
 - 2.6.31-rc4-git2
 - rebase linux-2.6-fix-usb-serial-autosuspend.diff




More information about the scm-commits mailing list