- Pull in intel bufmgr changes while waiting for 2.4.5.

This commit is contained in:
Kristian Høgsberg 2009-02-23 22:14:49 +00:00
parent f64ea0b9ee
commit ebec21b5b6
2 changed files with 23 additions and 3 deletions

View File

@ -519,3 +519,23 @@ index 8e23991..6410f57 100644
typedef struct _drmMMListHead typedef struct _drmMMListHead
{ {
struct _drmMMListHead *prev; 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;

View File

@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library Summary: Direct Rendering Manager runtime library
Name: libdrm Name: libdrm
Version: 2.4.4 Version: 2.4.4
Release: 8%{?dist} Release: 9%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://dri.sourceforge.net URL: http://dri.sourceforge.net
@ -16,7 +16,7 @@ Requires: udev
BuildRequires: pkgconfig automake autoconf libtool 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 BuildRequires: libxcb-devel
@ -111,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libdrm_nouveau.pc %{_libdir}/pkgconfig/libdrm_nouveau.pc
%changelog %changelog
* Mon Feb 23 2009 Kristian Høgsberg <krh@redhat.com> - 2.4.4-8 * Mon Feb 23 2009 Kristian Høgsberg <krh@redhat.com> - 2.4.4-9
- Pull in intel bufmgr changes while waiting for 2.4.5. - Pull in intel bufmgr changes while waiting for 2.4.5.
* Mon Feb 23 2009 Dave Airlie <airlied@redhat.com> 2.4.4-6 * Mon Feb 23 2009 Dave Airlie <airlied@redhat.com> 2.4.4-6