rpms/libdrm/devel .cvsignore, 1.15, 1.16 libdrm-gtt-map-support-3.patch, 1.1, 1.2 libdrm.spec, 1.49, 1.50 sources, 1.15, 1.16 libdrm-wait-udev.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4525

Modified Files:
	.cvsignore libdrm-gtt-map-support-3.patch libdrm.spec sources 
Removed Files:
	libdrm-wait-udev.patch 
Log Message:
- move intel bufmgr code around - update patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Aug 2008 05:51:06 -0000	1.15
+++ .cvsignore	30 Sep 2008 07:43:43 -0000	1.16
@@ -1 +1 @@
-libdrm-20080814.tar.bz2
+libdrm-20080930.tar.bz2

libdrm-gtt-map-support-3.patch:

Index: libdrm-gtt-map-support-3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-gtt-map-support-3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdrm-gtt-map-support-3.patch	9 Sep 2008 06:44:16 -0000	1.1
+++ libdrm-gtt-map-support-3.patch	30 Sep 2008 07:43:43 -0000	1.2
@@ -1,28 +1,15 @@
-diff --git a/libdrm/intel/intel_bufmgr.h b/libdrm/intel/intel_bufmgr.h
-index 4d33521..59def00 100644
---- a/libdrm/intel/intel_bufmgr.h
-+++ b/libdrm/intel/intel_bufmgr.h
-@@ -126,5 +126,7 @@ int intel_bo_set_tiling(dri_bo *buf, uint32_t *tiling_mode);
- 
- int intel_bo_flink(dri_bo *buf, uint32_t *name);
- 
-+int dri_gem_bo_map_gtt(dri_bo *bo);
-+
- #endif /* INTEL_BUFMGR_GEM_H */
- 
-diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c
-index af20efb..ba49b24 100644
---- a/libdrm/intel/intel_bufmgr_gem.c
-+++ b/libdrm/intel/intel_bufmgr_gem.c
-@@ -35,6 +35,7 @@
-  */
+diff -up libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c.gttmap libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c
+--- libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c.gttmap	2008-09-30 14:17:27.000000000 +1000
++++ libdrm-20080930/libdrm/intel/intel_bufmgr_gem.c	2008-09-30 17:35:51.000000000 +1000
+@@ -39,6 +39,7 @@
+ #endif
  
  #include <xf86drm.h>
 +#include <fcntl.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -42,6 +43,8 @@
+@@ -46,6 +47,8 @@
  #include <assert.h>
  #include <sys/ioctl.h>
  #include <sys/mman.h>
@@ -30,16 +17,8 @@
 +#include <sys/types.h>
  
  #include "errno.h"
- #include "dri_bufmgr.h"
-@@ -370,6 +373,7 @@ intel_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
-     bo_gem->refcount = 1;
-     bo_gem->validate_index = -1;
-     bo_gem->gem_handle = open_arg.handle;
-+    bo_gem->bo.handle = bo_gem->gem_handle;
- 
-     DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
- 
-@@ -517,6 +521,90 @@ dri_gem_bo_map(dri_bo *bo, int write_enable)
+ #include "intel_bufmgr.h"
+@@ -518,6 +521,90 @@ dri_gem_bo_map(dri_bo *bo, int write_ena
      return 0;
  }
  
