summaryrefslogtreecommitdiff
path: root/linux-core/i810_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core/i810_drv.h')
-rw-r--r--linux-core/i810_drv.h60
1 files changed, 10 insertions, 50 deletions
diff --git a/linux-core/i810_drv.h b/linux-core/i810_drv.h
index 1c957401..e7824093 100644
--- a/linux-core/i810_drv.h
+++ b/linux-core/i810_drv.h
@@ -11,11 +11,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -67,25 +67,15 @@ typedef struct drm_i810_private {
wait_queue_head_t flush_queue; /* Processes waiting until flush */
drm_buf_t *mmap_buffer;
-
+
u32 front_di1, back_di1, zi1;
-
+
int back_offset;
int depth_offset;
int w, h;
int pitch;
} drm_i810_private_t;
- /* i810_drv.c */
-extern int i810_version(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_open(struct inode *inode, struct file *filp);
-extern int i810_release(struct inode *inode, struct file *filp);
-extern int i810_ioctl(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_unlock(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-
/* i810_dma.c */
extern int i810_dma_schedule(drm_device_t *dev, int locked);
extern int i810_getbuf(struct inode *inode, struct file *filp,
@@ -101,44 +91,15 @@ extern int i810_dma_init(struct inode *inode, struct file *filp,
extern int i810_flush_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
extern void i810_reclaim_buffers(drm_device_t *dev, pid_t pid);
-extern int i810_getage(struct inode *inode, struct file *filp, unsigned int cmd,
- unsigned long arg);
-extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
-extern int i810_copybuf(struct inode *inode, struct file *filp,
+extern int i810_getage(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
-extern int i810_docopy(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-
- /* i810_bufs.c */
-extern int i810_addbufs(struct inode *inode, struct file *filp,
+extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
+extern int i810_copybuf(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
-extern int i810_infobufs(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_markbufs(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_freebufs(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_addmap(struct inode *inode, struct file *filp,
+extern int i810_docopy(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
- /* i810_context.c */
-extern int i810_resctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_addctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_modctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_getctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_switchctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_newctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-extern int i810_rmctx(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg);
-
-extern int i810_context_switch(drm_device_t *dev, int old, int new);
-extern int i810_context_switch_complete(drm_device_t *dev, int new);
+extern void i810_dma_quiescent(drm_device_t *dev);
#define I810_VERBOSE 0
@@ -184,7 +145,7 @@ int i810_clear_bufs(struct inode *inode, struct file *filp,
#define RING_START 0x08
#define START_ADDR 0x00FFFFF8
#define RING_LEN 0x0C
-#define RING_NR_PAGES 0x000FF000
+#define RING_NR_PAGES 0x000FF000
#define RING_REPORT_MASK 0x00000006
#define RING_REPORT_64K 0x00000002
#define RING_REPORT_128K 0x00000004
@@ -222,4 +183,3 @@ int i810_clear_bufs(struct inode *inode, struct file *filp,
#endif
-