From ebec21b5b6aae4cf9af6429a5fa156eb953e1ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 23 Feb 2009 22:14:49 +0000 Subject: [PATCH] - Pull in intel bufmgr changes while waiting for 2.4.5. --- libdrm-intel.patch | 20 ++++++++++++++++++++ libdrm.spec | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/libdrm-intel.patch b/libdrm-intel.patch index cbb8e1e..7186b9d 100644 --- a/libdrm-intel.patch +++ b/libdrm-intel.patch @@ -519,3 +519,23 @@ index 8e23991..6410f57 100644 typedef struct _drmMMListHead { struct _drmMMListHead *prev; +diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h +index 04ab4cf..5456e91 100644 +--- a/shared-core/i915_drm.h ++++ b/shared-core/i915_drm.h +@@ -296,6 +296,7 @@ typedef struct drm_i915_irq_wait { + #define I915_PARAM_LAST_DISPATCH 3 + #define I915_PARAM_CHIPSET_ID 4 + #define I915_PARAM_HAS_GEM 5 ++#define I915_PARAM_NUM_FENCES_AVAIL 6 + + typedef struct drm_i915_getparam { + int param; +@@ -307,6 +308,7 @@ typedef struct drm_i915_getparam { + #define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1 + #define I915_SETPARAM_TEX_LRU_LOG_GRANULARITY 2 + #define I915_SETPARAM_ALLOW_BATCHBUFFER 3 ++#define I915_SETPARAM_NUM_USED_FENCES 4 + + typedef struct drm_i915_setparam { + int param; diff --git a/libdrm.spec b/libdrm.spec index b5d7a66..80f2816 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.4 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -16,7 +16,7 @@ Requires: udev BuildRequires: pkgconfig automake autoconf libtool -BuildRequires: kernel-headers >= 2.6.27-0.317.rc5.git10.fc10 +BuildRequires: kernel-headers >= 2.6.29-0.145.rc6.fc11 BuildRequires: libxcb-devel @@ -111,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libdrm_nouveau.pc %changelog -* Mon Feb 23 2009 Kristian Høgsberg - 2.4.4-8 +* Mon Feb 23 2009 Kristian Høgsberg - 2.4.4-9 - Pull in intel bufmgr changes while waiting for 2.4.5. * Mon Feb 23 2009 Dave Airlie 2.4.4-6