@@ -130,7 +109,7 @@
  static int
  dri_gem_bo_unmap(dri_bo *bo)
  {
-@@ -593,7 +681,7 @@ dri_gem_bo_get_subdata (dri_bo *bo, unsigned long offset,
+@@ -594,7 +681,7 @@ dri_gem_bo_get_subdata (dri_bo *bo, unsi
      return 0;
  }
  
@@ -139,9 +118,21 @@
  dri_gem_bo_wait_rendering(dri_bo *bo)
  {
      dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bo->bufmgr;
-diff -up libdrm-20080814/shared-core/i915_drm.h.da libdrm-20080814/shared-core/i915_drm.h
---- libdrm-20080814/shared-core/i915_drm.h.da	2008-09-09 16:43:43.000000000 +1000
-+++ libdrm-20080814/shared-core/i915_drm.h	2008-09-09 16:43:45.000000000 +1000
+diff -up libdrm-20080930/libdrm/intel/intel_bufmgr.h.gttmap libdrm-20080930/libdrm/intel/intel_bufmgr.h
+--- libdrm-20080930/libdrm/intel/intel_bufmgr.h.gttmap	2008-09-30 14:17:27.000000000 +1000
++++ libdrm-20080930/libdrm/intel/intel_bufmgr.h	2008-09-30 17:34:10.000000000 +1000
+@@ -89,6 +89,8 @@ int dri_bo_unpin(dri_bo *buf);
+ int dri_bo_set_tiling(dri_bo *buf, uint32_t *tiling_mode);
+ int dri_bo_flink(dri_bo *buf, uint32_t *name);
+ 
++int dri_gem_bo_map_gtt(dri_bo *bo);
++
+ /* intel_bufmgr_gem.c */
+ dri_bufmgr *intel_bufmgr_gem_init(int fd, int batch_size);
+ dri_bo *intel_bo_gem_create_from_name(dri_bufmgr *bufmgr, const char *name,
+diff -up libdrm-20080930/shared-core/i915_drm.h.gttmap libdrm-20080930/shared-core/i915_drm.h
+--- libdrm-20080930/shared-core/i915_drm.h.gttmap	2008-09-30 14:17:27.000000000 +1000
++++ libdrm-20080930/shared-core/i915_drm.h	2008-09-30 17:01:13.000000000 +1000
 @@ -99,7 +99,7 @@ typedef struct drm_i915_sarea {
  	int tex_size;
  	int log_tex_granularity;


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libdrm.spec	9 Sep 2008 06:44:16 -0000	1.49
+++ libdrm.spec	30 Sep 2008 07:43:43 -0000	1.50
@@ -1,9 +1,9 @@
-%define gitdate 20080814
+%define gitdate 20080930
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.20%{?dist}
+Release: 0.21%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -25,7 +25,6 @@
 # - funk that just bash it direct for now -
 Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
-Patch5: libdrm-wait-udev.patch
 Patch6: libdrm-gtt-map-support-3.patch
 
 %description
@@ -45,7 +44,6 @@
 #patch2 -p1 -b .mknod
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
-%patch5 -p1 -b .udev-wait
 %patch6 -p1 -b .gttmap
 
 %build
@@ -65,7 +63,7 @@
 # NOTE: We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 find $RPM_BUILD_ROOT -type f -name '*_drm.h' | xargs rm -f -- || :
-for i in drm.h drm_sarea.h r300_reg.h via_3d_reg.h
+for i in drm.h drm_mode.h drm_sarea.h r300_reg.h via_3d_reg.h
 do
 rm -f $RPM_BUILD_ROOT/usr/include/drm/$i
 done
@@ -81,6 +79,8 @@
 %doc README
 %{_libdir}/libdrm.so.2
 %{_libdir}/libdrm.so.2.3.0
+%{_libdir}/libdrm_intel.so.1
+%{_libdir}/libdrm_intel.so.1.0.0
 %{_sysconfdir}/udev/rules.d/91-drm-modeset.rules
 %{_sysconfdir}/modprobe.d/i915modeset
 
@@ -89,12 +89,15 @@
 # FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
 %{_includedir}/xf86drmMode.h
-%{_includedir}/dri_bufmgr.h
 %{_includedir}/intel_bufmgr.h
 %{_libdir}/libdrm.so
+%{_libdir}/libdrm_intel.so
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Tue Sep 30 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.21
+- move intel bufmgr code around - update patches
+
 * Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.20
 - add gtt mapping for intel modesetting
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	14 Aug 2008 05:51:06 -0000	1.15
+++ sources	30 Sep 2008 07:43:43 -0000	1.16
@@ -1 +1 @@
-2af5325c8ae923a7cbaea3671bc7b969  libdrm-20080814.tar.bz2
+30049dfd7ad96e0beb5edf01f0af422e  libdrm-20080930.tar.bz2


--- libdrm-wait-udev.patch DELETED ---