geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
drm/bsd/drmP.h

580 lines
18 KiB
C
Raw Normal View History

First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
* Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com
*
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* 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:
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
*
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
*
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
* 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
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Rickard E. (Rik) Faith <faith@valinux.com>
* Gareth Hughes <gareth@valinux.com>
- Remove $FreeBSD$ tags as they weren't too useful and merges are now being done through perforce. - Add copyright headers to drm_os_*bsd.h, still need to research the other copyright-less files better.
2003-08-18 18:41:00 -06:00
*
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
*/
#ifndef _DRM_P_H_
#define _DRM_P_H_
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if defined(_KERNEL) || defined(__KERNEL__)
Merged bsd-1-0-1
2000-06-13 11:38:09 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* DRM template customization defaults
*/
#ifndef __HAVE_AGP
#define __HAVE_AGP 0
Merged bsd-1-0-1
2000-06-13 11:38:09 -06:00
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#ifndef __HAVE_MTRR
#define __HAVE_MTRR 0
#endif
#ifndef __HAVE_CTX_BITMAP
#define __HAVE_CTX_BITMAP 0
#endif
#ifndef __HAVE_DMA
#define __HAVE_DMA 0
#endif
- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them from __HAVE_DMA. This will be useful for adding vblank sync support to sis and tdfx. Rename dma_service to irq_handler, which is more accurately what it is. - Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have the right number of underscores. This may have been a problem in the case that the server died without doing its DRM_IOCTL_CONTROL to uninit.
2003-10-16 23:13:48 -06:00
#ifndef __HAVE_IRQ
#define __HAVE_IRQ 0
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#define DRM_DEBUG_CODE 0 /* Include debugging code (if > 1, then
also include looping detection. */
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
typedef struct drm_device drm_device_t;
typedef struct drm_file drm_file_t;
First pass of XFree86 4.0.99.2 merge.
2001-04-09 15:56:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* There's undoubtably more of this file to go into these OS dependent ones. */
Merged bsd-1-0-1
2000-06-13 11:38:09 -06:00
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#ifdef __FreeBSD__
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#include "drm_os_freebsd.h"
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#elif defined __NetBSD__
#include "drm_os_netbsd.h"
#endif
Merged bsd-1-0-1
2000-06-13 11:38:09 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#include "drm.h"
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* Begin the DRM... */
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#define DRM_HASH_SIZE 16 /* Size of key hash table */
#define DRM_KERNEL_CONTEXT 0 /* Change drm_resctx if changed */
#define DRM_RESERVED_CONTEXTS 1 /* Change drm_resctx if changed */
#define DRM_FLAG_DEBUG 0x01
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#define DRM_MEM_DMA 0
#define DRM_MEM_SAREA 1
#define DRM_MEM_DRIVER 2
#define DRM_MEM_MAGIC 3
#define DRM_MEM_IOCTLS 4
#define DRM_MEM_MAPS 5
Remove dead vma code and remove the unused devstate struct definition.
2003-03-29 11:22:28 -07:00
#define DRM_MEM_BUFS 6
#define DRM_MEM_SEGS 7
#define DRM_MEM_PAGES 8
#define DRM_MEM_FILES 9
#define DRM_MEM_QUEUES 10
#define DRM_MEM_CMDS 11
#define DRM_MEM_MAPPINGS 12
#define DRM_MEM_BUFLISTS 13
#define DRM_MEM_AGPLISTS 14
#define DRM_MEM_TOTALAGP 15
#define DRM_MEM_BOUNDAGP 16
#define DRM_MEM_CTXBITMAP 17
#define DRM_MEM_STUB 18
#define DRM_MEM_SGLISTS 19
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* Mapping helper macros */
Support AGP bridges where the AGP aperture can't be accessed directly by the CPU (David Mosberger, Benjamin Herrenschmidt, myself, Paul Mackerras, Jeff Wiedemeier)
2003-05-16 17:41:27 -06:00
#define DRM_IOREMAP(map, dev) \
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
(map)->handle = DRM(ioremap)( dev, map )
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
Support AGP bridges where the AGP aperture can't be accessed directly by the CPU (David Mosberger, Benjamin Herrenschmidt, myself, Paul Mackerras, Jeff Wiedemeier)
2003-05-16 17:41:27 -06:00
#define DRM_IOREMAP_NOCACHE(map, dev) \
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
(map)->handle = DRM(ioremap_nocache)( dev, map )
first pass at merging mesa 4.0 kernel drivers into new bsd-3-0-0 branch.
2002-03-06 12:30:45 -07:00
Support AGP bridges where the AGP aperture can't be accessed directly by the CPU (David Mosberger, Benjamin Herrenschmidt, myself, Paul Mackerras, Jeff Wiedemeier)
2003-05-16 17:41:27 -06:00
#define DRM_IOREMAPFREE(map, dev) \
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
do { \
if ( (map)->handle && (map)->size ) \
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
DRM(ioremapfree)( map ); \
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
} while (0)
/* Internal types and structures */
#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
#define DRM_MIN(a,b) ((a)<(b)?(a):(b))
#define DRM_MAX(a,b) ((a)>(b)?(a):(b))
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do { \
(_map) = (_dev)->context_sareas[_ctx]; \
} while(0)
- Converted Linux drivers to initialize DRM instances based on PCI IDs, not just a single instance. Moved the PCI ID lists from <card>_drv.c in BSD to <card>.h. The PCI ID lists include a driver private field, which may be used by drivers for chip family or other information. Based on work by jonsmirl. - Make tdfx_drv.c and tdfx.h match other drivers. - Fixed up linking of sis shared files. Tested with Radeon and SiS on Linux and FreeBSD, including a Linux setup with 2 SiS cards in a machine, but only one head being used (with DRI)
2003-10-16 21:14:39 -06:00
typedef struct drm_pci_id_list
{
int vendor;
int device;
long driver_private;
char *name;
} drm_pci_id_list_t;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
typedef struct drm_ioctl_desc {
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
int (*func)(DRM_IOCTL_ARGS);
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
int auth_needed;
int root_only;
} drm_ioctl_desc_t;
typedef struct drm_magic_entry {
drm_magic_t magic;
struct drm_file *priv;
struct drm_magic_entry *next;
} drm_magic_entry_t;
typedef struct drm_magic_head {
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
struct drm_magic_entry *head;
struct drm_magic_entry *tail;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
} drm_magic_head_t;
typedef struct drm_buf {
int idx; /* Index into master buflist */
int total; /* Buffer size */
int order; /* log-base-2(total) */
int used; /* Amount of buffer in use (for DMA) */
unsigned long offset; /* Byte offset (used internally) */
void *address; /* Address of buffer */
unsigned long bus_address; /* Bus address of buffer */
struct drm_buf *next; /* Kernel-only: used for free list */
__volatile__ int pending; /* On hardware DMA queue */
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
DRMFILE filp; /* Unique identifier of holding process */
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
int context; /* Kernel queue for this buffer */
enum {
DRM_LIST_NONE = 0,
DRM_LIST_FREE = 1,
DRM_LIST_WAIT = 2,
DRM_LIST_PEND = 3,
DRM_LIST_PRIO = 4,
DRM_LIST_RECLAIM = 5
} list; /* Which list we're on */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
int dev_priv_size; /* Size of buffer private stoarge */
void *dev_private; /* Per-buffer private storage */
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
} drm_buf_t;
typedef struct drm_freelist {
int initialized; /* Freelist in use */
atomic_t count; /* Number of free buffers */
drm_buf_t *next; /* End pointer */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
int low_mark; /* Low water mark */
int high_mark; /* High water mark */
} drm_freelist_t;
typedef struct drm_buf_entry {
int buf_size;
int buf_count;
drm_buf_t *buflist;
int seg_count;
int page_order;
Add PCI DMA memory functions and make addbufs_pci and associated code use it. To do this we need to save the bus address along with the virtual address in the seglist. Also fix some error handling and a few bits of whitespace.
2003-04-26 16:52:39 -06:00
vm_offset_t *seglist;
dma_addr_t *seglist_bus;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
drm_freelist_t freelist;
} drm_buf_entry_t;
typedef struct drm_hw_lock {
__volatile__ unsigned int lock;
char padding[60]; /* Pad to cache line */
} drm_hw_lock_t;
typedef TAILQ_HEAD(drm_file_list, drm_file) drm_file_list_t;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
struct drm_file {
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
TAILQ_ENTRY(drm_file) link;
int authenticated;
int minor;
pid_t pid;
uid_t uid;
int refs;
drm_magic_t magic;
unsigned long ioctl_count;
struct drm_device *devXX;
Memory layout transition: the 2D driver initializes MC_FB_LOCATION and related registers sanely the DRM deduces the layout from these registers clients use the new SETPARAM ioctl to tell the DRM where they think the framebuffer is located in the card's address space the DRM uses all this information to check client state and fix it up if necessary This is a prerequisite for things like direct rendering with IGP chips and video capturing.
2003-11-03 17:46:05 -07:00
#ifdef DRIVER_FILE_FIELDS
DRIVER_FILE_FIELDS;
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
};
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
typedef struct drm_lock_data {
drm_hw_lock_t *hw_lock; /* Hardware lock */
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
DRMFILE filp; /* Unique identifier of holding process (NULL is kernel)*/
- SMPng lock the DRM. This is only partial -- there are a few code paths used by root (the X Server) which are not locked. However, it should deal with lost-IRQ issues on -current which I think people have been experiencing but I am unable to reproduce (though I understand why they would occur, because of a bug of mine). Note that most of the locking (DRM_LOCK()/UNLOCK()) is all covered by Giant still, so it doesn't matter yet. - Remove locking on FreeBSD-stable and NetBSD. These are covered by the fact that there is no reentrancy of the kernel except by interrupts, which are locked using spldrm()/splx() instead.
2003-10-19 17:35:58 -06:00
int lock_queue; /* Queue of blocked processes */
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
unsigned long lock_time; /* Time of last lock in jiffies */
} drm_lock_data_t;
- SMPng lock the DRM. This is only partial -- there are a few code paths used by root (the X Server) which are not locked. However, it should deal with lost-IRQ issues on -current which I think people have been experiencing but I am unable to reproduce (though I understand why they would occur, because of a bug of mine). Note that most of the locking (DRM_LOCK()/UNLOCK()) is all covered by Giant still, so it doesn't matter yet. - Remove locking on FreeBSD-stable and NetBSD. These are covered by the fact that there is no reentrancy of the kernel except by interrupts, which are locked using spldrm()/splx() instead.
2003-10-19 17:35:58 -06:00
/* This structure, in the drm_device_t, is always initialized while the device
* is open. dev->dma_lock protects the incrementing of dev->buf_use, which
* when set marks that no further bufs may be allocated until device teardown
* occurs (when the last open of the device has closed). The high/low
* watermarks of bufs are only touched by the X Server, and thus not
* concurrently accessed, so no locking is needed.
*/
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
typedef struct drm_device_dma {
drm_buf_entry_t bufs[DRM_MAX_ORDER+1];
int buf_count;
drm_buf_t **buflist; /* Vector of pointers info bufs */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
int seg_count;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
int page_count;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
unsigned long *pagelist;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
unsigned long byte_count;
enum {
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
_DRM_DMA_USE_AGP = 0x01,
_DRM_DMA_USE_SG = 0x02
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
} flags;
/* DMA support */
drm_buf_t *this_buffer; /* Buffer being sent */
drm_buf_t *next_buffer; /* Selected buffer to send */
} drm_device_dma_t;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __REALLY_HAVE_AGP
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
typedef struct drm_agp_mem {
void *handle;
unsigned long bound; /* address */
int pages;
struct drm_agp_mem *prev;
struct drm_agp_mem *next;
} drm_agp_mem_t;
typedef struct drm_agp_head {
device_t agpdev;
struct agp_info info;
const char *chipset;
drm_agp_mem_t *memory;
unsigned long mode;
int enabled;
int acquired;
unsigned long base;
Don't ioremap the framebuffer area. The ioremapped area wasn't used by anything, and took up valuable KVA. While I'm in the area, clean up BSD MTRR stuff some more. Suggested by: jonsmirl
2003-12-16 01:57:08 -07:00
int mtrr;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
int cant_use_aperture;
unsigned long page_mask;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
} drm_agp_head_t;
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
typedef struct drm_sg_mem {
unsigned long handle;
void *virtual;
int pages;
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
dma_addr_t *busaddr;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
} drm_sg_mem_t;
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
typedef struct drm_local_map {
unsigned long offset; /* Physical address (0 for SAREA)*/
unsigned long size; /* Physical size (bytes) */
drm_map_type_t type; /* Type of memory mapped */
drm_map_flags_t flags; /* Flags */
void *handle; /* User-space: "Handle" to pass to mmap */
/* Kernel-space: kernel-virtual address */
Don't ioremap the framebuffer area. The ioremapped area wasn't used by anything, and took up valuable KVA. While I'm in the area, clean up BSD MTRR stuff some more. Suggested by: jonsmirl
2003-12-16 01:57:08 -07:00
int mtrr; /* Boolean: MTRR used */
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
/* Private data */
bus_space_tag_t iot;
bus_space_handle_t ioh;
} drm_local_map_t;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
typedef TAILQ_HEAD(drm_map_list, drm_map_list_entry) drm_map_list_t;
typedef struct drm_map_list_entry {
TAILQ_ENTRY(drm_map_list_entry) link;
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
drm_local_map_t *map;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
} drm_map_list_entry_t;
Add vblank signal code for BSD DRM. Untested so far, but working with a 4.2.0 userland at least.
2002-12-05 19:27:30 -07:00
TAILQ_HEAD(drm_vbl_sig_list, drm_vbl_sig);
typedef struct drm_vbl_sig {
TAILQ_ENTRY(drm_vbl_sig) link;
unsigned int sequence;
int signo;
int pid;
} drm_vbl_sig_t;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
struct drm_device {
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#ifdef __NetBSD__
struct device device; /* NetBSD's softc is an extension of struct device */
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
const char *name; /* Simple driver name */
char *unique; /* Unique identifier: e.g., busid */
int unique_len; /* Length of unique field */
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#ifdef __FreeBSD__
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
device_t device; /* Device instance from newbus */
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
dev_t devnode; /* Device number for mknod */
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
int if_version; /* Highest interface version set */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
int flags; /* Flags to open(2) */
/* Locks */
- SMPng lock the DRM. This is only partial -- there are a few code paths used by root (the X Server) which are not locked. However, it should deal with lost-IRQ issues on -current which I think people have been experiencing but I am unable to reproduce (though I understand why they would occur, because of a bug of mine). Note that most of the locking (DRM_LOCK()/UNLOCK()) is all covered by Giant still, so it doesn't matter yet. - Remove locking on FreeBSD-stable and NetBSD. These are covered by the fact that there is no reentrancy of the kernel except by interrupts, which are locked using spldrm()/splx() instead.
2003-10-19 17:35:58 -06:00
#if defined(__FreeBSD__) && __FreeBSD_version > 500000
#if __HAVE_DMA
struct mtx dma_lock; /* protects dev->dma */
#endif
#if __HAVE_IRQ
struct mtx irq_lock; /* protects irq condition checks */
#endif
struct mtx dev_lock; /* protects everything else */
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
/* Usage Counters */
int open_count; /* Outstanding files open */
int buf_use; /* Buffers in use -- cannot alloc */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* Performance counters */
unsigned long counters;
drm_stat_type_t types[15];
atomic_t counts[15];
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
/* Authentication */
drm_file_list_t files;
drm_magic_head_t magiclist[DRM_HASH_SIZE];
- SMPng lock the DRM. This is only partial -- there are a few code paths used by root (the X Server) which are not locked. However, it should deal with lost-IRQ issues on -current which I think people have been experiencing but I am unable to reproduce (though I understand why they would occur, because of a bug of mine). Note that most of the locking (DRM_LOCK()/UNLOCK()) is all covered by Giant still, so it doesn't matter yet. - Remove locking on FreeBSD-stable and NetBSD. These are covered by the fact that there is no reentrancy of the kernel except by interrupts, which are locked using spldrm()/splx() instead.
2003-10-19 17:35:58 -06:00
/* Linked list of mappable regions. Protected by dev_lock */
drm_map_list_t *maplist;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
drm_local_map_t **context_sareas;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
int max_context;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
drm_lock_data_t lock; /* Information on hardware lock */
/* DMA queues (contexts) */
drm_device_dma_t *dma; /* Optional pointer for DMA support */
/* Context support */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
int irq; /* Interrupt used by board */
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
int irq_enabled; /* True if the irq handler is enabled */
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
#ifdef __FreeBSD__
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
int irqrid; /* Interrupt used by board */
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
struct resource *irqr; /* Resource for interrupt used by board */
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#elif defined(__NetBSD__)
struct pci_attach_args pa;
pci_intr_handle_t ih;
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
void *irqh; /* Handle from bus_setup_intr */
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
int pci_domain;
int pci_bus;
int pci_slot;
int pci_func;
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
atomic_t context_flag; /* Context swapping flag */
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
int last_context; /* Last current context */
First pass of XFree86 4.0.99.2 merge.
2001-04-09 15:56:31 -06:00
#if __FreeBSD_version >= 400005
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
struct task task;
BSD vblank framework.
2002-09-26 01:45:07 -06:00
#endif
#if __HAVE_VBL_IRQ
- SMPng lock the DRM. This is only partial -- there are a few code paths used by root (the X Server) which are not locked. However, it should deal with lost-IRQ issues on -current which I think people have been experiencing but I am unable to reproduce (though I understand why they would occur, because of a bug of mine). Note that most of the locking (DRM_LOCK()/UNLOCK()) is all covered by Giant still, so it doesn't matter yet. - Remove locking on FreeBSD-stable and NetBSD. These are covered by the fact that there is no reentrancy of the kernel except by interrupts, which are locked using spldrm()/splx() instead.
2003-10-19 17:35:58 -06:00
int vbl_queue; /* vbl wait channel */
BSD vblank framework.
2002-09-26 01:45:07 -06:00
atomic_t vbl_received;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#ifdef __FreeBSD__
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
struct sigio *buf_sigio; /* Processes waiting for SIGIO */
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#elif defined(__NetBSD__)
pid_t buf_pgid;
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
/* Sysctl support */
struct drm_sysctl_info *sysctl;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __REALLY_HAVE_AGP
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
drm_agp_head_t *agp;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#endif
drm_sg_mem_t *sg; /* Scatter gather memory */
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
atomic_t *ctx_bitmap;
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
void *dev_private;
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
};
extern int DRM(flags);
/* Memory management support (drm_memory.h) */
extern void DRM(mem_init)(void);
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
extern void DRM(mem_uninit)(void);
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
extern void *DRM(alloc)(size_t size, int area);
Add DRM(calloc), which is convenient, used by the new sis code, and takes advantage of M_ZERO on BSDs.
2003-08-29 13:16:13 -06:00
extern void *DRM(calloc)(size_t nmemb, size_t size, int area);
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
extern void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
int area);
extern void DRM(free)(void *pt, size_t size, int area);
Merge from bsd-4-0-0-branch.
2003-02-21 16:23:09 -07:00
extern void *DRM(ioremap)(drm_device_t *dev, drm_local_map_t *map);
extern void DRM(ioremapfree)(drm_local_map_t *map);
Clean up BSD MTRR handling. The NetBSD code is untested, but it's my best shot.
2003-10-19 18:55:56 -06:00
extern int DRM(mtrr_add)(unsigned long offset, size_t size, int flags);
extern int DRM(mtrr_del)(unsigned long offset, size_t size, int flags);
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __REALLY_HAVE_AGP
extern agp_memory *DRM(alloc_agp)(int pages, u32 type);
extern int DRM(free_agp)(agp_memory *handle, int pages);
extern int DRM(bind_agp)(agp_memory *handle, unsigned int start);
extern int DRM(unbind_agp)(agp_memory *handle);
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
extern int DRM(context_switch)(drm_device_t *dev, int old, int new);
extern int DRM(context_switch_complete)(drm_device_t *dev, int new);
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __HAVE_CTX_BITMAP
extern int DRM(ctxbitmap_init)( drm_device_t *dev );
extern void DRM(ctxbitmap_cleanup)( drm_device_t *dev );
extern void DRM(ctxbitmap_free)( drm_device_t *dev, int ctx_handle );
extern int DRM(ctxbitmap_next)( drm_device_t *dev );
#endif
First pass of XFree86 4.0.99.2 merge.
2001-04-09 15:56:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
/* Locking IOCTL support (drm_lock.h) */
extern int DRM(lock_take)(__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(lock_transfer)(drm_device_t *dev,
__volatile__ unsigned int *lock,
unsigned int context);
extern int DRM(lock_free)(drm_device_t *dev,
__volatile__ unsigned int *lock,
unsigned int context);
/* Buffer management support (drm_bufs.h) */
extern int DRM(order)( unsigned long size );
#if __HAVE_DMA
/* DMA support (drm_dma.h) */
extern int DRM(dma_setup)(drm_device_t *dev);
extern void DRM(dma_takedown)(drm_device_t *dev);
extern void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf);
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
extern void DRM(reclaim_buffers)(drm_device_t *dev, DRMFILE filp);
- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them from __HAVE_DMA. This will be useful for adding vblank sync support to sis and tdfx. Rename dma_service to irq_handler, which is more accurately what it is. - Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have the right number of underscores. This may have been a problem in the case that the server died without doing its DRM_IOCTL_CONTROL to uninit.
2003-10-16 23:13:48 -06:00
#endif
#if __HAVE_IRQ
/* IRQ support (drm_irq.h) */
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
extern int DRM(irq_install)(drm_device_t *dev);
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
extern int DRM(irq_uninstall)( drm_device_t *dev );
- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them from __HAVE_DMA. This will be useful for adding vblank sync support to sis and tdfx. Rename dma_service to irq_handler, which is more accurately what it is. - Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have the right number of underscores. This may have been a problem in the case that the server died without doing its DRM_IOCTL_CONTROL to uninit.
2003-10-16 23:13:48 -06:00
extern irqreturn_t DRM(irq_handler)( DRM_IRQ_ARGS );
BSD vblank framework.
2002-09-26 01:45:07 -06:00
extern void DRM(driver_irq_preinstall)( drm_device_t *dev );
extern void DRM(driver_irq_postinstall)( drm_device_t *dev );
extern void DRM(driver_irq_uninstall)( drm_device_t *dev );
- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them from __HAVE_DMA. This will be useful for adding vblank sync support to sis and tdfx. Rename dma_service to irq_handler, which is more accurately what it is. - Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have the right number of underscores. This may have been a problem in the case that the server died without doing its DRM_IOCTL_CONTROL to uninit.
2003-10-16 23:13:48 -06:00
#if __HAVE_IRQ_BH
extern void DRM(irq_immediate_bh)( DRM_TASKQUEUE_ARGS );
First pass of XFree86 4.0.99.2 merge.
2001-04-09 15:56:31 -06:00
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#endif
BSD vblank framework.
2002-09-26 01:45:07 -06:00
#if __HAVE_VBL_IRQ
extern int DRM(vblank_wait)(drm_device_t *dev, unsigned int *vbl_seq);
Add vblank signal code for BSD DRM. Untested so far, but working with a 4.2.0 userland at least.
2002-12-05 19:27:30 -07:00
extern void DRM(vbl_send_signals)( drm_device_t *dev );
BSD vblank framework.
2002-09-26 01:45:07 -06:00
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __REALLY_HAVE_AGP
/* AGP/GART support (drm_agpsupport.h) */
extern drm_agp_head_t *DRM(agp_init)(void);
extern void DRM(agp_uninit)(void);
extern void DRM(agp_do_release)(void);
extern agp_memory *DRM(agp_allocate_memory)(size_t pages, u32 type);
extern int DRM(agp_free_memory)(agp_memory *handle);
extern int DRM(agp_bind_memory)(agp_memory *handle, off_t start);
extern int DRM(agp_unbind_memory)(agp_memory *handle);
#endif
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __HAVE_SG
/* Scatter Gather Support (drm_scatter.h) */
extern void DRM(sg_cleanup)(drm_sg_mem_t *entry);
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#if __REALLY_HAVE_SG
/* ATI PCIGART support (ati_pcigart.h) */
extern int DRM(ati_pcigart_init)(drm_device_t *dev,
unsigned long *addr,
dma_addr_t *bus_addr);
extern int DRM(ati_pcigart_cleanup)(drm_device_t *dev,
unsigned long addr,
dma_addr_t bus_addr);
Merged bsd-1-0-0
2000-05-30 11:13:31 -06:00
#endif
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
/* Locking IOCTL support (drm_drv.h) */
extern int DRM(lock)(DRM_IOCTL_ARGS);
extern int DRM(unlock)(DRM_IOCTL_ARGS);
- Introduce a new ioctl, DRM_IOCTL_SET_VERSION. This ioctl allows the server or client to notify the DRM that it expects a certain version of the device dependent or device independent interface. If the major doesn't match or minor is too large, EINVAL is returned. A major of -1 means that the requestor doesn't care about that portion of the interface. The ioctl returns the actual versions in the same struct. - Introduce DRM DI interface version 1.1. If the server requests version 1.1, then the DRM sets the unique itself according to the busid of the device it probed, which may then be accessed as normal using getunique. - Request version 1.1 in libdrm's drmOpenByBusID, allowing the X Server to request based on a BusID. Introduce a wrapper for DRM_IOCTL_SET_VERSION and bump libdrm minor version. - Pass the busid in DRIScreenInit if libdrm can handle both a busid and name. This allows drmOpenByBusID to be used to find the DRM instead of just the driver name, which allows us in the future to tie a DRM more strongly to the device it probed to. Introduce a function DRICreatePCIBusID which creates a busid in the form pci:oooo:bb:dd.f similar to linux's pci_name() function. This matches the format used by the DRM in version 1.1. libdrm knows how to match both this format and the old PCI:b:d:f format. - Use the new DRICreatePCIBusID function in the *_dri.c to request the new, more exact busid format.
2003-10-22 20:23:31 -06:00
extern int DRM(version)( DRM_IOCTL_ARGS );
extern int DRM(setversion)( DRM_IOCTL_ARGS );
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
/* Misc. IOCTL support (drm_ioctl.h) */
- Tie the DRM to a specific device: setunique no longer succeeds when given a busid that doesn't correspond to the device the DRM is attached to. This is a breaking of backwards-compatibility only for the multiple-DRI-head case with X Servers that don't use interface 1.1. - Move irq_busid to drm_irq.h and make it only return the IRQ for the current device. Retains compatibility with previous X Servers, cleans up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be changed if necessary. - Bump interface version to 1.2. This version when set signifies that the control ioctl should ignore the irq number passed in and enable the interrupt handler for the attached device. Otherwise it errors out when the passed-in irq is not equal to the device's. - Store the highest version the interface has been set to in the device. - Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves irq_uninstall being done without the lock in some cases, but it was racey anyways.
2003-11-05 01:13:52 -07:00
extern int DRM(irq_by_busid)(DRM_IOCTL_ARGS);
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
extern int DRM(getunique)(DRM_IOCTL_ARGS);
extern int DRM(setunique)(DRM_IOCTL_ARGS);
extern int DRM(getmap)(DRM_IOCTL_ARGS);
extern int DRM(getclient)(DRM_IOCTL_ARGS);
extern int DRM(getstats)(DRM_IOCTL_ARGS);
Remove more gamma DMA code. This isn't all of it, but it's a major portion.
2003-04-24 00:19:54 -06:00
extern int DRM(noop)(DRM_IOCTL_ARGS);
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
/* Context IOCTL support (drm_context.h) */
extern int DRM(resctx)(DRM_IOCTL_ARGS);
extern int DRM(addctx)(DRM_IOCTL_ARGS);
extern int DRM(modctx)(DRM_IOCTL_ARGS);
extern int DRM(getctx)(DRM_IOCTL_ARGS);
extern int DRM(switchctx)(DRM_IOCTL_ARGS);
extern int DRM(newctx)(DRM_IOCTL_ARGS);
extern int DRM(rmctx)(DRM_IOCTL_ARGS);
extern int DRM(setsareactx)(DRM_IOCTL_ARGS);
extern int DRM(getsareactx)(DRM_IOCTL_ARGS);
/* Drawable IOCTL support (drm_drawable.h) */
extern int DRM(adddraw)(DRM_IOCTL_ARGS);
extern int DRM(rmdraw)(DRM_IOCTL_ARGS);
/* Authentication IOCTL support (drm_auth.h) */
extern int DRM(getmagic)(DRM_IOCTL_ARGS);
extern int DRM(authmagic)(DRM_IOCTL_ARGS);
/* Buffer management support (drm_bufs.h) */
extern int DRM(addmap)(DRM_IOCTL_ARGS);
extern int DRM(rmmap)(DRM_IOCTL_ARGS);
#if __HAVE_DMA
extern int DRM(addbufs)(DRM_IOCTL_ARGS);
extern int DRM(infobufs)(DRM_IOCTL_ARGS);
extern int DRM(markbufs)(DRM_IOCTL_ARGS);
extern int DRM(freebufs)(DRM_IOCTL_ARGS);
extern int DRM(mapbufs)(DRM_IOCTL_ARGS);
#endif
- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle them from __HAVE_DMA. This will be useful for adding vblank sync support to sis and tdfx. Rename dma_service to irq_handler, which is more accurately what it is. - Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have the right number of underscores. This may have been a problem in the case that the server died without doing its DRM_IOCTL_CONTROL to uninit.
2003-10-16 23:13:48 -06:00
/* IRQ support (drm_irq.h) */
#if __HAVE_IRQ || __HAVE_DMA
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
extern int DRM(control)(DRM_IOCTL_ARGS);
#endif
#if __HAVE_VBL_IRQ
extern int DRM(wait_vblank)(DRM_IOCTL_ARGS);
#endif
/* AGP/GART support (drm_agpsupport.h) */
#if __REALLY_HAVE_AGP
extern int DRM(agp_acquire)(DRM_IOCTL_ARGS);
extern int DRM(agp_release)(DRM_IOCTL_ARGS);
extern int DRM(agp_enable)(DRM_IOCTL_ARGS);
extern int DRM(agp_info)(DRM_IOCTL_ARGS);
extern int DRM(agp_alloc)(DRM_IOCTL_ARGS);
extern int DRM(agp_free)(DRM_IOCTL_ARGS);
extern int DRM(agp_unbind)(DRM_IOCTL_ARGS);
extern int DRM(agp_bind)(DRM_IOCTL_ARGS);
#endif
/* Scatter Gather Support (drm_scatter.h) */
#if __HAVE_SG
extern int DRM(sg_alloc)(DRM_IOCTL_ARGS);
extern int DRM(sg_free)(DRM_IOCTL_ARGS);
#endif
Add PCI DMA memory functions and make addbufs_pci and associated code use it. To do this we need to save the bus address along with the virtual address in the seglist. Also fix some error handling and a few bits of whitespace.
2003-04-26 16:52:39 -06:00
/* consistent PCI memory functions (drm_pci.h) */
extern void *DRM(pci_alloc)(drm_device_t *dev, size_t size,
size_t align, dma_addr_t maxaddr,
dma_addr_t *busaddr);
extern void DRM(pci_free)(drm_device_t *dev, size_t size,
void *vaddr, dma_addr_t busaddr);
Add DRMFILE definitions and supply filp for BSD in the post-drm-filp-0-1-branch world. The filp is a void * cast from the current pid. This is a temporary solution which maintains the status quo until a proper solution is implemented. What is really needed is a unique pointer per open, hopefully with a device private area. This can be done in FreeBSD for all entry points except mmap, but is difficult (sys/dev/streams/streams.c is an example). I have partially completed code for this but have not had time to debug, so this is a temporary fix.
2003-03-28 20:38:47 -07:00
First pass merge of XFree86 4.2.0 import.
2002-01-27 13:05:42 -07:00
#endif /* __KERNEL__ */
merged bsd-3-0-0-branch
2002-07-05 02:31:11 -06:00
#endif /* _DRM_P_H_ */