summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2001-11-26 11:21:10 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2001-11-26 11:21:10 +0000
commit6f8928665eb52c688cde846287e6e4e5d689e4db (patch)
tree0cd4ed593db0050e7d05dba566ab32ceda05343a
parent92f782949b15acbf1c22fe6a40591f0487a8d7f6 (diff)
version number bumps
-rw-r--r--linux-core/i810_dma.c2
-rw-r--r--linux-core/i810_drv.c10
-rw-r--r--linux-core/r128_drv.c4
-rw-r--r--linux-core/radeon_drv.c8
-rw-r--r--linux/i810_dma.c2
-rw-r--r--linux/i810_drv.c10
-rw-r--r--linux/r128_drv.c4
-rw-r--r--linux/radeon_drm.h2
-rw-r--r--linux/radeon_drv.c8
-rw-r--r--linux/radeon_state.c16
10 files changed, 51 insertions, 15 deletions
diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index 87145941..1798533d 100644
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -1000,7 +1000,7 @@ int i810_dma_vertex(struct inode *inode, struct file *filp,
buf_priv = buf->dev_private;
if (vertex.idx < 0 || vertex.idx >= I810_DMA_BUF_NR) {
- DRM_ERROR("i810_dma_vertex2 bad buffer idx\n");
+ DRM_ERROR("i810_dma_vertex bad buffer idx\n");
return -EINVAL;
}
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index ebed0d66..61c30ffb 100644
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -41,8 +41,16 @@
#define DRIVER_DESC "Intel i810"
#define DRIVER_DATE "20010917"
+/* Interface history
+ *
+ * 1.0
+ * 2.0 - Security fixes.
+ * 2.1 - Add i810_dma_vertex2 ioctl,
+ * - Disable copying code (leave stub ioctls for backwards compatibility)
+ *
+ */
#define DRIVER_MAJOR 2
-#define DRIVER_MINOR 0
+#define DRIVER_MINOR 1
#define DRIVER_PATCHLEVEL 0
#define DRIVER_IOCTLS \
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 86cd3e76..d8d7be4f 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -41,8 +41,8 @@
#define DRIVER_DESC "ATI Rage 128"
#define DRIVER_DATE "20010917"
-#define DRIVER_MAJOR 3
-#define DRIVER_MINOR 0
+#define DRIVER_MAJOR 2
+#define DRIVER_MINOR 2
#define DRIVER_PATCHLEVEL 0
#define DRIVER_IOCTLS \
diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index b2c43805..847c71c9 100644
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -43,8 +43,12 @@
#define DRIVER_MINOR 2
#define DRIVER_PATCHLEVEL 0
-/* 1.1 - ??
- * 1.2 - Add vertex2 ioctl, add stencil capability to clear ioctl
+/* Interface history:
+ *
+ * 1.1 - ??
+ * 1.2 - Add vertex2 ioctl (keith)
+ * - Add stencil capability to clear ioctl (gareth, keith)
+ * - Increase MAX_TEXTURE_LEVELS (brian)
*/
#define DRIVER_IOCTLS \
[DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { radeon_cp_buffers, 1, 0 }, \
diff --git a/linux/i810_dma.c b/linux/i810_dma.c
index 87145941..1798533d 100644
--- a/linux/i810_dma.c
+++ b/linux/i810_dma.c
@@ -1000,7 +1000,7 @@ int i810_dma_vertex(struct inode *inode, struct file *filp,
buf_priv = buf->dev_private;
if (vertex.idx < 0 || vertex.idx >= I810_DMA_BUF_NR) {
- DRM_ERROR("i810_dma_vertex2 bad buffer idx\n");
+ DRM_ERROR("i810_dma_vertex bad buffer idx\n");
return -EINVAL;
}
diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index ebed0d66..61c30ffb 100644
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -41,8 +41,16 @@
#define DRIVER_DESC "Intel i810"
#define DRIVER_DATE "20010917"
+/* Interface history
+ *
+ * 1.0
+ * 2.0 - Security fixes.
+ * 2.1 - Add i810_dma_vertex2 ioctl,
+ * - Disable copying code (leave stub ioctls for backwards compatibility)
+ *
+ */
#define DRIVER_MAJOR 2
-#define DRIVER_MINOR 0
+#define DRIVER_MINOR 1
#define DRIVER_PATCHLEVEL 0
#define DRIVER_IOCTLS \
diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index 86cd3e76..d8d7be4f 100644
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -41,8 +41,8 @@
#define DRIVER_DESC "ATI Rage 128"
#define DRIVER_DATE "20010917"
-#define DRIVER_MAJOR 3
-#define DRIVER_MINOR 0
+#define DRIVER_MAJOR 2
+#define DRIVER_MINOR 2
#define DRIVER_PATCHLEVEL 0
#define DRIVER_IOCTLS \
diff --git a/linux/radeon_drm.h b/linux/radeon_drm.h
index 70937d87..1b1b3a0b 100644
--- a/linux/radeon_drm.h
+++ b/linux/radeon_drm.h
@@ -97,7 +97,7 @@
#define RADEON_NR_TEX_REGIONS 64
#define RADEON_LOG_TEX_GRANULARITY 16
-#define RADEON_MAX_TEXTURE_LEVELS 11
+#define RADEON_MAX_TEXTURE_LEVELS 12
#define RADEON_MAX_TEXTURE_UNITS 3
#endif /* __RADEON_SAREA_DEFINES__ */
diff --git a/linux/radeon_drv.c b/linux/radeon_drv.c
index b2c43805..847c71c9 100644
--- a/linux/radeon_drv.c
+++ b/linux/radeon_drv.c
@@ -43,8 +43,12 @@
#define DRIVER_MINOR 2
#define DRIVER_PATCHLEVEL 0
-/* 1.1 - ??
- * 1.2 - Add vertex2 ioctl, add stencil capability to clear ioctl
+/* Interface history:
+ *
+ * 1.1 - ??
+ * 1.2 - Add vertex2 ioctl (keith)
+ * - Add stencil capability to clear ioctl (gareth, keith)
+ * - Increase MAX_TEXTURE_LEVELS (brian)
*/
#define DRIVER_IOCTLS \
[DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { radeon_cp_buffers, 1, 0 }, \
diff --git a/linux/radeon_state.c b/linux/radeon_state.c
index 81404cde..40a43c1e 100644
--- a/linux/radeon_state.c
+++ b/linux/radeon_state.c
@@ -573,6 +573,13 @@ static void radeon_cp_dispatch_clear( drm_device_t *dev,
RADEON_VTX_FMT_RADEON_MODE |
(3 << RADEON_NUM_VERTICES_SHIFT)) );
+/* printk( "depth box %d: %x %x %x %x\n", */
+/* i, */
+/* depth_boxes[i].ui[CLEAR_X1], */
+/* depth_boxes[i].ui[CLEAR_Y1], */
+/* depth_boxes[i].ui[CLEAR_X2], */
+/* depth_boxes[i].ui[CLEAR_Y2]); */
+
OUT_RING( depth_boxes[i].ui[CLEAR_X1] );
OUT_RING( depth_boxes[i].ui[CLEAR_Y1] );
OUT_RING( depth_boxes[i].ui[CLEAR_DEPTH] );
@@ -1542,13 +1549,18 @@ int radeon_cp_vertex2( struct inode *inode, struct file *filp,
}
if ( prim.stateidx != laststate ) {
- drm_radeon_state_t state;
-
+ drm_radeon_state_t state;
+
if ( copy_from_user( &state,
&vertex.state[prim.stateidx],
sizeof(state) ) )
return -EFAULT;
+/* printk("emit state %d (%p) dirty %x\n", */
+/* prim.stateidx, */
+/* &vertex.state[prim.stateidx], */
+/* state.dirty); */
+
radeon_emit_state2( dev_priv, &state );
laststate = prim.stateidx;