aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/via_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/via_drv.h')
-rw-r--r--drivers/char/drm/via_drv.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
index 4eaa8b7c4c96..d902dc2f4fae 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/char/drm/via_drv.h
@@ -40,8 +40,6 @@
40#define VIA_FIRE_BUF_SIZE 1024 40#define VIA_FIRE_BUF_SIZE 1024
41#define VIA_NUM_IRQS 2 41#define VIA_NUM_IRQS 2
42 42
43
44
45typedef struct drm_via_ring_buffer { 43typedef struct drm_via_ring_buffer {
46 drm_map_t map; 44 drm_map_t map;
47 char *virtual_start; 45 char *virtual_start;
@@ -55,7 +53,7 @@ typedef struct drm_via_irq {
55 uint32_t enable_mask; 53 uint32_t enable_mask;
56 wait_queue_head_t irq_queue; 54 wait_queue_head_t irq_queue;
57} drm_via_irq_t; 55} drm_via_irq_t;
58 56
59typedef struct drm_via_private { 57typedef struct drm_via_private {
60 drm_via_sarea_t *sarea_priv; 58 drm_via_sarea_t *sarea_priv;
61 drm_map_t *sarea; 59 drm_map_t *sarea;
@@ -71,9 +69,9 @@ typedef struct drm_via_private {
71 volatile uint32_t *last_pause_ptr; 69 volatile uint32_t *last_pause_ptr;
72 volatile uint32_t *hw_addr_ptr; 70 volatile uint32_t *hw_addr_ptr;
73 drm_via_ring_buffer_t ring; 71 drm_via_ring_buffer_t ring;
74 struct timeval last_vblank; 72 struct timeval last_vblank;
75 int last_vblank_valid; 73 int last_vblank_valid;
76 unsigned usec_per_vblank; 74 unsigned usec_per_vblank;
77 drm_via_state_t hc_state; 75 drm_via_state_t hc_state;
78 char pci_buf[VIA_PCI_BUF_SIZE]; 76 char pci_buf[VIA_PCI_BUF_SIZE];
79 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; 77 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
@@ -82,8 +80,8 @@ typedef struct drm_via_private {
82 drm_via_irq_t via_irqs[VIA_NUM_IRQS]; 80 drm_via_irq_t via_irqs[VIA_NUM_IRQS];
83 unsigned num_irqs; 81 unsigned num_irqs;
84 maskarray_t *irq_masks; 82 maskarray_t *irq_masks;
85 uint32_t irq_enable_mask; 83 uint32_t irq_enable_mask;
86 uint32_t irq_pending_mask; 84 uint32_t irq_pending_mask;
87} drm_via_private_t; 85} drm_via_private_t;
88 86
89/* VIA MMIO register access */ 87/* VIA MMIO register access */
@@ -110,9 +108,8 @@ extern void via_driver_irq_uninstall(drm_device_t * dev);
110extern int via_dma_cleanup(drm_device_t * dev); 108extern int via_dma_cleanup(drm_device_t * dev);
111extern void via_init_command_verifier(void); 109extern void via_init_command_verifier(void);
112extern int via_driver_dma_quiescent(drm_device_t * dev); 110extern int via_driver_dma_quiescent(drm_device_t * dev);
113extern void via_init_futex(drm_via_private_t *dev_priv); 111extern void via_init_futex(drm_via_private_t * dev_priv);
114extern void via_cleanup_futex(drm_via_private_t *dev_priv); 112extern void via_cleanup_futex(drm_via_private_t * dev_priv);
115extern void via_release_futex(drm_via_private_t *dev_priv, int context); 113extern void via_release_futex(drm_via_private_t * dev_priv, int context);
116
117 114
118#endif 115#endif