rpms/libdrm/F-9 libdrm-radeon-r500.patch, NONE, 1.1 libdrm.spec, 1.40, 1.41

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21302

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-radeon-r500.patch 
Log Message:
* Wed May 28 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.12
- add r500 support patch


libdrm-radeon-r500.patch:

--- NEW FILE libdrm-radeon-r500.patch ---
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
index 0971f97..ffaa46e 100644
--- a/shared-core/radeon_drm.h
+++ b/shared-core/radeon_drm.h
@@ -225,9 +225,22 @@ typedef union {
 #define R300_CMD_WAIT			7
 #	define R300_WAIT_2D		0x1
 #	define R300_WAIT_3D		0x2
+/* these two defines are DOING IT WRONG - however
+ * we have userspace which relies on using these.
+ * The wait interface is backwards compat new 
+ * code should use the NEW_WAIT defines below
+ * THESE ARE NOT BIT FIELDS
+ */
 #	define R300_WAIT_2D_CLEAN	0x3
 #	define R300_WAIT_3D_CLEAN	0x4
+
+#	define R300_NEW_WAIT_2D_3D	0x3
+#	define R300_NEW_WAIT_2D_2D_CLEAN	0x4
+#	define R300_NEW_WAIT_3D_3D_CLEAN	0x6
+#	define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN	0x8
+
 #define R300_CMD_SCRATCH		8
+#define R300_CMD_R500FP                 9
 
 typedef union {
 	unsigned int u;
@@ -256,6 +269,9 @@ typedef union {
 	struct {
 		unsigned char cmd_type, reg, n_bufs, flags;
 	} scratch;
+	struct {
+		unsigned char cmd_type, count, adrlo, adrhi_flags;
+	} r500fp;
 } drm_r300_cmd_header_t;
 
 #define RADEON_FRONT			0x1
@@ -266,6 +282,9 @@ typedef union {
 #define RADEON_USE_HIERZ		0x40000000
 #define RADEON_USE_COMP_ZBUF		0x20000000
 
+#define R500FP_CONSTANT_TYPE  (1 << 1)
+#define R500FP_CONSTANT_CLAMP (1 << 2)
+
 /* Primitive types
  */
 #define RADEON_POINTS			0x1
@@ -657,6 +676,7 @@ typedef struct drm_radeon_indirect {
 #define RADEON_PARAM_CARD_TYPE             12
 #define RADEON_PARAM_VBLANK_CRTC           13   /* VBLANK CRTC */
 #define RADEON_PARAM_FB_LOCATION           14   /* FB location */
+#define RADEON_PARAM_NUM_GB_PIPES          15   /* num GB pipes */
 
 typedef struct drm_radeon_getparam {
 	int param;


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-9/libdrm.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libdrm.spec	29 Apr 2008 13:51:12 -0000	1.40
+++ libdrm.spec	28 May 2008 05:14:00 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.11%{?dist}
+Release: 0.12%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -23,6 +23,7 @@
 # - 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-radeon-r500.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -41,6 +42,7 @@
 #patch2 -p1 -b .mknod
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
+%patch5 -p1 -b .r500
 
 %build
 autoreconf -v --install || exit 1
@@ -98,6 +100,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Wed May 28 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.12
+- add r500 support patch
+
 * Tue Apr 29 2008 Adam Jackson <ajax at redhat.com> 2.4.0-0.11
 - libdrm-2.4.0-no-bc.patch: Delete the /proc/dri BC code.  It's not needed,
   and the kernel implementation is sufficiently broken that we should avoid