auto-import libdrm-2.3.0-4.fc7 on branch devel from
libdrm-2.3.0-4.fc7.src.rpm
This commit is contained in:
Adam Jackson
parent
c128678b12
commit
63ffb8c824
22
libdrm.spec
22
libdrm.spec
@ -1,8 +1,8 @@
|
|||||||
Summary: libdrm Direct Rendering Manager runtime library
|
Summary: Direct Rendering Manager runtime library
|
||||||
Name: libdrm
|
Name: libdrm
|
||||||
Version: 2.3.0
|
Version: 2.3.0
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: MIT/X11
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://dri.sourceforge.net
|
URL: http://dri.sourceforge.net
|
||||||
Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
|
Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
|
||||||
@ -10,23 +10,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|||||||
|
|
||||||
BuildRequires: pkgconfig automake autoconf libtool
|
BuildRequires: pkgconfig automake autoconf libtool
|
||||||
|
|
||||||
Obsoletes: XFree86-libs, xorg-x11-libs
|
Patch0: nouveau.patch
|
||||||
|
|
||||||
Patch0: nouveau-20061117.patch
|
|
||||||
Patch1: libdrm-2.3.0-default-mode.patch
|
Patch1: libdrm-2.3.0-default-mode.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
libdrm Direct Rendering Manager runtime library
|
Direct Rendering Manager runtime library
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: libdrm-devel
|
Summary: Direct Rendering Manager development package
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
Obsoletes: XFree86-devel, xorg-x11-devel
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
libdrm Direct Rendering Manager development package
|
Direct Rendering Manager development package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
@ -81,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pkgconfig/libdrm.pc
|
%{_libdir}/pkgconfig/libdrm.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 19 2007 Adam Jackson <ajax@redhat.com> 2.3.0-4
|
||||||
|
- Update nouveau patch
|
||||||
|
- Fix License tag and other rpmlint noise
|
||||||
|
|
||||||
* Fri Feb 02 2007 Adam Jackson <ajax@redhat.com> 2.3.0-3
|
* Fri Feb 02 2007 Adam Jackson <ajax@redhat.com> 2.3.0-3
|
||||||
- Remove ExclusiveArch.
|
- Remove ExclusiveArch.
|
||||||
|
|
||||||
|
|||||||
166
nouveau.patch
Normal file
166
nouveau.patch
Normal file
@ -0,0 +1,166 @@
|
|||||||
|
--- /dev/null 2006-10-24 10:09:24.521518763 -0400
|
||||||
|
+++ libdrm-2.3.0/shared-core/nouveau_drm.h 2007-02-13 18:10:33.000000000 -0500
|
||||||
|
@@ -0,0 +1,153 @@
|
||||||
|
+/*
|
||||||
|
+ * 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
|
||||||
|
+#define NOUVEAU_MEM_INSTANCE 0x00000080 /* internal */
|
||||||
|
+
|
||||||
|
+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
|
||||||
|
+#define NOUVEAU_GETPARAM_FB_PHYSICAL 6
|
||||||
|
+#define NOUVEAU_GETPARAM_AGP_PHYSICAL 7
|
||||||
|
+typedef struct drm_nouveau_getparam {
|
||||||
|
+ unsigned int param;
|
||||||
|
+ unsigned int dummy;
|
||||||
|
+ uint64_t 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_11 =10,
|
||||||
|
+ NV_15 =10,
|
||||||
|
+ NV_17 =10,
|
||||||
|
+ NV_20 =20,
|
||||||
|
+ NV_25 =20,
|
||||||
|
+ NV_30 =30,
|
||||||
|
+ NV_34 =30,
|
||||||
|
+ NV_40 =40,
|
||||||
|
+ NV_44 =44,
|
||||||
|
+ NV_50 =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 2007-02-13 18:10:11.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 \
|
||||||
Loading…
Reference in New Issue
Block a user