fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-01-06 21:20:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

version number bumps

Browse source
This commit is contained in:
Keith Whitwell 2001-11-26 11:21:10 +00:00
parent 92f782949b
commit 6f8928665e
10 changed files with 51 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux-core/i810_dma.c
View file

@ -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;
}

10
linux-core/i810_drv.c
View file

@ -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 \

4
linux-core/r128_drv.c
View file

@ -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 \

8
linux-core/radeon_drv.c
View file

@ -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 }, \

2
linux/i810_dma.c
View file

@ -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;
}

10
linux/i810_drv.c
View file

@ -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 \

4
linux/r128_drv.c
View file

@ -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 \

2
linux/radeon_drm.h
View file

@ -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__ */

8
linux/radeon_drv.c
View file

@ -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 }, \

16
linux/radeon_state.c
View file

@ -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;