diff options
| -rw-r--r-- | meta/packages/drm/files/poulsbo.patch | 131 | ||||
| -rw-r--r-- | meta/packages/drm/libdrm_2.4.4.bb | 2 |
2 files changed, 1 insertions, 132 deletions
diff --git a/meta/packages/drm/files/poulsbo.patch b/meta/packages/drm/files/poulsbo.patch index 7dda90a2f5..91f8975f50 100644 --- a/meta/packages/drm/files/poulsbo.patch +++ b/meta/packages/drm/files/poulsbo.patch @@ -728,19 +728,6 @@ Index: libdrm-2.4.4/libdrm/xf86mm.h + + +#endif -Index: libdrm-2.4.4/Makefile.am -=================================================================== ---- libdrm-2.4.4.orig/Makefile.am 2008-10-09 20:02:10.000000000 +0100 -+++ libdrm-2.4.4/Makefile.am 2009-02-04 16:39:55.000000000 +0000 -@@ -22,7 +22,7 @@ - # here too, but let's just do libdrm for now - - AUTOMAKE_OPTIONS = foreign --SUBDIRS = libdrm shared-core tests -+SUBDIRS = libdrm shared-core - - pkgconfigdir = @pkgconfigdir@ - pkgconfig_DATA = libdrm.pc Index: libdrm-2.4.4/shared-core/drm.h =================================================================== --- libdrm-2.4.4.orig/shared-core/drm.h 2008-12-17 18:28:24.000000000 +0000 @@ -787,33 +774,6 @@ Index: libdrm-2.4.4/shared-core/drm.h /*@}*/ /** -Index: libdrm-2.4.4/shared-core/i915_drm.h -=================================================================== ---- libdrm-2.4.4.orig/shared-core/i915_drm.h 2008-12-23 00:03:35.000000000 +0000 -+++ libdrm-2.4.4/shared-core/i915_drm.h 2009-02-04 16:39:55.000000000 +0000 -@@ -767,4 +767,22 @@ - uint64_t aper_available_size; - }; - -+/* -+ * Relocation header is 4 uint32_ts -+ * 0 - (16-bit relocation type << 16)| 16 bit reloc count -+ * 1 - buffer handle for another list of relocs -+ * 2-3 - spare. -+ */ -+#define I915_RELOC_HEADER 4 -+ -+/* -+ * type 0 relocation has 4-uint32_t stride -+ * 0 - offset into buffer -+ * 1 - delta to add in -+ * 2 - index into buffer list -+ * 3 - reserved (for optimisations later). -+ */ -+#define I915_RELOC_TYPE_0 0 -+#define I915_RELOC0_STRIDE 4 -+ - #endif /* _I915_DRM_H_ */ Index: libdrm-2.4.4/shared-core/Makefile.am =================================================================== --- libdrm-2.4.4.orig/shared-core/Makefile.am 2008-12-17 18:28:24.000000000 +0000 @@ -827,23 +787,6 @@ Index: libdrm-2.4.4/shared-core/Makefile.am r128_drm.h \ radeon_drm.h \ savage_drm.h \ -Index: libdrm-2.4.4/shared-core/nouveau_drm.h -=================================================================== ---- libdrm-2.4.4.orig/shared-core/nouveau_drm.h 2008-10-09 20:02:11.000000000 +0100 -+++ libdrm-2.4.4/shared-core/nouveau_drm.h 2009-02-04 16:39:55.000000000 +0000 -@@ -144,9 +144,12 @@ - NV_05 =5, - NV_10 =10, - NV_11 =11, -+ NV_15 =11, - NV_17 =17, - NV_20 =20, -+ NV_25 =20, - NV_30 =30, -+ NV_34 =30, - NV_40 =40, - NV_44 =44, - NV_50 =50, Index: libdrm-2.4.4/shared-core/psb_drm.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -2559,80 +2502,6 @@ Index: libdrm-2.4.4/shared-core/psb_reg.h + + +#endif -Index: libdrm-2.4.4/shared-core/radeon_drm.h -=================================================================== ---- libdrm-2.4.4.orig/shared-core/radeon_drm.h 2008-10-09 20:02:11.000000000 +0100 -+++ libdrm-2.4.4/shared-core/radeon_drm.h 2009-02-04 16:39:55.000000000 +0000 -@@ -453,8 +453,17 @@ - int pfCurrentPage; /* which buffer is being displayed? */ - int crtc2_base; /* CRTC2 frame offset */ - int tiling_enabled; /* set by drm, read by 2d + 3d clients */ -+ -+ unsigned int last_fence; - } drm_radeon_sarea_t; - -+/* The only fence class we support */ -+#define DRM_RADEON_FENCE_CLASS_ACCEL 0 -+/* Fence type that guarantees read-write flush */ -+#define DRM_RADEON_FENCE_TYPE_RW 2 -+/* cache flushes programmed just before the fence */ -+#define DRM_RADEON_FENCE_FLAG_FLUSHED 0x01000000 -+ - /* WARNING: If you change any of these defines, make sure to change the - * defines in the Xserver file (xf86drmRadeon.h) - * -Index: libdrm-2.4.4/shared-core/tdfx_drv.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libdrm-2.4.4/shared-core/tdfx_drv.h 2009-02-04 16:39:55.000000000 +0000 -@@ -0,0 +1,47 @@ -+/* tdfx.h -- 3dfx DRM template customization -*- linux-c -*- -+ * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com -+ */ -+/* -+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. -+ * 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. -+ * -+ * Authors: -+ * Gareth Hughes <gareth@valinux.com> -+ */ -+ -+#ifndef __TDFX_H__ -+#define __TDFX_H__ -+ -+/* General customization: -+ */ -+ -+#define DRIVER_AUTHOR "VA Linux Systems Inc." -+ -+#define DRIVER_NAME "tdfx" -+#define DRIVER_DESC "3dfx Banshee/Voodoo3+" -+#define DRIVER_DATE "20010216" -+ -+#define DRIVER_MAJOR 1 -+#define DRIVER_MINOR 0 -+#define DRIVER_PATCHLEVEL 0 -+ -+#endif Index: libdrm-2.4.4/libdrm/Makefile.am =================================================================== --- libdrm-2.4.4.orig/libdrm/Makefile.am 2009-02-04 16:42:01.000000000 +0000 diff --git a/meta/packages/drm/libdrm_2.4.4.bb b/meta/packages/drm/libdrm_2.4.4.bb index ddb3776adb..8198592f8e 100644 --- a/meta/packages/drm/libdrm_2.4.4.bb +++ b/meta/packages/drm/libdrm_2.4.4.bb @@ -2,7 +2,7 @@ SECTION = "x11/base" LICENSE = "MIT" SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \ file://poulsbo.patch;patch=1" -PR = "r2" +PR = "r3" PROVIDES = "drm" DEPENDS = "libpthread-stubs" |