rpms/libdrm/FC-6 nouveau-20061117.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 libdrm.spec, 1.18, 1.19 sources, 1.7, 1.8
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 14:21:15 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/libdrm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3813/FC-6
Modified Files:
.cvsignore libdrm.spec sources
Added Files:
nouveau-20061117.patch
Log Message:
auto-import libdrm-2.3.0-1.fc6 on branch FC-6 from libdrm-2.3.0-1.fc6.src.rpm
nouveau-20061117.patch:
Makefile.am | 1
nouveau_drm.h | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 144 insertions(+)
--- NEW FILE nouveau-20061117.patch ---
--- libdrm-2.3.0/shared-core/nouveau_drm.h.nouveau 2006-11-17 11:45:49.000000000 -0500
+++ libdrm-2.3.0/shared-core/nouveau_drm.h 2006-11-17 11:45:41.000000000 -0500
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2005 Stephane Marchesin.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __NOUVEAU_DRM_H__
+#define __NOUVEAU_DRM_H__
+
+typedef struct drm_nouveau_fifo_alloc {
+ int channel;
+ uint32_t put_base;
+ /* FIFO control regs */
+ drm_handle_t ctrl;
+ int ctrl_size;
+ /* DMA command buffer */
+ drm_handle_t cmdbuf;
+ int cmdbuf_size;
+}
+drm_nouveau_fifo_alloc_t;
+
+#define NV_DMA_CONTEXT_FLAGS_PATCH_ROP_AND 0x1
+#define NV_DMA_CONTEXT_FLAGS_PATCH_SRCCOPY 0x2
+#define NV_DMA_CONTEXT_FLAGS_CLIP_ENABLE 0x4
+#define NV_DMA_CONTEXT_FLAGS_MONO 0x8
+
+typedef struct drm_nouveau_object_init {
+ uint32_t handle;
+ int class;
+ uint32_t flags;
+ /* these are object handles */
+ uint32_t dma0;
+ uint32_t dma1;
+ uint32_t dma_notifier;
+}
+drm_nouveau_object_init_t;
+
+typedef struct drm_nouveau_dma_object_init {
+ uint32_t handle;
+ int access;
+ int target;
+ uint32_t offset;
+ int size;
+}
+drm_nouveau_dma_object_init_t;
+
+#define NOUVEAU_MEM_FB 0x00000001
+#define NOUVEAU_MEM_AGP 0x00000002
+#define NOUVEAU_MEM_FB_ACCEPTABLE 0x00000004
+#define NOUVEAU_MEM_AGP_ACCEPTABLE 0x00000008
+#define NOUVEAU_MEM_PINNED 0x00000010
+#define NOUVEAU_MEM_USER_BACKED 0x00000020
+#define NOUVEAU_MEM_MAPPED 0x00000040
+
+typedef struct drm_nouveau_mem_alloc {
+ int flags;
+ int alignment;
+ uint64_t size; // in bytes
+ uint64_t region_offset;
+}
+drm_nouveau_mem_alloc_t;
+
+typedef struct drm_nouveau_mem_free {
+ int flags;
+ uint64_t region_offset;
+}
+drm_nouveau_mem_free_t;
+
+/* FIXME : maybe unify {GET,SET}PARAMs */
+#define NOUVEAU_GETPARAM_PCI_VENDOR 3
+#define NOUVEAU_GETPARAM_PCI_DEVICE 4
+#define NOUVEAU_GETPARAM_BUS_TYPE 5
+typedef struct drm_nouveau_getparam {
+ unsigned int param;
+ unsigned int value;
+}
+drm_nouveau_getparam_t;
+
+#define NOUVEAU_SETPARAM_CMDBUF_LOCATION 1
+#define NOUVEAU_SETPARAM_CMDBUF_SIZE 2
+typedef struct drm_nouveau_setparam {
+ unsigned int param;
+ unsigned int value;
+}
+drm_nouveau_setparam_t;
+
+enum nouveau_card_type {
+ NV_UNKNOWN =0,
+ NV_01 =1,
+ NV_03 =3,
+ NV_04 =4,
+ NV_05 =5,
+ NV_10 =10,
+ NV_20 =20,
+ NV_30 =30,
+ NV_40 =40,
+ G_70 =50,
+ NV_LAST =0xffff,
+};
+
+enum nouveau_bus_type {
+ NV_AGP =0,
+ NV_PCI =1,
+ NV_PCIE =2,
+};
+
+#define NOUVEAU_MAX_SAREA_CLIPRECTS 16
+
+typedef struct drm_nouveau_sarea {
+ /* the cliprects */
+ drm_clip_rect_t boxes[NOUVEAU_MAX_SAREA_CLIPRECTS];
+ unsigned int nbox;
+}
+drm_nouveau_sarea_t;
+
+#define DRM_NOUVEAU_FIFO_ALLOC 0x00
+#define DRM_NOUVEAU_OBJECT_INIT 0x01
+#define DRM_NOUVEAU_DMA_OBJECT_INIT 0x02 // We don't want this eventually..
+#define DRM_NOUVEAU_MEM_ALLOC 0x03
+#define DRM_NOUVEAU_MEM_FREE 0x04
+#define DRM_NOUVEAU_GETPARAM 0x05
+#define DRM_NOUVEAU_SETPARAM 0x06
+
+#endif /* __NOUVEAU_DRM_H__ */
+
--- libdrm-2.3.0/shared-core/Makefile.am.nouveau 2006-11-07 23:03:26.000000000 -0500
+++ libdrm-2.3.0/shared-core/Makefile.am 2006-11-17 11:46:07.000000000 -0500
@@ -27,6 +27,7 @@
drm.h \
drm_sarea.h \
i915_drm.h \
+ nouveau_drm.h \
mach64_drm.h \
mga_drm.h \
r128_drm.h \
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdrm/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 28 Jun 2006 00:15:18 -0000 1.7
+++ .cvsignore 19 Dec 2006 14:21:13 -0000 1.8
@@ -1 +1 @@
-libdrm-2.0.2.tar.bz2
+libdrm-2.3.0.tar.bz2
Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/FC-6/libdrm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libdrm.spec 26 Jul 2006 22:49:38 -0000 1.18
+++ libdrm.spec 19 Dec 2006 14:21:13 -0000 1.19
@@ -1,7 +1,7 @@
Summary: libdrm Direct Rendering Manager runtime library
Name: libdrm
-Version: 2.0.2
-Release: 3%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
License: MIT/X11
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -10,10 +10,12 @@
ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig automake autoconf libtool
Obsoletes: XFree86-libs, xorg-x11-libs
+Patch0: nouveau-20061117.patch
+
%description
libdrm Direct Rendering Manager runtime library
@@ -29,8 +31,10 @@
%prep
%setup -q
+%patch0 -p1 -b .nouveau
%build
+aclocal ; automake ; autoconf
%configure
make
@@ -51,7 +55,7 @@
%defattr(-,root,root,-)
%doc README
%{_libdir}/libdrm.so.2
-%{_libdir}/libdrm.so.2.0.0
+%{_libdir}/libdrm.so.2.3.0
%files devel
%defattr(-,root,root,-)
@@ -60,6 +64,7 @@
%{_includedir}/drm/drm.h
%{_includedir}/drm/drm_sarea.h
%{_includedir}/drm/i915_drm.h
+%{_includedir}/drm/nouveau_drm.h
%{_includedir}/drm/mach64_drm.h
%{_includedir}/drm/mga_drm.h
%{_includedir}/drm/r128_drm.h
@@ -69,11 +74,17 @@
%{_includedir}/drm/sis_drm.h
%{_includedir}/drm/via_3d_reg.h
%{_includedir}/drm/via_drm.h
+# FIXME should be in drm/ too
%{_includedir}/xf86drm.h
+%{_includedir}/xf86mm.h
%{_libdir}/libdrm.so
%{_libdir}/pkgconfig/libdrm.pc
%changelog
+* Fri Nov 17 2006 Adam Jackson <ajax at redhat.com> 2.3.0-1.fc7
+- Update to 2.3.0 from upstream.
+- Add nouveau userspace header.
+
* Wed Jul 26 2006 Kristian Høgsberg <krh at redhat.com> - 2.0.2-3.fc6
- Build for rawhide.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdrm/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 28 Jun 2006 00:15:18 -0000 1.7
+++ sources 19 Dec 2006 14:21:13 -0000 1.8
@@ -1 +1 @@
-db7f1f89d2571427d6ea1feb2466f577 libdrm-2.0.2.tar.bz2
+01a1e1ee0268a2403db42fa630036ab2 libdrm-2.3.0.tar.bz2
More information about the fedora-cvs-commits
mailing list