Deleted Added
sdiff udiff text old ( 119098 ) new ( 119895 )
full compact
radeon_drv.h (119098) radeon_drv.h (119895)
1/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
2 *
3 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
4 * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
5 * All rights reserved.
6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the "Software"),

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

22 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
23 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
24 * DEALINGS IN THE SOFTWARE.
25 *
26 * Authors:
27 * Kevin E. Martin <martin@valinux.com>
28 * Gareth Hughes <gareth@valinux.com>
29 *
1/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
2 *
3 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
4 * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
5 * All rights reserved.
6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the "Software"),

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

22 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
23 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
24 * DEALINGS IN THE SOFTWARE.
25 *
26 * Authors:
27 * Kevin E. Martin <martin@valinux.com>
28 * Gareth Hughes <gareth@valinux.com>
29 *
30 * $FreeBSD: head/sys/dev/drm/radeon_drv.h 119098 2003-08-19 02:57:31Z anholt $
30 * $FreeBSD: head/sys/dev/drm/radeon_drv.h 119895 2003-09-09 00:24:31Z anholt $
31 */
32
33#ifndef __RADEON_DRV_H__
34#define __RADEON_DRV_H__
35
36#define GET_RING_HEAD(dev_priv) DRM_READ32( (dev_priv)->ring_rptr, 0 )
37#define SET_RING_HEAD(dev_priv,val) DRM_WRITE32( (dev_priv)->ring_rptr, 0, (val) )
38

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

70 int size;
71 DRMFILE filp; /* 0: free, -1: heap, other: real files */
72};
73
74typedef struct drm_radeon_private {
75 drm_radeon_ring_buffer_t ring;
76 drm_radeon_sarea_t *sarea_priv;
77
31 */
32
33#ifndef __RADEON_DRV_H__
34#define __RADEON_DRV_H__
35
36#define GET_RING_HEAD(dev_priv) DRM_READ32( (dev_priv)->ring_rptr, 0 )
37#define SET_RING_HEAD(dev_priv,val) DRM_WRITE32( (dev_priv)->ring_rptr, 0, (val) )
38

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

70 int size;
71 DRMFILE filp; /* 0: free, -1: heap, other: real files */
72};
73
74typedef struct drm_radeon_private {
75 drm_radeon_ring_buffer_t ring;
76 drm_radeon_sarea_t *sarea_priv;
77
78 int agp_size;
79 u32 agp_vm_start;
80 unsigned long agp_buffers_offset;
78 int gart_size;
79 u32 gart_vm_start;
80 unsigned long gart_buffers_offset;
81
82 int cp_mode;
83 int cp_running;
84
85 drm_radeon_freelist_t *head;
86 drm_radeon_freelist_t *tail;
87 int last_buf;
88 volatile u32 *scratch;

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

127
128 drm_radeon_depth_clear_t depth_clear;
129
130 unsigned long fb_offset;
131 unsigned long mmio_offset;
132 unsigned long ring_offset;
133 unsigned long ring_rptr_offset;
134 unsigned long buffers_offset;
81
82 int cp_mode;
83 int cp_running;
84
85 drm_radeon_freelist_t *head;
86 drm_radeon_freelist_t *tail;
87 int last_buf;
88 volatile u32 *scratch;

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

127
128 drm_radeon_depth_clear_t depth_clear;
129
130 unsigned long fb_offset;
131 unsigned long mmio_offset;
132 unsigned long ring_offset;
133 unsigned long ring_rptr_offset;
134 unsigned long buffers_offset;
135 unsigned long agp_textures_offset;
135 unsigned long gart_textures_offset;
136
137 drm_local_map_t *sarea;
138 drm_local_map_t *fb;
139 drm_local_map_t *mmio;
140 drm_local_map_t *cp_ring;
141 drm_local_map_t *ring_rptr;
142 drm_local_map_t *buffers;
136
137 drm_local_map_t *sarea;
138 drm_local_map_t *fb;
139 drm_local_map_t *mmio;
140 drm_local_map_t *cp_ring;
141 drm_local_map_t *ring_rptr;
142 drm_local_map_t *buffers;
143 drm_local_map_t *agp_textures;
143 drm_local_map_t *gart_textures;
144
144
145 struct mem_block *agp_heap;
145 struct mem_block *gart_heap;
146 struct mem_block *fb_heap;
147
148 /* SW interrupt */
149 wait_queue_head_t swi_queue;
150 atomic_t swi_emitted;
151
152} drm_radeon_private_t;
153

--- 755 unchanged lines hidden --- 		146 struct mem_block *fb_heap;
147
148 /* SW interrupt */
149 wait_queue_head_t swi_queue;
150 atomic_t swi_emitted;
151
152} drm_radeon_private_t;
153

--- 755 unchanged lines hidden ---