- new libdrm snapshot with modesetting for radeon interfaces

.cvsignore

@@ -1 +1 @@
-libdrm-20080303.tar.bz2
+libdrm-20080801.tar.bz2

libdrm-modeset-fix.patch

@@ -1,27 +0,0 @@
-diff -up libdrm-20080303/shared-core/drm.h.da libdrm-20080303/shared-core/drm.h
---- libdrm-20080303/shared-core/drm.h.da	2008-06-18 09:18:44.000000000 +1000
-+++ libdrm-20080303/shared-core/drm.h	2008-06-18 09:19:24.000000000 +1000
-@@ -555,10 +555,8 @@ union drm_wait_vblank {
- 	struct drm_wait_vblank_reply reply;
- };
- 
--enum drm_modeset_ctl_cmd {
--	_DRM_PRE_MODESET = 1,
--	_DRM_POST_MODESET = 2,
--};
-+#define _DRM_PRE_MODESET 1
-+#define _DRM_POST_MODESET 2
- 
- /**
-  * DRM_IOCTL_MODESET_CTL ioctl argument type
-@@ -566,8 +564,8 @@ enum drm_modeset_ctl_cmd {
-  * \sa drmModesetCtl().
-  */
- struct drm_modeset_ctl {
--	unsigned long arg;
--	enum drm_modeset_ctl_cmd cmd;
-+	uint32_t crtc;
-+	uint32_t cmd;
- };
- 
- /**

libdrm-radeon-r500.patch

@@ -1,55 +0,0 @@
-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;

libdrm.spec

@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.15%{?dist}
+Release: 0.16%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net

sources

@@ -1 +1 @@
-ead994b34decae8a63407147b640acc6  libdrm-20080303.tar.bz2
+61b25117e4e3d68395b0c9529244c909  libdrm-20080801.tar.bz2