Deleted Added
full compact
r128_drv.h (113995) r128_drv.h (119098)
1/* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
2 * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
3 *
4 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All rights reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 16 unchanged lines hidden (view full) ---

25 * DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Rickard E. (Rik) Faith <faith@valinux.com>
29 * Kevin E. Martin <martin@valinux.com>
30 * Gareth Hughes <gareth@valinux.com>
31 * Michel D�nzer <daenzerm@student.ethz.ch>
32 *
1/* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
2 * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
3 *
4 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All rights reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 16 unchanged lines hidden (view full) ---

25 * DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Rickard E. (Rik) Faith <faith@valinux.com>
29 * Kevin E. Martin <martin@valinux.com>
30 * Gareth Hughes <gareth@valinux.com>
31 * Michel D�nzer <daenzerm@student.ethz.ch>
32 *
33 * $FreeBSD: head/sys/dev/drm/r128_drv.h 113995 2003-04-25 01:18:47Z anholt $
33 * $FreeBSD: head/sys/dev/drm/r128_drv.h 119098 2003-08-19 02:57:31Z anholt $
34 */
35
36#ifndef __R128_DRV_H__
37#define __R128_DRV_H__
38
39#define GET_RING_HEAD(ring) DRM_READ32( (ring)->ring_rptr, 0 ) /* (ring)->head */
40#define SET_RING_HEAD(ring,val) DRM_WRITE32( (ring)->ring_rptr, 0, (val) ) /* (ring)->head */
41

--- 102 unchanged lines hidden (view full) ---

144
145extern int r128_do_cce_idle( drm_r128_private_t *dev_priv );
146extern int r128_do_cleanup_cce( drm_device_t *dev );
147extern int r128_do_cleanup_pageflip( drm_device_t *dev );
148
149 /* r128_state.c */
150extern int r128_cce_clear( DRM_IOCTL_ARGS );
151extern int r128_cce_swap( DRM_IOCTL_ARGS );
34 */
35
36#ifndef __R128_DRV_H__
37#define __R128_DRV_H__
38
39#define GET_RING_HEAD(ring) DRM_READ32( (ring)->ring_rptr, 0 ) /* (ring)->head */
40#define SET_RING_HEAD(ring,val) DRM_WRITE32( (ring)->ring_rptr, 0, (val) ) /* (ring)->head */
41

--- 102 unchanged lines hidden (view full) ---

144
145extern int r128_do_cce_idle( drm_r128_private_t *dev_priv );
146extern int r128_do_cleanup_cce( drm_device_t *dev );
147extern int r128_do_cleanup_pageflip( drm_device_t *dev );
148
149 /* r128_state.c */
150extern int r128_cce_clear( DRM_IOCTL_ARGS );
151extern int r128_cce_swap( DRM_IOCTL_ARGS );
152extern int r128_cce_flip( DRM_IOCTL_ARGS );
152extern int r128_cce_vertex( DRM_IOCTL_ARGS );
153extern int r128_cce_indices( DRM_IOCTL_ARGS );
154extern int r128_cce_blit( DRM_IOCTL_ARGS );
155extern int r128_cce_depth( DRM_IOCTL_ARGS );
156extern int r128_cce_stipple( DRM_IOCTL_ARGS );
157extern int r128_cce_indirect( DRM_IOCTL_ARGS );
158
159

--- 180 unchanged lines hidden (view full) ---

340#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_FAN 0x00000005
341#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_STRIP 0x00000006
342#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2 0x00000007
343#define R128_CCE_VC_CNTL_PRIM_WALK_IND 0x00000010
344#define R128_CCE_VC_CNTL_PRIM_WALK_LIST 0x00000020
345#define R128_CCE_VC_CNTL_PRIM_WALK_RING 0x00000030
346#define R128_CCE_VC_CNTL_NUM_SHIFT 16
347
153extern int r128_cce_vertex( DRM_IOCTL_ARGS );
154extern int r128_cce_indices( DRM_IOCTL_ARGS );
155extern int r128_cce_blit( DRM_IOCTL_ARGS );
156extern int r128_cce_depth( DRM_IOCTL_ARGS );
157extern int r128_cce_stipple( DRM_IOCTL_ARGS );
158extern int r128_cce_indirect( DRM_IOCTL_ARGS );
159
160

--- 180 unchanged lines hidden (view full) ---

341#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_FAN 0x00000005
342#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_STRIP 0x00000006
343#define R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2 0x00000007
344#define R128_CCE_VC_CNTL_PRIM_WALK_IND 0x00000010
345#define R128_CCE_VC_CNTL_PRIM_WALK_LIST 0x00000020
346#define R128_CCE_VC_CNTL_PRIM_WALK_RING 0x00000030
347#define R128_CCE_VC_CNTL_NUM_SHIFT 16
348
349#define R128_DATATYPE_VQ 0
350#define R128_DATATYPE_CI4 1
348#define R128_DATATYPE_CI8 2
349#define R128_DATATYPE_ARGB1555 3
350#define R128_DATATYPE_RGB565 4
351#define R128_DATATYPE_RGB888 5
352#define R128_DATATYPE_ARGB8888 6
353#define R128_DATATYPE_RGB332 7
351#define R128_DATATYPE_CI8 2
352#define R128_DATATYPE_ARGB1555 3
353#define R128_DATATYPE_RGB565 4
354#define R128_DATATYPE_RGB888 5
355#define R128_DATATYPE_ARGB8888 6
356#define R128_DATATYPE_RGB332 7
357#define R128_DATATYPE_Y8 8
354#define R128_DATATYPE_RGB8 9
358#define R128_DATATYPE_RGB8 9
359#define R128_DATATYPE_CI16 10
360#define R128_DATATYPE_YVYU422 11
361#define R128_DATATYPE_VYUY422 12
362#define R128_DATATYPE_AYUV444 14
355#define R128_DATATYPE_ARGB4444 15
356
357/* Constants */
358#define R128_AGP_OFFSET 0x02000000
359
360#define R128_WATERMARK_L 16
361#define R128_WATERMARK_M 8
362#define R128_WATERMARK_N 8

--- 74 unchanged lines hidden (view full) ---

437
438/* ================================================================
439 * Ring control
440 */
441
442#if defined(__powerpc__)
443#define r128_flush_write_combine() (void) GET_RING_HEAD( &dev_priv->ring )
444#else
363#define R128_DATATYPE_ARGB4444 15
364
365/* Constants */
366#define R128_AGP_OFFSET 0x02000000
367
368#define R128_WATERMARK_L 16
369#define R128_WATERMARK_M 8
370#define R128_WATERMARK_N 8

--- 74 unchanged lines hidden (view full) ---

445
446/* ================================================================
447 * Ring control
448 */
449
450#if defined(__powerpc__)
451#define r128_flush_write_combine() (void) GET_RING_HEAD( &dev_priv->ring )
452#else
445#define r128_flush_write_combine() DRM_WRITEMEMORYBARRIER(dev_priv->ring_rptr)
453#define r128_flush_write_combine() DRM_WRITEMEMORYBARRIER()
446#endif
447
448
449#define R128_VERBOSE 0
450
451#define RING_LOCALS \
452 int write; unsigned int tail_mask; volatile u32 *ring;
453

--- 46 unchanged lines hidden ---
454#endif
455
456
457#define R128_VERBOSE 0
458
459#define RING_LOCALS \
460 int write; unsigned int tail_mask; volatile u32 *ring;
461

--- 46 unchanged lines hidden ---