mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-20 12:50:11 +01:00
merged trunk into r200 branch
This commit is contained in:
Keith Whitwell
parent
db32792cc7
commit
6d211331e6
42 changed files with 369 additions and 4698 deletions
|
|
@ -7,12 +7,6 @@ SRCS= mga_drv.c mga_state.c mga_warp.c mga_dma.c
|
||||||
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS = r128_cce.c r128_drv.c r128_state.c
|
||||||
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS = radeon_cp.c radeon_drv.c radeon_state.c radeon_irq.c radeon_mem.c
|
||||||
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS= tdfx_drv.c
|
||||||
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS = gamma_drv.c gamma_dma.c
|
||||||
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
116
bsd/i810.h
116
bsd/i810.h
|
|
@ -1,116 +0,0 @@
|
||||||
/* i810.h -- Intel i810/i815 DRM template customization -*- linux-c -*-
|
|
||||||
* Created: Thu Feb 15 00:01:12 2001 by gareth@valinux.com
|
|
||||||
*
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* 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:
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
* OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __I810_H__
|
|
||||||
#define __I810_H__
|
|
||||||
|
|
||||||
/* This remains constant for all DRM template files.
|
|
||||||
*/
|
|
||||||
#define DRM(x) i810_##x
|
|
||||||
|
|
||||||
/* General customization:
|
|
||||||
*/
|
|
||||||
#define __HAVE_AGP 1
|
|
||||||
#define __MUST_HAVE_AGP 1
|
|
||||||
#define __HAVE_MTRR 1
|
|
||||||
#define __HAVE_CTX_BITMAP 1
|
|
||||||
|
|
||||||
/* Driver customization:
|
|
||||||
*/
|
|
||||||
#define __HAVE_RELEASE 1
|
|
||||||
#define DRIVER_RELEASE() do { \
|
|
||||||
i810_reclaim_buffers( dev, priv->pid ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* DMA customization:
|
|
||||||
*/
|
|
||||||
#define __HAVE_DMA 1
|
|
||||||
#define __HAVE_DMA_QUEUE 1
|
|
||||||
#define __HAVE_DMA_WAITLIST 1
|
|
||||||
#define __HAVE_DMA_RECLAIM 1
|
|
||||||
|
|
||||||
#define __HAVE_DMA_QUIESCENT 1
|
|
||||||
#define DRIVER_DMA_QUIESCENT() do { \
|
|
||||||
i810_dma_quiescent( dev ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define __HAVE_DMA_IRQ 1
|
|
||||||
#define __HAVE_DMA_IRQ_BH 1
|
|
||||||
#define __HAVE_SHARED_IRQ 1
|
|
||||||
#define DRIVER_PREINSTALL() do { \
|
|
||||||
drm_i810_private_t *dev_priv = \
|
|
||||||
(drm_i810_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
tmp = I810_READ16( I810REG_HWSTAM ); \
|
|
||||||
tmp = tmp & 0x6000; \
|
|
||||||
I810_WRITE16( I810REG_HWSTAM, tmp ); \
|
|
||||||
\
|
|
||||||
tmp = I810_READ16( I810REG_INT_MASK_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Unmask interrupts */ \
|
|
||||||
I810_WRITE16( I810REG_INT_MASK_R, tmp ); \
|
|
||||||
tmp = I810_READ16( I810REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Disable all interrupts */ \
|
|
||||||
I810_WRITE16( I810REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DRIVER_POSTINSTALL() do { \
|
|
||||||
drm_i810_private_t *dev_priv = \
|
|
||||||
(drm_i810_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
tmp = I810_READ16( I810REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; \
|
|
||||||
tmp = tmp | 0x0003; /* Enable bp & user interrupts */ \
|
|
||||||
I810_WRITE16( I810REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DRIVER_UNINSTALL() do { \
|
|
||||||
drm_i810_private_t *dev_priv = \
|
|
||||||
(drm_i810_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
if ( dev_priv ) { \
|
|
||||||
tmp = I810_READ16( I810REG_INT_IDENTITY_R ); \
|
|
||||||
tmp = tmp & ~(0x6000); /* Clear all interrupts */ \
|
|
||||||
if ( tmp != 0 ) \
|
|
||||||
I810_WRITE16( I810REG_INT_IDENTITY_R, tmp ); \
|
|
||||||
\
|
|
||||||
tmp = I810_READ16( I810REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Disable all interrupts */ \
|
|
||||||
I810_WRITE16( I810REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* Buffer customization:
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define DRIVER_BUF_PRIV_T drm_i810_buf_priv_t
|
|
||||||
|
|
||||||
#define DRIVER_AGP_BUFFERS_MAP( dev ) \
|
|
||||||
((drm_i810_private_t *)((dev)->dev_private))->buffer_map
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
# $FreeBSD$
|
|
||||||
|
|
||||||
KMOD= i810
|
|
||||||
NOMAN= YES
|
|
||||||
SRCS= i810_drv.c i810_dma.c
|
|
||||||
SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h
|
|
||||||
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if ${MACHINE_ARCH} == "i386"
|
|
||||||
# This line enables linux ioctl handling
|
|
||||||
# If you want support for this uncomment this line
|
|
||||||
#I810_OPTS= "\#define DRM_LINUX" 1
|
|
||||||
.endif
|
|
||||||
|
|
||||||
opt_drm_linux.h:
|
|
||||||
touch opt_drm_linux.h
|
|
||||||
echo $(I810_OPTS) >> opt_drm_linux.h
|
|
||||||
|
|
||||||
.include <bsd.kmod.mk>
|
|
||||||
1223
bsd/i810_dma.c
1223
bsd/i810_dma.c
File diff suppressed because it is too large
Load diff
221
bsd/i810_drm.h
221
bsd/i810_drm.h
|
|
@ -1,221 +0,0 @@
|
||||||
#ifndef _I810_DRM_H_
|
|
||||||
#define _I810_DRM_H_
|
|
||||||
|
|
||||||
/* WARNING: These defines must be the same as what the Xserver uses.
|
|
||||||
* if you change them, you must change the defines in the Xserver.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _I810_DEFINES_
|
|
||||||
#define _I810_DEFINES_
|
|
||||||
|
|
||||||
#define I810_DMA_BUF_ORDER 12
|
|
||||||
#define I810_DMA_BUF_SZ (1<<I810_DMA_BUF_ORDER)
|
|
||||||
#define I810_DMA_BUF_NR 256
|
|
||||||
#define I810_NR_SAREA_CLIPRECTS 8
|
|
||||||
|
|
||||||
/* Each region is a minimum of 64k, and there are at most 64 of them.
|
|
||||||
*/
|
|
||||||
#define I810_NR_TEX_REGIONS 64
|
|
||||||
#define I810_LOG_MIN_TEX_REGION_SIZE 16
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define I810_UPLOAD_TEX0IMAGE 0x1 /* handled clientside */
|
|
||||||
#define I810_UPLOAD_TEX1IMAGE 0x2 /* handled clientside */
|
|
||||||
#define I810_UPLOAD_CTX 0x4
|
|
||||||
#define I810_UPLOAD_BUFFERS 0x8
|
|
||||||
#define I810_UPLOAD_TEX0 0x10
|
|
||||||
#define I810_UPLOAD_TEX1 0x20
|
|
||||||
#define I810_UPLOAD_CLIPRECTS 0x40
|
|
||||||
|
|
||||||
|
|
||||||
/* Indices into buf.Setup where various bits of state are mirrored per
|
|
||||||
* context and per buffer. These can be fired at the card as a unit,
|
|
||||||
* or in a piecewise fashion as required.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Destbuffer state
|
|
||||||
* - backbuffer linear offset and pitch -- invarient in the current dri
|
|
||||||
* - zbuffer linear offset and pitch -- also invarient
|
|
||||||
* - drawing origin in back and depth buffers.
|
|
||||||
*
|
|
||||||
* Keep the depth/back buffer state here to acommodate private buffers
|
|
||||||
* in the future.
|
|
||||||
*/
|
|
||||||
#define I810_DESTREG_DI0 0 /* CMD_OP_DESTBUFFER_INFO (2 dwords) */
|
|
||||||
#define I810_DESTREG_DI1 1
|
|
||||||
#define I810_DESTREG_DV0 2 /* GFX_OP_DESTBUFFER_VARS (2 dwords) */
|
|
||||||
#define I810_DESTREG_DV1 3
|
|
||||||
#define I810_DESTREG_DR0 4 /* GFX_OP_DRAWRECT_INFO (4 dwords) */
|
|
||||||
#define I810_DESTREG_DR1 5
|
|
||||||
#define I810_DESTREG_DR2 6
|
|
||||||
#define I810_DESTREG_DR3 7
|
|
||||||
#define I810_DESTREG_DR4 8
|
|
||||||
#define I810_DEST_SETUP_SIZE 10
|
|
||||||
|
|
||||||
/* Context state
|
|
||||||
*/
|
|
||||||
#define I810_CTXREG_CF0 0 /* GFX_OP_COLOR_FACTOR */
|
|
||||||
#define I810_CTXREG_CF1 1
|
|
||||||
#define I810_CTXREG_ST0 2 /* GFX_OP_STIPPLE */
|
|
||||||
#define I810_CTXREG_ST1 3
|
|
||||||
#define I810_CTXREG_VF 4 /* GFX_OP_VERTEX_FMT */
|
|
||||||
#define I810_CTXREG_MT 5 /* GFX_OP_MAP_TEXELS */
|
|
||||||
#define I810_CTXREG_MC0 6 /* GFX_OP_MAP_COLOR_STAGES - stage 0 */
|
|
||||||
#define I810_CTXREG_MC1 7 /* GFX_OP_MAP_COLOR_STAGES - stage 1 */
|
|
||||||
#define I810_CTXREG_MC2 8 /* GFX_OP_MAP_COLOR_STAGES - stage 2 */
|
|
||||||
#define I810_CTXREG_MA0 9 /* GFX_OP_MAP_ALPHA_STAGES - stage 0 */
|
|
||||||
#define I810_CTXREG_MA1 10 /* GFX_OP_MAP_ALPHA_STAGES - stage 1 */
|
|
||||||
#define I810_CTXREG_MA2 11 /* GFX_OP_MAP_ALPHA_STAGES - stage 2 */
|
|
||||||
#define I810_CTXREG_SDM 12 /* GFX_OP_SRC_DEST_MONO */
|
|
||||||
#define I810_CTXREG_FOG 13 /* GFX_OP_FOG_COLOR */
|
|
||||||
#define I810_CTXREG_B1 14 /* GFX_OP_BOOL_1 */
|
|
||||||
#define I810_CTXREG_B2 15 /* GFX_OP_BOOL_2 */
|
|
||||||
#define I810_CTXREG_LCS 16 /* GFX_OP_LINEWIDTH_CULL_SHADE_MODE */
|
|
||||||
#define I810_CTXREG_PV 17 /* GFX_OP_PV_RULE -- Invarient! */
|
|
||||||
#define I810_CTXREG_ZA 18 /* GFX_OP_ZBIAS_ALPHAFUNC */
|
|
||||||
#define I810_CTXREG_AA 19 /* GFX_OP_ANTIALIAS */
|
|
||||||
#define I810_CTX_SETUP_SIZE 20
|
|
||||||
|
|
||||||
/* Texture state (per tex unit)
|
|
||||||
*/
|
|
||||||
#define I810_TEXREG_MI0 0 /* GFX_OP_MAP_INFO (4 dwords) */
|
|
||||||
#define I810_TEXREG_MI1 1
|
|
||||||
#define I810_TEXREG_MI2 2
|
|
||||||
#define I810_TEXREG_MI3 3
|
|
||||||
#define I810_TEXREG_MF 4 /* GFX_OP_MAP_FILTER */
|
|
||||||
#define I810_TEXREG_MLC 5 /* GFX_OP_MAP_LOD_CTL */
|
|
||||||
#define I810_TEXREG_MLL 6 /* GFX_OP_MAP_LOD_LIMITS */
|
|
||||||
#define I810_TEXREG_MCS 7 /* GFX_OP_MAP_COORD_SETS ??? */
|
|
||||||
#define I810_TEX_SETUP_SIZE 8
|
|
||||||
|
|
||||||
#define I810_FRONT 0x1
|
|
||||||
#define I810_BACK 0x2
|
|
||||||
#define I810_DEPTH 0x4
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct _drm_i810_init {
|
|
||||||
enum {
|
|
||||||
I810_INIT_DMA = 0x01,
|
|
||||||
I810_CLEANUP_DMA = 0x02
|
|
||||||
} func;
|
|
||||||
#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
|
|
||||||
int ring_map_idx;
|
|
||||||
int buffer_map_idx;
|
|
||||||
#else
|
|
||||||
unsigned int mmio_offset;
|
|
||||||
unsigned int buffers_offset;
|
|
||||||
#endif
|
|
||||||
int sarea_priv_offset;
|
|
||||||
unsigned int ring_start;
|
|
||||||
unsigned int ring_end;
|
|
||||||
unsigned int ring_size;
|
|
||||||
unsigned int front_offset;
|
|
||||||
unsigned int back_offset;
|
|
||||||
unsigned int depth_offset;
|
|
||||||
unsigned int overlay_offset;
|
|
||||||
unsigned int overlay_physical;
|
|
||||||
unsigned int w;
|
|
||||||
unsigned int h;
|
|
||||||
unsigned int pitch;
|
|
||||||
unsigned int pitch_bits;
|
|
||||||
} drm_i810_init_t;
|
|
||||||
|
|
||||||
/* Warning: If you change the SAREA structure you must change the Xserver
|
|
||||||
* structure as well */
|
|
||||||
|
|
||||||
typedef struct _drm_i810_tex_region {
|
|
||||||
unsigned char next, prev; /* indices to form a circular LRU */
|
|
||||||
unsigned char in_use; /* owned by a client, or free? */
|
|
||||||
int age; /* tracked by clients to update local LRU's */
|
|
||||||
} drm_i810_tex_region_t;
|
|
||||||
|
|
||||||
typedef struct _drm_i810_sarea {
|
|
||||||
unsigned int ContextState[I810_CTX_SETUP_SIZE];
|
|
||||||
unsigned int BufferState[I810_DEST_SETUP_SIZE];
|
|
||||||
unsigned int TexState[2][I810_TEX_SETUP_SIZE];
|
|
||||||
unsigned int dirty;
|
|
||||||
|
|
||||||
unsigned int nbox;
|
|
||||||
drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
|
|
||||||
|
|
||||||
/* Maintain an LRU of contiguous regions of texture space. If
|
|
||||||
* you think you own a region of texture memory, and it has an
|
|
||||||
* age different to the one you set, then you are mistaken and
|
|
||||||
* it has been stolen by another client. If global texAge
|
|
||||||
* hasn't changed, there is no need to walk the list.
|
|
||||||
*
|
|
||||||
* These regions can be used as a proxy for the fine-grained
|
|
||||||
* texture information of other clients - by maintaining them
|
|
||||||
* in the same lru which is used to age their own textures,
|
|
||||||
* clients have an approximate lru for the whole of global
|
|
||||||
* texture space, and can make informed decisions as to which
|
|
||||||
* areas to kick out. There is no need to choose whether to
|
|
||||||
* kick out your own texture or someone else's - simply eject
|
|
||||||
* them all in LRU order.
|
|
||||||
*/
|
|
||||||
|
|
||||||
drm_i810_tex_region_t texList[I810_NR_TEX_REGIONS+1];
|
|
||||||
/* Last elt is sentinal */
|
|
||||||
int texAge; /* last time texture was uploaded */
|
|
||||||
int last_enqueue; /* last time a buffer was enqueued */
|
|
||||||
int last_dispatch; /* age of the most recently dispatched buffer */
|
|
||||||
int last_quiescent; /* */
|
|
||||||
int ctxOwner; /* last context to upload state */
|
|
||||||
|
|
||||||
int vertex_prim;
|
|
||||||
|
|
||||||
} drm_i810_sarea_t;
|
|
||||||
|
|
||||||
/* WARNING: If you change any of these defines, make sure to change the
|
|
||||||
* defines in the Xserver file (xf86drmMga.h)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* i810 specific ioctls
|
|
||||||
* The device specific ioctl range is 0x40 to 0x79.
|
|
||||||
*/
|
|
||||||
#define DRM_IOCTL_I810_INIT DRM_IOW( 0x40, drm_i810_init_t)
|
|
||||||
#define DRM_IOCTL_I810_VERTEX DRM_IOW( 0x41, drm_i810_vertex_t)
|
|
||||||
#define DRM_IOCTL_I810_CLEAR DRM_IOW( 0x42, drm_i810_clear_t)
|
|
||||||
#define DRM_IOCTL_I810_FLUSH DRM_IO( 0x43)
|
|
||||||
#define DRM_IOCTL_I810_GETAGE DRM_IO( 0x44)
|
|
||||||
#define DRM_IOCTL_I810_GETBUF DRM_IOWR(0x45, drm_i810_dma_t)
|
|
||||||
#define DRM_IOCTL_I810_SWAP DRM_IO( 0x46)
|
|
||||||
#define DRM_IOCTL_I810_COPY DRM_IOW( 0x47, drm_i810_copy_t)
|
|
||||||
#define DRM_IOCTL_I810_DOCOPY DRM_IO( 0x48)
|
|
||||||
#define DRM_IOCTL_I810_OV0INFO DRM_IOR( 0x49, drm_i810_overlay_t)
|
|
||||||
#define DRM_IOCTL_I810_FSTATUS DRM_IO ( 0x4a)
|
|
||||||
#define DRM_IOCTL_I810_OV0FLIP DRM_IO ( 0x4b)
|
|
||||||
#define DRM_IOCTL_I810_MC DRM_IOW( 0x4c, drm_i810_mc_t)
|
|
||||||
#define DRM_IOCTL_I810_RSTATUS DRM_IO ( 0x4d )
|
|
||||||
|
|
||||||
typedef struct _drm_i810_clear {
|
|
||||||
int clear_color;
|
|
||||||
int clear_depth;
|
|
||||||
int flags;
|
|
||||||
} drm_i810_clear_t;
|
|
||||||
|
|
||||||
/* These may be placeholders if we have more cliprects than
|
|
||||||
* I810_NR_SAREA_CLIPRECTS. In that case, the client sets discard to
|
|
||||||
* false, indicating that the buffer will be dispatched again with a
|
|
||||||
* new set of cliprects.
|
|
||||||
*/
|
|
||||||
typedef struct _drm_i810_vertex {
|
|
||||||
int idx; /* buffer index */
|
|
||||||
int used; /* nr bytes in use */
|
|
||||||
int discard; /* client is finished with the buffer? */
|
|
||||||
} drm_i810_vertex_t;
|
|
||||||
|
|
||||||
typedef struct _drm_i810_copy_t {
|
|
||||||
int idx; /* buffer index */
|
|
||||||
int used; /* nr bytes in use */
|
|
||||||
void *address; /* Address to copy from */
|
|
||||||
} drm_i810_copy_t;
|
|
||||||
|
|
||||||
typedef struct drm_i810_dma {
|
|
||||||
void *virtual;
|
|
||||||
int request_idx;
|
|
||||||
int request_size;
|
|
||||||
int granted;
|
|
||||||
} drm_i810_dma_t;
|
|
||||||
|
|
||||||
#endif /* _I810_DRM_H_ */
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
/* i810_drv.c -- I810 driver -*- linux-c -*-
|
|
||||||
* Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
|
|
||||||
*
|
|
||||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* 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:
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* 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>
|
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/bus.h>
|
|
||||||
#include <pci/pcivar.h>
|
|
||||||
|
|
||||||
#include "i810.h"
|
|
||||||
#include "drmP.h"
|
|
||||||
#include "drm.h"
|
|
||||||
#include "i810_drm.h"
|
|
||||||
#include "i810_drv.h"
|
|
||||||
|
|
||||||
#define DRIVER_AUTHOR "VA Linux Systems Inc."
|
|
||||||
|
|
||||||
#define DRIVER_NAME "i810"
|
|
||||||
#define DRIVER_DESC "Intel i810"
|
|
||||||
#define DRIVER_DATE "20010616"
|
|
||||||
|
|
||||||
#define DRIVER_MAJOR 1
|
|
||||||
#define DRIVER_MINOR 2
|
|
||||||
#define DRIVER_PATCHLEVEL 0
|
|
||||||
|
|
||||||
/* Device IDs unknown. Can someone help? anholt@teleport.com */
|
|
||||||
drm_chipinfo_t DRM(devicelist)[] = {
|
|
||||||
{0, 0, 0, NULL}
|
|
||||||
};
|
|
||||||
|
|
||||||
#define DRIVER_IOCTLS \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_INIT)] = { i810_dma_init, 1, 1 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_VERTEX)] = { i810_dma_vertex, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_CLEAR)] = { i810_clear_bufs, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_FLUSH)] = { i810_flush_ioctl, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_GETAGE)] = { i810_getage, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_GETBUF)] = { i810_getbuf, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_SWAP)] = { i810_swap_bufs, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_COPY)] = { i810_copybuf, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I810_DOCOPY)] = { i810_docopy, 1, 0 },
|
|
||||||
|
|
||||||
|
|
||||||
#define __HAVE_COUNTERS 4
|
|
||||||
#define __HAVE_COUNTER6 _DRM_STAT_IRQ
|
|
||||||
#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY
|
|
||||||
#define __HAVE_COUNTER8 _DRM_STAT_SECONDARY
|
|
||||||
#define __HAVE_COUNTER9 _DRM_STAT_DMA
|
|
||||||
|
|
||||||
|
|
||||||
#include "drm_agpsupport.h"
|
|
||||||
#include "drm_auth.h"
|
|
||||||
#include "drm_bufs.h"
|
|
||||||
#include "drm_context.h"
|
|
||||||
#include "drm_dma.h"
|
|
||||||
#include "drm_drawable.h"
|
|
||||||
#include "drm_drv.h"
|
|
||||||
|
|
||||||
|
|
||||||
#include "drm_fops.h"
|
|
||||||
#include "drm_init.h"
|
|
||||||
#include "drm_ioctl.h"
|
|
||||||
#include "drm_lock.h"
|
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_memory.h"
|
|
||||||
#include "drm_vm.h"
|
|
||||||
#include "drm_sysctl.h"
|
|
||||||
|
|
||||||
DRIVER_MODULE(i810, pci, i810_driver, i810_devclass, 0, 0);
|
|
||||||
179
bsd/i810_drv.h
179
bsd/i810_drv.h
|
|
@ -1,179 +0,0 @@
|
||||||
/* i810_drv.h -- Private header for the Matrox g200/g400 driver -*- linux-c -*-
|
|
||||||
* Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
|
|
||||||
*
|
|
||||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* 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:
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* 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>
|
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _I810_DRV_H_
|
|
||||||
#define _I810_DRV_H_
|
|
||||||
|
|
||||||
typedef struct drm_i810_buf_priv {
|
|
||||||
u32 *in_use;
|
|
||||||
int my_use_idx;
|
|
||||||
int currently_mapped;
|
|
||||||
void *virtual;
|
|
||||||
void *kernel_virtual;
|
|
||||||
int map_count;
|
|
||||||
struct vm_area_struct *vma;
|
|
||||||
} drm_i810_buf_priv_t;
|
|
||||||
|
|
||||||
typedef struct _drm_i810_ring_buffer{
|
|
||||||
int tail_mask;
|
|
||||||
unsigned long Start;
|
|
||||||
unsigned long End;
|
|
||||||
unsigned long Size;
|
|
||||||
u8 *virtual_start;
|
|
||||||
int head;
|
|
||||||
int tail;
|
|
||||||
int space;
|
|
||||||
} drm_i810_ring_buffer_t;
|
|
||||||
|
|
||||||
typedef struct drm_i810_private {
|
|
||||||
drm_map_t *sarea_map;
|
|
||||||
drm_map_t *buffer_map;
|
|
||||||
drm_map_t *mmio_map;
|
|
||||||
|
|
||||||
drm_i810_sarea_t *sarea_priv;
|
|
||||||
drm_i810_ring_buffer_t ring;
|
|
||||||
|
|
||||||
unsigned long hw_status_page;
|
|
||||||
unsigned long counter;
|
|
||||||
|
|
||||||
atomic_t flush_done;
|
|
||||||
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_dma.c */
|
|
||||||
extern int i810_dma_schedule(drm_device_t *dev, int locked);
|
|
||||||
extern int i810_getbuf( DRM_IOCTL_ARGS );
|
|
||||||
extern int i810_dma_init( DRM_IOCTL_ARGS );
|
|
||||||
extern int i810_flush_ioctl( DRM_IOCTL_ARGS );
|
|
||||||
extern int i810_getage( DRM_IOCTL_ARGS );
|
|
||||||
extern int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
|
|
||||||
extern int i810_copybuf( DRM_IOCTL_ARGS );
|
|
||||||
extern int i810_docopy( DRM_IOCTL_ARGS );
|
|
||||||
|
|
||||||
extern void i810_dma_quiescent(drm_device_t *dev);
|
|
||||||
|
|
||||||
#define I810_VERBOSE 0
|
|
||||||
|
|
||||||
|
|
||||||
int i810_dma_vertex( DRM_IOCTL_ARGS );
|
|
||||||
int i810_swap_bufs( DRM_IOCTL_ARGS );
|
|
||||||
int i810_clear_bufs( DRM_IOCTL_ARGS );
|
|
||||||
|
|
||||||
#define I810_BASE(reg) ((unsigned long) \
|
|
||||||
dev_priv->mmio_map->handle)
|
|
||||||
#define I810_ADDR(reg) (I810_BASE(reg) + reg)
|
|
||||||
#define I810_DEREF(reg) *(__volatile__ int *)I810_ADDR(reg)
|
|
||||||
#define I810_READ(reg) I810_DEREF(reg)
|
|
||||||
#define I810_WRITE(reg,val) do { I810_DEREF(reg) = val; } while (0)
|
|
||||||
#define I810_DEREF16(reg) *(__volatile__ u16 *)I810_ADDR(reg)
|
|
||||||
#define I810_READ16(reg) I810_DEREF16(reg)
|
|
||||||
#define I810_WRITE16(reg,val) do { I810_DEREF16(reg) = val; } while (0)
|
|
||||||
|
|
||||||
|
|
||||||
#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))
|
|
||||||
#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23))
|
|
||||||
#define CMD_REPORT_HEAD (7<<23)
|
|
||||||
#define CMD_STORE_DWORD_IDX ((0x21<<23) | 0x1)
|
|
||||||
#define CMD_OP_BATCH_BUFFER ((0x0<<29)|(0x30<<23)|0x1)
|
|
||||||
|
|
||||||
#define INST_PARSER_CLIENT 0x00000000
|
|
||||||
#define INST_OP_FLUSH 0x02000000
|
|
||||||
#define INST_FLUSH_MAP_CACHE 0x00000001
|
|
||||||
|
|
||||||
|
|
||||||
#define BB1_START_ADDR_MASK (~0x7)
|
|
||||||
#define BB1_PROTECTED (1<<0)
|
|
||||||
#define BB1_UNPROTECTED (0<<0)
|
|
||||||
#define BB2_END_ADDR_MASK (~0x7)
|
|
||||||
|
|
||||||
#define I810REG_HWSTAM 0x02098
|
|
||||||
#define I810REG_INT_IDENTITY_R 0x020a4
|
|
||||||
#define I810REG_INT_MASK_R 0x020a8
|
|
||||||
#define I810REG_INT_ENABLE_R 0x020a0
|
|
||||||
|
|
||||||
#define LP_RING 0x2030
|
|
||||||
#define HP_RING 0x2040
|
|
||||||
#define RING_TAIL 0x00
|
|
||||||
#define TAIL_ADDR 0x000FFFF8
|
|
||||||
#define RING_HEAD 0x04
|
|
||||||
#define HEAD_WRAP_COUNT 0xFFE00000
|
|
||||||
#define HEAD_WRAP_ONE 0x00200000
|
|
||||||
#define HEAD_ADDR 0x001FFFFC
|
|
||||||
#define RING_START 0x08
|
|
||||||
#define START_ADDR 0x00FFFFF8
|
|
||||||
#define RING_LEN 0x0C
|
|
||||||
#define RING_NR_PAGES 0x000FF000
|
|
||||||
#define RING_REPORT_MASK 0x00000006
|
|
||||||
#define RING_REPORT_64K 0x00000002
|
|
||||||
#define RING_REPORT_128K 0x00000004
|
|
||||||
#define RING_NO_REPORT 0x00000000
|
|
||||||
#define RING_VALID_MASK 0x00000001
|
|
||||||
#define RING_VALID 0x00000001
|
|
||||||
#define RING_INVALID 0x00000000
|
|
||||||
|
|
||||||
#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19))
|
|
||||||
#define SC_UPDATE_SCISSOR (0x1<<1)
|
|
||||||
#define SC_ENABLE_MASK (0x1<<0)
|
|
||||||
#define SC_ENABLE (0x1<<0)
|
|
||||||
|
|
||||||
#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1))
|
|
||||||
#define SCI_YMIN_MASK (0xffff<<16)
|
|
||||||
#define SCI_XMIN_MASK (0xffff<<0)
|
|
||||||
#define SCI_YMAX_MASK (0xffff<<16)
|
|
||||||
#define SCI_XMAX_MASK (0xffff<<0)
|
|
||||||
|
|
||||||
#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0)
|
|
||||||
#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16))
|
|
||||||
#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x2)
|
|
||||||
#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
|
|
||||||
#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
|
|
||||||
#define GFX_OP_PRIMITIVE ((0x3<<29)|(0x1f<<24))
|
|
||||||
|
|
||||||
#define CMD_OP_Z_BUFFER_INFO ((0x0<<29)|(0x16<<23))
|
|
||||||
#define CMD_OP_DESTBUFFER_INFO ((0x0<<29)|(0x15<<23))
|
|
||||||
|
|
||||||
#define BR00_BITBLT_CLIENT 0x40000000
|
|
||||||
#define BR00_OP_COLOR_BLT 0x10000000
|
|
||||||
#define BR00_OP_SRC_COPY_BLT 0x10C00000
|
|
||||||
#define BR13_SOLID_PATTERN 0x80000000
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
116
bsd/i830.h
116
bsd/i830.h
|
|
@ -1,116 +0,0 @@
|
||||||
/* i830.h -- Intel I830 DRM template customization -*- linux-c -*-
|
|
||||||
* Created: Thu Feb 15 00:01:12 2001 by gareth@valinux.com
|
|
||||||
*
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* 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:
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
* OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __I830_H__
|
|
||||||
#define __I830_H__
|
|
||||||
|
|
||||||
/* This remains constant for all DRM template files.
|
|
||||||
*/
|
|
||||||
#define DRM(x) i830_##x
|
|
||||||
|
|
||||||
/* General customization:
|
|
||||||
*/
|
|
||||||
#define __HAVE_AGP 1
|
|
||||||
#define __MUST_HAVE_AGP 1
|
|
||||||
#define __HAVE_MTRR 1
|
|
||||||
#define __HAVE_CTX_BITMAP 1
|
|
||||||
|
|
||||||
/* Driver customization:
|
|
||||||
*/
|
|
||||||
#define __HAVE_RELEASE 1
|
|
||||||
#define DRIVER_RELEASE() do { \
|
|
||||||
i830_reclaim_buffers( dev, priv->pid ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* DMA customization:
|
|
||||||
*/
|
|
||||||
#define __HAVE_DMA 1
|
|
||||||
#define __HAVE_DMA_QUEUE 1
|
|
||||||
#define __HAVE_DMA_WAITLIST 1
|
|
||||||
#define __HAVE_DMA_RECLAIM 1
|
|
||||||
|
|
||||||
#define __HAVE_DMA_QUIESCENT 1
|
|
||||||
#define DRIVER_DMA_QUIESCENT() do { \
|
|
||||||
i830_dma_quiescent( dev ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define __HAVE_DMA_IRQ 1
|
|
||||||
#define __HAVE_DMA_IRQ_BH 1
|
|
||||||
#define __HAVE_SHARED_IRQ 1
|
|
||||||
#define DRIVER_PREINSTALL() do { \
|
|
||||||
drm_i830_private_t *dev_priv = \
|
|
||||||
(drm_i830_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
tmp = I830_READ16( I830REG_HWSTAM ); \
|
|
||||||
tmp = tmp & 0x6000; \
|
|
||||||
I830_WRITE16( I830REG_HWSTAM, tmp ); \
|
|
||||||
\
|
|
||||||
tmp = I830_READ16( I830REG_INT_MASK_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Unmask interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_MASK_R, tmp ); \
|
|
||||||
tmp = I830_READ16( I830REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Disable all interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DRIVER_POSTINSTALL() do { \
|
|
||||||
drm_i830_private_t *dev_priv = \
|
|
||||||
(drm_i830_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
tmp = I830_READ16( I830REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; \
|
|
||||||
tmp = tmp | 0x0003; /* Enable bp & user interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DRIVER_UNINSTALL() do { \
|
|
||||||
drm_i830_private_t *dev_priv = \
|
|
||||||
(drm_i830_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
if ( dev_priv ) { \
|
|
||||||
tmp = I830_READ16( I830REG_INT_IDENTITY_R ); \
|
|
||||||
tmp = tmp & ~(0x6000); /* Clear all interrupts */ \
|
|
||||||
if ( tmp != 0 ) \
|
|
||||||
I830_WRITE16( I830REG_INT_IDENTITY_R, tmp ); \
|
|
||||||
\
|
|
||||||
tmp = I830_READ16( I830REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Disable all interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* Buffer customization:
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define DRIVER_BUF_PRIV_T drm_i830_buf_priv_t
|
|
||||||
|
|
||||||
#define DRIVER_AGP_BUFFERS_MAP( dev ) \
|
|
||||||
((drm_i830_private_t *)((dev)->dev_private))->buffer_map
|
|
||||||
|
|
||||||
#endif
|
|
||||||
1420
bsd/i830_dma.c
1420
bsd/i830_dma.c
File diff suppressed because it is too large
Load diff
251
bsd/i830_drm.h
251
bsd/i830_drm.h
|
|
@ -1,251 +0,0 @@
|
||||||
#ifndef _I830_DRM_H_
|
|
||||||
#define _I830_DRM_H_
|
|
||||||
|
|
||||||
/* WARNING: These defines must be the same as what the Xserver uses.
|
|
||||||
* if you change them, you must change the defines in the Xserver.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _I830_DEFINES_
|
|
||||||
#define _I830_DEFINES_
|
|
||||||
|
|
||||||
#define I830_DMA_BUF_ORDER 12
|
|
||||||
#define I830_DMA_BUF_SZ (1<<I830_DMA_BUF_ORDER)
|
|
||||||
#define I830_DMA_BUF_NR 256
|
|
||||||
#define I830_NR_SAREA_CLIPRECTS 8
|
|
||||||
|
|
||||||
/* Each region is a minimum of 64k, and there are at most 64 of them.
|
|
||||||
*/
|
|
||||||
#define I830_NR_TEX_REGIONS 64
|
|
||||||
#define I830_LOG_MIN_TEX_REGION_SIZE 16
|
|
||||||
|
|
||||||
/* if defining I830_ENABLE_4_TEXTURES, do it in i830_3d_reg.h, too */
|
|
||||||
#if !defined(I830_ENABLE_4_TEXTURES)
|
|
||||||
#define I830_TEXTURE_COUNT 2
|
|
||||||
#define I830_TEXBLEND_COUNT 2 /* always same as TEXTURE_COUNT? */
|
|
||||||
#else /* defined(I830_ENABLE_4_TEXTURES) */
|
|
||||||
#define I830_TEXTURE_COUNT 4
|
|
||||||
#define I830_TEXBLEND_COUNT 4 /* always same as TEXTURE_COUNT? */
|
|
||||||
#endif /* I830_ENABLE_4_TEXTURES */
|
|
||||||
|
|
||||||
#define I830_TEXBLEND_SIZE 12 /* (4 args + op) * 2 + COLOR_FACTOR */
|
|
||||||
|
|
||||||
#define I830_UPLOAD_CTX 0x1
|
|
||||||
#define I830_UPLOAD_BUFFERS 0x2
|
|
||||||
#define I830_UPLOAD_CLIPRECTS 0x4
|
|
||||||
#define I830_UPLOAD_TEX0_IMAGE 0x100 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX0_CUBE 0x200 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX1_IMAGE 0x400 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX1_CUBE 0x800 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX2_IMAGE 0x1000 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX2_CUBE 0x2000 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX3_IMAGE 0x4000 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX3_CUBE 0x8000 /* handled clientside */
|
|
||||||
#define I830_UPLOAD_TEX_N_IMAGE(n) (0x100 << (n * 2))
|
|
||||||
#define I830_UPLOAD_TEX_N_CUBE(n) (0x200 << (n * 2))
|
|
||||||
#define I830_UPLOAD_TEXIMAGE_MASK 0xff00
|
|
||||||
#define I830_UPLOAD_TEX0 0x10000
|
|
||||||
#define I830_UPLOAD_TEX1 0x20000
|
|
||||||
#define I830_UPLOAD_TEX2 0x40000
|
|
||||||
#define I830_UPLOAD_TEX3 0x80000
|
|
||||||
#define I830_UPLOAD_TEX_N(n) (0x10000 << (n))
|
|
||||||
#define I830_UPLOAD_TEX_MASK 0xf0000
|
|
||||||
#define I830_UPLOAD_TEXBLEND0 0x100000
|
|
||||||
#define I830_UPLOAD_TEXBLEND1 0x200000
|
|
||||||
#define I830_UPLOAD_TEXBLEND2 0x400000
|
|
||||||
#define I830_UPLOAD_TEXBLEND3 0x800000
|
|
||||||
#define I830_UPLOAD_TEXBLEND_N(n) (0x100000 << (n))
|
|
||||||
#define I830_UPLOAD_TEXBLEND_MASK 0xf00000
|
|
||||||
#define I830_UPLOAD_TEX_PALETTE_N(n) (0x1000000 << (n))
|
|
||||||
#define I830_UPLOAD_TEX_PALETTE_SHARED 0x4000000
|
|
||||||
|
|
||||||
/* Indices into buf.Setup where various bits of state are mirrored per
|
|
||||||
* context and per buffer. These can be fired at the card as a unit,
|
|
||||||
* or in a piecewise fashion as required.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Destbuffer state
|
|
||||||
* - backbuffer linear offset and pitch -- invarient in the current dri
|
|
||||||
* - zbuffer linear offset and pitch -- also invarient
|
|
||||||
* - drawing origin in back and depth buffers.
|
|
||||||
*
|
|
||||||
* Keep the depth/back buffer state here to acommodate private buffers
|
|
||||||
* in the future.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define I830_DESTREG_CBUFADDR 0
|
|
||||||
/* Invarient */
|
|
||||||
#define I830_DESTREG_DBUFADDR 1
|
|
||||||
#define I830_DESTREG_DV0 2
|
|
||||||
#define I830_DESTREG_DV1 3
|
|
||||||
#define I830_DESTREG_SENABLE 4
|
|
||||||
#define I830_DESTREG_SR0 5
|
|
||||||
#define I830_DESTREG_SR1 6
|
|
||||||
#define I830_DESTREG_SR2 7
|
|
||||||
#define I830_DESTREG_DR0 8
|
|
||||||
#define I830_DESTREG_DR1 9
|
|
||||||
#define I830_DESTREG_DR2 10
|
|
||||||
#define I830_DESTREG_DR3 11
|
|
||||||
#define I830_DESTREG_DR4 12
|
|
||||||
#define I830_DEST_SETUP_SIZE 13
|
|
||||||
|
|
||||||
/* Context state
|
|
||||||
*/
|
|
||||||
#define I830_CTXREG_STATE1 0
|
|
||||||
#define I830_CTXREG_STATE2 1
|
|
||||||
#define I830_CTXREG_STATE3 2
|
|
||||||
#define I830_CTXREG_STATE4 3
|
|
||||||
#define I830_CTXREG_STATE5 4
|
|
||||||
#define I830_CTXREG_IALPHAB 5
|
|
||||||
#define I830_CTXREG_STENCILTST 6
|
|
||||||
#define I830_CTXREG_ENABLES_1 7
|
|
||||||
#define I830_CTXREG_ENABLES_2 8
|
|
||||||
#define I830_CTXREG_AA 9
|
|
||||||
#define I830_CTXREG_FOGCOLOR 10
|
|
||||||
#define I830_CTXREG_BLENDCOLR0 11
|
|
||||||
#define I830_CTXREG_BLENDCOLR 12 /* Dword 1 of 2 dword command */
|
|
||||||
#define I830_CTXREG_VF 13
|
|
||||||
#define I830_CTXREG_VF2 14
|
|
||||||
#define I830_CTXREG_MCSB0 15
|
|
||||||
#define I830_CTXREG_MCSB1 16
|
|
||||||
#define I830_CTX_SETUP_SIZE 17
|
|
||||||
|
|
||||||
/* Texture state (per tex unit)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define I830_TEXREG_MI0 0 /* GFX_OP_MAP_INFO (6 dwords) */
|
|
||||||
#define I830_TEXREG_MI1 1
|
|
||||||
#define I830_TEXREG_MI2 2
|
|
||||||
#define I830_TEXREG_MI3 3
|
|
||||||
#define I830_TEXREG_MI4 4
|
|
||||||
#define I830_TEXREG_MI5 5
|
|
||||||
#define I830_TEXREG_MF 6 /* GFX_OP_MAP_FILTER */
|
|
||||||
#define I830_TEXREG_MLC 7 /* GFX_OP_MAP_LOD_CTL */
|
|
||||||
#define I830_TEXREG_MLL 8 /* GFX_OP_MAP_LOD_LIMITS */
|
|
||||||
#define I830_TEXREG_MCS 9 /* GFX_OP_MAP_COORD_SETS */
|
|
||||||
#define I830_TEX_SETUP_SIZE 10
|
|
||||||
|
|
||||||
#define I830_FRONT 0x1
|
|
||||||
#define I830_BACK 0x2
|
|
||||||
#define I830_DEPTH 0x4
|
|
||||||
|
|
||||||
#endif /* _I830_DEFINES_ */
|
|
||||||
|
|
||||||
typedef struct _drm_i830_init {
|
|
||||||
enum {
|
|
||||||
I830_INIT_DMA = 0x01,
|
|
||||||
I830_CLEANUP_DMA = 0x02
|
|
||||||
} func;
|
|
||||||
unsigned int mmio_offset;
|
|
||||||
unsigned int buffers_offset;
|
|
||||||
int sarea_priv_offset;
|
|
||||||
unsigned int ring_start;
|
|
||||||
unsigned int ring_end;
|
|
||||||
unsigned int ring_size;
|
|
||||||
unsigned int front_offset;
|
|
||||||
unsigned int back_offset;
|
|
||||||
unsigned int depth_offset;
|
|
||||||
unsigned int w;
|
|
||||||
unsigned int h;
|
|
||||||
unsigned int pitch;
|
|
||||||
unsigned int pitch_bits;
|
|
||||||
unsigned int back_pitch;
|
|
||||||
unsigned int depth_pitch;
|
|
||||||
unsigned int cpp;
|
|
||||||
} drm_i830_init_t;
|
|
||||||
|
|
||||||
/* Warning: If you change the SAREA structure you must change the Xserver
|
|
||||||
* structure as well */
|
|
||||||
|
|
||||||
typedef struct _drm_i830_tex_region {
|
|
||||||
unsigned char next, prev; /* indices to form a circular LRU */
|
|
||||||
unsigned char in_use; /* owned by a client, or free? */
|
|
||||||
int age; /* tracked by clients to update local LRU's */
|
|
||||||
} drm_i830_tex_region_t;
|
|
||||||
|
|
||||||
typedef struct _drm_i830_sarea {
|
|
||||||
unsigned int ContextState[I830_CTX_SETUP_SIZE];
|
|
||||||
unsigned int BufferState[I830_DEST_SETUP_SIZE];
|
|
||||||
unsigned int TexState[I830_TEXTURE_COUNT][I830_TEX_SETUP_SIZE];
|
|
||||||
unsigned int TexBlendState[I830_TEXBLEND_COUNT][I830_TEXBLEND_SIZE];
|
|
||||||
unsigned int TexBlendStateWordsUsed[I830_TEXBLEND_COUNT];
|
|
||||||
unsigned int Palette[2][256];
|
|
||||||
unsigned int dirty;
|
|
||||||
|
|
||||||
unsigned int nbox;
|
|
||||||
drm_clip_rect_t boxes[I830_NR_SAREA_CLIPRECTS];
|
|
||||||
|
|
||||||
/* Maintain an LRU of contiguous regions of texture space. If
|
|
||||||
* you think you own a region of texture memory, and it has an
|
|
||||||
* age different to the one you set, then you are mistaken and
|
|
||||||
* it has been stolen by another client. If global texAge
|
|
||||||
* hasn't changed, there is no need to walk the list.
|
|
||||||
*
|
|
||||||
* These regions can be used as a proxy for the fine-grained
|
|
||||||
* texture information of other clients - by maintaining them
|
|
||||||
* in the same lru which is used to age their own textures,
|
|
||||||
* clients have an approximate lru for the whole of global
|
|
||||||
* texture space, and can make informed decisions as to which
|
|
||||||
* areas to kick out. There is no need to choose whether to
|
|
||||||
* kick out your own texture or someone else's - simply eject
|
|
||||||
* them all in LRU order.
|
|
||||||
*/
|
|
||||||
|
|
||||||
drm_i830_tex_region_t texList[I830_NR_TEX_REGIONS+1];
|
|
||||||
/* Last elt is sentinal */
|
|
||||||
int texAge; /* last time texture was uploaded */
|
|
||||||
int last_enqueue; /* last time a buffer was enqueued */
|
|
||||||
int last_dispatch; /* age of the most recently dispatched buffer */
|
|
||||||
int last_quiescent; /* */
|
|
||||||
int ctxOwner; /* last context to upload state */
|
|
||||||
|
|
||||||
int vertex_prim;
|
|
||||||
} drm_i830_sarea_t;
|
|
||||||
|
|
||||||
/* I830 specific ioctls
|
|
||||||
* The device specific ioctl range is 0x40 to 0x79.
|
|
||||||
*/
|
|
||||||
#define DRM_IOCTL_I830_INIT DRM_IOW( 0x40, drm_i830_init_t)
|
|
||||||
#define DRM_IOCTL_I830_VERTEX DRM_IOW( 0x41, drm_i830_vertex_t)
|
|
||||||
#define DRM_IOCTL_I830_CLEAR DRM_IOW( 0x42, drm_i830_clear_t)
|
|
||||||
#define DRM_IOCTL_I830_FLUSH DRM_IO ( 0x43)
|
|
||||||
#define DRM_IOCTL_I830_GETAGE DRM_IO ( 0x44)
|
|
||||||
#define DRM_IOCTL_I830_GETBUF DRM_IOWR(0x45, drm_i830_dma_t)
|
|
||||||
#define DRM_IOCTL_I830_SWAP DRM_IO ( 0x46)
|
|
||||||
#define DRM_IOCTL_I830_COPY DRM_IOW( 0x47, drm_i830_copy_t)
|
|
||||||
#define DRM_IOCTL_I830_DOCOPY DRM_IO ( 0x48)
|
|
||||||
|
|
||||||
typedef struct _drm_i830_clear {
|
|
||||||
int clear_color;
|
|
||||||
int clear_depth;
|
|
||||||
int flags;
|
|
||||||
unsigned int clear_colormask;
|
|
||||||
unsigned int clear_depthmask;
|
|
||||||
} drm_i830_clear_t;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* These may be placeholders if we have more cliprects than
|
|
||||||
* I830_NR_SAREA_CLIPRECTS. In that case, the client sets discard to
|
|
||||||
* false, indicating that the buffer will be dispatched again with a
|
|
||||||
* new set of cliprects.
|
|
||||||
*/
|
|
||||||
typedef struct _drm_i830_vertex {
|
|
||||||
int idx; /* buffer index */
|
|
||||||
int used; /* nr bytes in use */
|
|
||||||
int discard; /* client is finished with the buffer? */
|
|
||||||
} drm_i830_vertex_t;
|
|
||||||
|
|
||||||
typedef struct _drm_i830_copy_t {
|
|
||||||
int idx; /* buffer index */
|
|
||||||
int used; /* nr bytes in use */
|
|
||||||
void *address; /* Address to copy from */
|
|
||||||
} drm_i830_copy_t;
|
|
||||||
|
|
||||||
typedef struct drm_i830_dma {
|
|
||||||
void *virtual;
|
|
||||||
int request_idx;
|
|
||||||
int request_size;
|
|
||||||
int granted;
|
|
||||||
} drm_i830_dma_t;
|
|
||||||
|
|
||||||
#endif /* _I830_DRM_H_ */
|
|
||||||
104
bsd/i830_drv.c
104
bsd/i830_drv.c
|
|
@ -1,104 +0,0 @@
|
||||||
/* i830_drv.c -- I810 driver -*- linux-c -*-
|
|
||||||
* Created: Mon Dec 13 01:56:22 1999 by jhartmann@precisioninsight.com
|
|
||||||
*
|
|
||||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* 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:
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* 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>
|
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
|
||||||
* Abraham vd Merwe <abraham@2d3d.co.za>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/config.h>
|
|
||||||
#include "i830.h"
|
|
||||||
#include "drmP.h"
|
|
||||||
#include "drm.h"
|
|
||||||
#include "i830_drm.h"
|
|
||||||
#include "i830_drv.h"
|
|
||||||
|
|
||||||
#define DRIVER_AUTHOR "VA Linux Systems Inc."
|
|
||||||
|
|
||||||
#define DRIVER_NAME "i830"
|
|
||||||
#define DRIVER_DESC "Intel 830M"
|
|
||||||
#define DRIVER_DATE "20011004"
|
|
||||||
|
|
||||||
#define DRIVER_MAJOR 1
|
|
||||||
#define DRIVER_MINOR 2
|
|
||||||
#define DRIVER_PATCHLEVEL 0
|
|
||||||
|
|
||||||
#define DRIVER_IOCTLS \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_INIT)] = { i830_dma_init, 1, 1 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_VERTEX)] = { i830_dma_vertex, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_CLEAR)] = { i830_clear_bufs, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_FLUSH)] = { i830_flush_ioctl, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_GETAGE)] = { i830_getage, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_GETBUF)] = { i830_getbuf, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_SWAP)] = { i830_swap_bufs, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_COPY)] = { i830_copybuf, 1, 0 }, \
|
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_DOCOPY)] = { i830_docopy, 1, 0 },
|
|
||||||
|
|
||||||
#define __HAVE_COUNTERS 4
|
|
||||||
#define __HAVE_COUNTER6 _DRM_STAT_IRQ
|
|
||||||
#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY
|
|
||||||
#define __HAVE_COUNTER8 _DRM_STAT_SECONDARY
|
|
||||||
#define __HAVE_COUNTER9 _DRM_STAT_DMA
|
|
||||||
|
|
||||||
|
|
||||||
#include "drm_agpsupport.h"
|
|
||||||
#include "drm_auth.h"
|
|
||||||
#include "drm_bufs.h"
|
|
||||||
#include "drm_context.h"
|
|
||||||
#include "drm_dma.h"
|
|
||||||
#include "drm_drawable.h"
|
|
||||||
#include "drm_drv.h"
|
|
||||||
|
|
||||||
#ifndef MODULE
|
|
||||||
/* DRM(options) is called by the kernel to parse command-line options
|
|
||||||
* passed via the boot-loader (e.g., LILO). It calls the insmod option
|
|
||||||
* routine, drm_parse_drm.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* JH- We have to hand expand the string ourselves because of the cpp. If
|
|
||||||
* anyone can think of a way that we can fit into the __setup macro without
|
|
||||||
* changing it, then please send the solution my way.
|
|
||||||
*/
|
|
||||||
static int __init i830_options( char *str )
|
|
||||||
{
|
|
||||||
DRM(parse_options)( str );
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
__setup( DRIVER_NAME "=", i830_options );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "drm_fops.h"
|
|
||||||
#include "drm_init.h"
|
|
||||||
#include "drm_ioctl.h"
|
|
||||||
#include "drm_lock.h"
|
|
||||||
#include "drm_lists.h"
|
|
||||||
#include "drm_memory.h"
|
|
||||||
#include "drm_proc.h"
|
|
||||||
#include "drm_vm.h"
|
|
||||||
#include "drm_stub.h"
|
|
||||||
213
bsd/i830_drv.h
213
bsd/i830_drv.h
|
|
@ -1,213 +0,0 @@
|
||||||
/* i830_drv.h -- Private header for the I830 driver -*- linux-c -*-
|
|
||||||
* Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com
|
|
||||||
*
|
|
||||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
||||||
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
||||||
* 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:
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
* 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>
|
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _I830_DRV_H_
|
|
||||||
#define _I830_DRV_H_
|
|
||||||
|
|
||||||
typedef struct drm_i830_buf_priv {
|
|
||||||
u32 *in_use;
|
|
||||||
int my_use_idx;
|
|
||||||
int currently_mapped;
|
|
||||||
void *virtual;
|
|
||||||
void *kernel_virtual;
|
|
||||||
int map_count;
|
|
||||||
struct vm_area_struct *vma;
|
|
||||||
} drm_i830_buf_priv_t;
|
|
||||||
|
|
||||||
typedef struct _drm_i830_ring_buffer{
|
|
||||||
int tail_mask;
|
|
||||||
unsigned long Start;
|
|
||||||
unsigned long End;
|
|
||||||
unsigned long Size;
|
|
||||||
u8 *virtual_start;
|
|
||||||
int head;
|
|
||||||
int tail;
|
|
||||||
int space;
|
|
||||||
} drm_i830_ring_buffer_t;
|
|
||||||
|
|
||||||
typedef struct drm_i830_private {
|
|
||||||
drm_map_t *sarea_map;
|
|
||||||
drm_map_t *buffer_map;
|
|
||||||
drm_map_t *mmio_map;
|
|
||||||
|
|
||||||
drm_i830_sarea_t *sarea_priv;
|
|
||||||
drm_i830_ring_buffer_t ring;
|
|
||||||
|
|
||||||
unsigned long hw_status_page;
|
|
||||||
unsigned long counter;
|
|
||||||
|
|
||||||
atomic_t flush_done;
|
|
||||||
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;
|
|
||||||
int back_pitch;
|
|
||||||
int depth_pitch;
|
|
||||||
unsigned int cpp;
|
|
||||||
} drm_i830_private_t;
|
|
||||||
|
|
||||||
/* i830_dma.c */
|
|
||||||
extern int i830_dma_schedule(drm_device_t *dev, int locked);
|
|
||||||
extern int i830_getbuf(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
extern int i830_dma_init(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
extern int i830_flush_ioctl(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
extern void i830_reclaim_buffers(drm_device_t *dev, pid_t pid);
|
|
||||||
extern int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
|
|
||||||
unsigned long arg);
|
|
||||||
extern int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma);
|
|
||||||
extern int i830_copybuf(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
extern int i830_docopy(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
|
|
||||||
extern void i830_dma_quiescent(drm_device_t *dev);
|
|
||||||
|
|
||||||
extern int i830_dma_vertex(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
|
|
||||||
extern int i830_swap_bufs(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
|
|
||||||
extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
|
||||||
unsigned int cmd, unsigned long arg);
|
|
||||||
|
|
||||||
#define I830_VERBOSE 0
|
|
||||||
|
|
||||||
#define I830_BASE(reg) ((unsigned long) \
|
|
||||||
dev_priv->mmio_map->handle)
|
|
||||||
#define I830_ADDR(reg) (I830_BASE(reg) + reg)
|
|
||||||
#define I830_DEREF(reg) *(__volatile__ int *)I830_ADDR(reg)
|
|
||||||
#define I830_READ(reg) I830_DEREF(reg)
|
|
||||||
#define I830_WRITE(reg,val) do { I830_DEREF(reg) = val; } while (0)
|
|
||||||
#define I830_DEREF16(reg) *(__volatile__ u16 *)I830_ADDR(reg)
|
|
||||||
#define I830_READ16(reg) I830_DEREF16(reg)
|
|
||||||
#define I830_WRITE16(reg,val) do { I830_DEREF16(reg) = val; } while (0)
|
|
||||||
|
|
||||||
#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))
|
|
||||||
#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23))
|
|
||||||
#define CMD_REPORT_HEAD (7<<23)
|
|
||||||
#define CMD_STORE_DWORD_IDX ((0x21<<23) | 0x1)
|
|
||||||
#define CMD_OP_BATCH_BUFFER ((0x0<<29)|(0x30<<23)|0x1)
|
|
||||||
|
|
||||||
#define INST_PARSER_CLIENT 0x00000000
|
|
||||||
#define INST_OP_FLUSH 0x02000000
|
|
||||||
#define INST_FLUSH_MAP_CACHE 0x00000001
|
|
||||||
|
|
||||||
|
|
||||||
#define BB1_START_ADDR_MASK (~0x7)
|
|
||||||
#define BB1_PROTECTED (1<<0)
|
|
||||||
#define BB1_UNPROTECTED (0<<0)
|
|
||||||
#define BB2_END_ADDR_MASK (~0x7)
|
|
||||||
|
|
||||||
#define I830REG_HWSTAM 0x02098
|
|
||||||
#define I830REG_INT_IDENTITY_R 0x020a4
|
|
||||||
#define I830REG_INT_MASK_R 0x020a8
|
|
||||||
#define I830REG_INT_ENABLE_R 0x020a0
|
|
||||||
|
|
||||||
#define LP_RING 0x2030
|
|
||||||
#define HP_RING 0x2040
|
|
||||||
#define RING_TAIL 0x00
|
|
||||||
#define TAIL_ADDR 0x000FFFF8
|
|
||||||
#define RING_HEAD 0x04
|
|
||||||
#define HEAD_WRAP_COUNT 0xFFE00000
|
|
||||||
#define HEAD_WRAP_ONE 0x00200000
|
|
||||||
#define HEAD_ADDR 0x001FFFFC
|
|
||||||
#define RING_START 0x08
|
|
||||||
#define START_ADDR 0x00FFFFF8
|
|
||||||
#define RING_LEN 0x0C
|
|
||||||
#define RING_NR_PAGES 0x000FF000
|
|
||||||
#define RING_REPORT_MASK 0x00000006
|
|
||||||
#define RING_REPORT_64K 0x00000002
|
|
||||||
#define RING_REPORT_128K 0x00000004
|
|
||||||
#define RING_NO_REPORT 0x00000000
|
|
||||||
#define RING_VALID_MASK 0x00000001
|
|
||||||
#define RING_VALID 0x00000001
|
|
||||||
#define RING_INVALID 0x00000000
|
|
||||||
|
|
||||||
#define GFX_OP_SCISSOR ((0x3<<29)|(0x1c<<24)|(0x10<<19))
|
|
||||||
#define SC_UPDATE_SCISSOR (0x1<<1)
|
|
||||||
#define SC_ENABLE_MASK (0x1<<0)
|
|
||||||
#define SC_ENABLE (0x1<<0)
|
|
||||||
|
|
||||||
#define GFX_OP_SCISSOR_INFO ((0x3<<29)|(0x1d<<24)|(0x81<<16)|(0x1))
|
|
||||||
#define SCI_YMIN_MASK (0xffff<<16)
|
|
||||||
#define SCI_XMIN_MASK (0xffff<<0)
|
|
||||||
#define SCI_YMAX_MASK (0xffff<<16)
|
|
||||||
#define SCI_XMAX_MASK (0xffff<<0)
|
|
||||||
|
|
||||||
#define GFX_OP_SCISSOR_ENABLE ((0x3<<29)|(0x1c<<24)|(0x10<<19))
|
|
||||||
#define GFX_OP_SCISSOR_RECT ((0x3<<29)|(0x1d<<24)|(0x81<<16)|1)
|
|
||||||
#define GFX_OP_COLOR_FACTOR ((0x3<<29)|(0x1d<<24)|(0x1<<16)|0x0)
|
|
||||||
#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16))
|
|
||||||
#define GFX_OP_MAP_INFO ((0x3<<29)|(0x1d<<24)|0x4)
|
|
||||||
#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
|
|
||||||
#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
|
|
||||||
#define GFX_OP_PRIMITIVE ((0x3<<29)|(0x1f<<24))
|
|
||||||
|
|
||||||
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
|
||||||
|
|
||||||
|
|
||||||
#define BR00_BITBLT_CLIENT 0x40000000
|
|
||||||
#define BR00_OP_COLOR_BLT 0x10000000
|
|
||||||
#define BR00_OP_SRC_COPY_BLT 0x10C00000
|
|
||||||
#define BR13_SOLID_PATTERN 0x80000000
|
|
||||||
|
|
||||||
#define BUF_3D_ID_COLOR_BACK (0x3<<24)
|
|
||||||
#define BUF_3D_ID_DEPTH (0x7<<24)
|
|
||||||
#define BUF_3D_USE_FENCE (1<<23)
|
|
||||||
#define BUF_3D_PITCH(x) (((x)/4)<<2)
|
|
||||||
|
|
||||||
#define CMD_OP_MAP_PALETTE_LOAD ((3<<29)|(0x1d<<24)|(0x82<<16)|255)
|
|
||||||
#define MAP_PALETTE_NUM(x) ((x<<8) & (1<<8))
|
|
||||||
#define MAP_PALETTE_BOTH (1<<11)
|
|
||||||
|
|
||||||
#define XY_COLOR_BLT_CMD ((2<<29)|(0x50<<22)|0x4)
|
|
||||||
#define XY_COLOR_BLT_WRITE_ALPHA (1<<21)
|
|
||||||
#define XY_COLOR_BLT_WRITE_RGB (1<<20)
|
|
||||||
|
|
||||||
#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6)
|
|
||||||
#define XY_SRC_COPY_BLT_WRITE_ALPHA (1<<21)
|
|
||||||
#define XY_SRC_COPY_BLT_WRITE_RGB (1<<20)
|
|
||||||
|
|
||||||
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
|
||||||
#define MI_BATCH_NON_SECURE (1)
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS= mga_drv.c mga_state.c mga_warp.c mga_dma.c
|
||||||
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS = r128_cce.c r128_drv.c r128_state.c
|
||||||
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS = radeon_cp.c radeon_drv.c radeon_state.c radeon_irq.c radeon_mem.c
|
||||||
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
CFLAGS += ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
|
|
||||||
#ifndef _sis_drm_public_h_
|
|
||||||
#define _sis_drm_public_h_
|
|
||||||
|
|
||||||
/* SiS specific ioctls */
|
|
||||||
#define SIS_IOCTL_FB_ALLOC DRM_IOWR(0x44, drm_sis_mem_t)
|
|
||||||
#define SIS_IOCTL_FB_FREE DRM_IOW( 0x45, drm_sis_mem_t)
|
|
||||||
#define SIS_IOCTL_AGP_INIT DRM_IOWR(0x53, drm_sis_agp_t)
|
|
||||||
#define SIS_IOCTL_AGP_ALLOC DRM_IOWR(0x54, drm_sis_mem_t)
|
|
||||||
#define SIS_IOCTL_AGP_FREE DRM_IOW( 0x55, drm_sis_mem_t)
|
|
||||||
#define SIS_IOCTL_FLIP DRM_IOW( 0x48, drm_sis_flip_t)
|
|
||||||
#define SIS_IOCTL_FLIP_INIT DRM_IO( 0x49)
|
|
||||||
#define SIS_IOCTL_FLIP_FINAL DRM_IO( 0x50)
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
int context;
|
|
||||||
unsigned int offset;
|
|
||||||
unsigned int size;
|
|
||||||
unsigned int free;
|
|
||||||
} drm_sis_mem_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int offset, size;
|
|
||||||
} drm_sis_agp_t;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
unsigned int left, right;
|
|
||||||
} drm_sis_flip_t;
|
|
||||||
|
|
||||||
#if defined(__KERNEL__) || defined(_KERNEL)
|
|
||||||
|
|
||||||
int sis_fb_alloc(DRM_IOCTL_ARGS);
|
|
||||||
int sis_fb_free(DRM_IOCTL_ARGS);
|
|
||||||
int sisp_agp_init(DRM_IOCTL_ARGS);
|
|
||||||
int sisp_agp_alloc(DRM_IOCTL_ARGS);
|
|
||||||
int sisp_agp_free(DRM_IOCTL_ARGS);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -7,12 +7,6 @@ SRCS= tdfx_drv.c
|
||||||
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h
|
||||||
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
CFLAGS+= ${DEBUG_FLAGS} -I. -I..
|
||||||
|
|
||||||
@:
|
|
||||||
ln -sf /sys @
|
|
||||||
|
|
||||||
machine:
|
|
||||||
ln -sf /sys/i386/include machine
|
|
||||||
|
|
||||||
.if defined(DRM_DEBUG)
|
.if defined(DRM_DEBUG)
|
||||||
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
|
||||||
.endif
|
.endif
|
||||||
|
|
|
||||||
|
|
@ -73,19 +73,21 @@ extern int xf86RemoveSIGIOHandler(int fd);
|
||||||
#include "xf86drm.h"
|
#include "xf86drm.h"
|
||||||
#include "xf86drmCompat.h"
|
#include "xf86drmCompat.h"
|
||||||
#include "drm.h"
|
#include "drm.h"
|
||||||
#include "i810_drm.h"
|
|
||||||
#include "mga_drm.h"
|
#include "mga_drm.h"
|
||||||
#include "r128_drm.h"
|
#include "r128_drm.h"
|
||||||
#include "radeon_drm.h"
|
#include "radeon_drm.h"
|
||||||
|
#ifndef __FreeBSD__
|
||||||
#include "sis_drm.h"
|
#include "sis_drm.h"
|
||||||
|
#include "i810_drm.h"
|
||||||
#include "i830_drm.h"
|
#include "i830_drm.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* WARNING: Do not change, or add, anything to this file. It is only provided
|
/* WARNING: Do not change, or add, anything to this file. It is only provided
|
||||||
* for binary backwards compatability with the old driver specific DRM
|
* for binary backwards compatability with the old driver specific DRM
|
||||||
* extensions used before XFree86 4.3.
|
* extensions used before XFree86 4.3.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef __FreeBSD__
|
||||||
/* I810 */
|
/* I810 */
|
||||||
|
|
||||||
Bool drmI810CleanupDma(int driSubFD)
|
Bool drmI810CleanupDma(int driSubFD)
|
||||||
|
|
@ -130,6 +132,7 @@ Bool drmI810InitDma(int driSubFD, drmCompatI810Init *info)
|
||||||
}
|
}
|
||||||
return 1; /* TRUE */
|
return 1; /* TRUE */
|
||||||
}
|
}
|
||||||
|
#endif /* __FreeBSD__ */
|
||||||
|
|
||||||
/* Mga */
|
/* Mga */
|
||||||
|
|
||||||
|
|
@ -1008,6 +1011,7 @@ int drmRadeonFlushIndirectBuffer( int fd, int index,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __FreeBSD__
|
||||||
/* SiS */
|
/* SiS */
|
||||||
|
|
||||||
Bool drmSiSAgpInit(int driSubFD, int offset, int size)
|
Bool drmSiSAgpInit(int driSubFD, int offset, int size)
|
||||||
|
|
@ -1066,6 +1070,7 @@ Bool drmI830InitDma(int driSubFD, drmCompatI830Init *info)
|
||||||
}
|
}
|
||||||
return 1; /* TRUE */
|
return 1; /* TRUE */
|
||||||
}
|
}
|
||||||
|
#endif /* __FreeBSD__ */
|
||||||
|
|
||||||
/* WARNING: Do not change, or add, anything to this file. It is only provided
|
/* WARNING: Do not change, or add, anything to this file. It is only provided
|
||||||
* for binary backwards compatability with the old driver specific DRM
|
* for binary backwards compatability with the old driver specific DRM
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/smp_lock.h> /* For (un)lock_kernel */
|
#include <linux/smp_lock.h> /* For (un)lock_kernel */
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
|
#include <linux/pagemap.h>
|
||||||
#if defined(__alpha__) || defined(__powerpc__)
|
#if defined(__alpha__) || defined(__powerpc__)
|
||||||
#include <asm/pgtable.h> /* For pte_wrprotect */
|
#include <asm/pgtable.h> /* For pte_wrprotect */
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -165,7 +166,7 @@
|
||||||
#define pte_unmap(pte)
|
#define pte_unmap(pte)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < 0x020413 /* KERNEL_VERSION(2,4,19) */
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
|
||||||
static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
{
|
{
|
||||||
unsigned long addr = (unsigned long) vmalloc_addr;
|
unsigned long addr = (unsigned long) vmalloc_addr;
|
||||||
|
|
@ -190,7 +191,7 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < 0x020500
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
|
||||||
#define DRM_RPR_ARG(vma)
|
#define DRM_RPR_ARG(vma)
|
||||||
#else
|
#else
|
||||||
#define DRM_RPR_ARG(vma) vma,
|
#define DRM_RPR_ARG(vma) vma,
|
||||||
|
|
@ -201,9 +202,9 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
|
|
||||||
/* Macros to make printk easier */
|
/* Macros to make printk easier */
|
||||||
#define DRM_ERROR(fmt, arg...) \
|
#define DRM_ERROR(fmt, arg...) \
|
||||||
printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg)
|
printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg)
|
||||||
#define DRM_MEM_ERROR(area, fmt, arg...) \
|
#define DRM_MEM_ERROR(area, fmt, arg...) \
|
||||||
printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \
|
printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \
|
||||||
DRM(mem_stats)[area].name , ##arg)
|
DRM(mem_stats)[area].name , ##arg)
|
||||||
#define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
|
#define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
|
||||||
|
|
||||||
|
|
@ -212,8 +213,8 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
do { \
|
do { \
|
||||||
if ( DRM(flags) & DRM_FLAG_DEBUG ) \
|
if ( DRM(flags) & DRM_FLAG_DEBUG ) \
|
||||||
printk(KERN_DEBUG \
|
printk(KERN_DEBUG \
|
||||||
"[" DRM_NAME ":" __FUNCTION__ "] " fmt , \
|
"[" DRM_NAME ":%s] " fmt , \
|
||||||
##arg); \
|
__FUNCTION__ , ##arg); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#else
|
#else
|
||||||
#define DRM_DEBUG(fmt, arg...) do { } while (0)
|
#define DRM_DEBUG(fmt, arg...) do { } while (0)
|
||||||
|
|
@ -597,7 +598,7 @@ typedef struct drm_device {
|
||||||
#endif
|
#endif
|
||||||
struct pci_dev *pdev;
|
struct pci_dev *pdev;
|
||||||
#ifdef __alpha__
|
#ifdef __alpha__
|
||||||
#if LINUX_VERSION_CODE < 0x020403
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
|
||||||
struct pci_controler *hose;
|
struct pci_controler *hose;
|
||||||
#else
|
#else
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
|
||||||
}
|
}
|
||||||
map->offset = (unsigned long)map->handle;
|
map->offset = (unsigned long)map->handle;
|
||||||
if ( map->flags & _DRM_CONTAINS_LOCK ) {
|
if ( map->flags & _DRM_CONTAINS_LOCK ) {
|
||||||
|
dev->sigdata.lock =
|
||||||
dev->lock.hw_lock = map->handle; /* Pointer to lock */
|
dev->lock.hw_lock = map->handle; /* Pointer to lock */
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ static int DRM(setup)( drm_device_t *dev )
|
||||||
dev->map_count = 0;
|
dev->map_count = 0;
|
||||||
|
|
||||||
dev->vmalist = NULL;
|
dev->vmalist = NULL;
|
||||||
dev->lock.hw_lock = NULL;
|
dev->sigdata.lock = dev->lock.hw_lock = NULL;
|
||||||
init_waitqueue_head( &dev->lock.lock_queue );
|
init_waitqueue_head( &dev->lock.lock_queue );
|
||||||
dev->queue_count = 0;
|
dev->queue_count = 0;
|
||||||
dev->queue_reserved = 0;
|
dev->queue_reserved = 0;
|
||||||
|
|
@ -491,7 +491,7 @@ static int DRM(takedown)( drm_device_t *dev )
|
||||||
DRM(dma_takedown)( dev );
|
DRM(dma_takedown)( dev );
|
||||||
#endif
|
#endif
|
||||||
if ( dev->lock.hw_lock ) {
|
if ( dev->lock.hw_lock ) {
|
||||||
dev->lock.hw_lock = NULL; /* SHM removed */
|
dev->sigdata.lock = dev->lock.hw_lock = NULL; /* SHM removed */
|
||||||
dev->lock.pid = 0;
|
dev->lock.pid = 0;
|
||||||
wake_up_interruptible( &dev->lock.lock_queue );
|
wake_up_interruptible( &dev->lock.lock_queue );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -237,7 +237,7 @@ int DRM(notifier)(void *priv)
|
||||||
|
|
||||||
|
|
||||||
/* Allow signal delivery if lock isn't held */
|
/* Allow signal delivery if lock isn't held */
|
||||||
if (!_DRM_LOCK_IS_HELD(s->lock->lock)
|
if (!s->lock || !_DRM_LOCK_IS_HELD(s->lock->lock)
|
||||||
|| _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1;
|
|| _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1;
|
||||||
|
|
||||||
/* Otherwise, set flag to force call to
|
/* Otherwise, set flag to force call to
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@
|
||||||
*
|
*
|
||||||
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
|
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
* Jeff Hartmann <jhartmann@valinux.com>
|
||||||
* Keith Whitwell <keithw@valinux.com>
|
* Keith Whitwell <keith@tungstengraphics.com>
|
||||||
* Abraham vd Merwe <abraham@2d3d.co.za>
|
* Abraham vd Merwe <abraham@2d3d.co.za>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -40,9 +40,10 @@
|
||||||
#include <linux/interrupt.h> /* For task queue support */
|
#include <linux/interrupt.h> /* For task queue support */
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
|
|
||||||
/* in case we don't have a 2.3.99-pre6 kernel or later: */
|
#ifdef DO_MUNMAP_4_ARGS
|
||||||
#ifndef VM_DONTCOPY
|
#define DO_MUNMAP(m, a, l) do_munmap(m, a, l, 1)
|
||||||
#define VM_DONTCOPY 0
|
#else
|
||||||
|
#define DO_MUNMAP(m, a, l) do_munmap(m, a, l)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define I830_BUF_FREE 2
|
#define I830_BUF_FREE 2
|
||||||
|
|
@ -54,26 +55,24 @@
|
||||||
|
|
||||||
#define RING_LOCALS unsigned int outring, ringmask; volatile char *virt;
|
#define RING_LOCALS unsigned int outring, ringmask; volatile char *virt;
|
||||||
|
|
||||||
|
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,2)
|
||||||
|
#define down_write down
|
||||||
|
#define up_write up
|
||||||
|
#endif
|
||||||
|
|
||||||
#define DO_IDLE_WORKAROUND() \
|
#ifndef LockPage
|
||||||
do { \
|
#define LockPage(page) set_bit(PG_locked, &(page)->flags)
|
||||||
int _head; \
|
#endif
|
||||||
int _tail; \
|
#ifndef UnlockPage
|
||||||
do { \
|
#define UnlockPage(page) unlock_page(page)
|
||||||
_head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR; \
|
#endif
|
||||||
_tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR; \
|
|
||||||
udelay(10); \
|
|
||||||
} while(_head != _tail); \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
#define I830_SYNC_WORKAROUND 0
|
#define I830_VERBOSE 0
|
||||||
|
|
||||||
#define BEGIN_LP_RING(n) do { \
|
#define BEGIN_LP_RING(n) do { \
|
||||||
if (I830_VERBOSE) \
|
if (I830_VERBOSE) \
|
||||||
DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \
|
printk("BEGIN_LP_RING(%d) in %s\n", \
|
||||||
n, __FUNCTION__); \
|
n, __FUNCTION__); \
|
||||||
if (I830_SYNC_WORKAROUND) \
|
|
||||||
DO_IDLE_WORKAROUND(); \
|
|
||||||
if (dev_priv->ring.space < n*4) \
|
if (dev_priv->ring.space < n*4) \
|
||||||
i830_wait_ring(dev, n*4); \
|
i830_wait_ring(dev, n*4); \
|
||||||
dev_priv->ring.space -= n*4; \
|
dev_priv->ring.space -= n*4; \
|
||||||
|
|
@ -83,13 +82,13 @@ do { \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define ADVANCE_LP_RING() do { \
|
#define ADVANCE_LP_RING() do { \
|
||||||
if (I830_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n"); \
|
if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring); \
|
||||||
dev_priv->ring.tail = outring; \
|
dev_priv->ring.tail = outring; \
|
||||||
I830_WRITE(LP_RING + RING_TAIL, outring); \
|
I830_WRITE(LP_RING + RING_TAIL, outring); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
#define OUT_RING(n) do { \
|
#define OUT_RING(n) do { \
|
||||||
if (I830_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \
|
if (I830_VERBOSE) printk(" OUT_RING %x\n", (int)(n)); \
|
||||||
*(volatile unsigned int *)(virt + outring) = n; \
|
*(volatile unsigned int *)(virt + outring) = n; \
|
||||||
outring += 4; \
|
outring += 4; \
|
||||||
outring &= ringmask; \
|
outring &= ringmask; \
|
||||||
|
|
@ -201,36 +200,24 @@ static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
|
||||||
|
|
||||||
if(buf_priv->currently_mapped == I830_BUF_MAPPED) return -EINVAL;
|
if(buf_priv->currently_mapped == I830_BUF_MAPPED) return -EINVAL;
|
||||||
|
|
||||||
if(VM_DONTCOPY != 0) {
|
down_write( ¤t->mm->mmap_sem );
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
old_fops = filp->f_op;
|
||||||
down( ¤t->mm->mmap_sem );
|
filp->f_op = &i830_buffer_fops;
|
||||||
#else
|
dev_priv->mmap_buffer = buf;
|
||||||
down_write( ¤t->mm->mmap_sem );
|
buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
|
||||||
#endif
|
PROT_READ|PROT_WRITE,
|
||||||
old_fops = filp->f_op;
|
MAP_SHARED,
|
||||||
filp->f_op = &i830_buffer_fops;
|
buf->bus_address);
|
||||||
dev_priv->mmap_buffer = buf;
|
dev_priv->mmap_buffer = NULL;
|
||||||
buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
|
filp->f_op = old_fops;
|
||||||
PROT_READ|PROT_WRITE,
|
if ((unsigned long)buf_priv->virtual > -1024UL) {
|
||||||
MAP_SHARED,
|
/* Real error */
|
||||||
buf->bus_address);
|
DRM_ERROR("mmap error\n");
|
||||||
dev_priv->mmap_buffer = NULL;
|
retcode = (signed int)buf_priv->virtual;
|
||||||
filp->f_op = old_fops;
|
buf_priv->virtual = 0;
|
||||||
if ((unsigned long)buf_priv->virtual > -1024UL) {
|
|
||||||
/* Real error */
|
|
||||||
DRM_DEBUG("mmap error\n");
|
|
||||||
retcode = (signed int)buf_priv->virtual;
|
|
||||||
buf_priv->virtual = 0;
|
|
||||||
}
|
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
|
||||||
up( ¤t->mm->mmap_sem );
|
|
||||||
#else
|
|
||||||
up_write( ¤t->mm->mmap_sem );
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
buf_priv->virtual = buf_priv->kernel_virtual;
|
|
||||||
buf_priv->currently_mapped = I830_BUF_MAPPED;
|
|
||||||
}
|
}
|
||||||
|
up_write( ¤t->mm->mmap_sem );
|
||||||
|
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -239,25 +226,15 @@ static int i830_unmap_buffer(drm_buf_t *buf)
|
||||||
drm_i830_buf_priv_t *buf_priv = buf->dev_private;
|
drm_i830_buf_priv_t *buf_priv = buf->dev_private;
|
||||||
int retcode = 0;
|
int retcode = 0;
|
||||||
|
|
||||||
if(VM_DONTCOPY != 0) {
|
if(buf_priv->currently_mapped != I830_BUF_MAPPED)
|
||||||
if(buf_priv->currently_mapped != I830_BUF_MAPPED)
|
return -EINVAL;
|
||||||
return -EINVAL;
|
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
|
||||||
down( ¤t->mm->mmap_sem );
|
|
||||||
#else
|
|
||||||
down_write( ¤t->mm->mmap_sem );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
retcode = do_munmap(current->mm,
|
down_write(¤t->mm->mmap_sem);
|
||||||
(unsigned long)buf_priv->virtual,
|
retcode = DO_MUNMAP(current->mm,
|
||||||
(size_t) buf->total);
|
(unsigned long)buf_priv->virtual,
|
||||||
|
(size_t) buf->total);
|
||||||
|
up_write(¤t->mm->mmap_sem);
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
|
||||||
up( ¤t->mm->mmap_sem );
|
|
||||||
#else
|
|
||||||
up_write( ¤t->mm->mmap_sem );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
buf_priv->currently_mapped = I830_BUF_UNMAPPED;
|
buf_priv->currently_mapped = I830_BUF_UNMAPPED;
|
||||||
buf_priv->virtual = 0;
|
buf_priv->virtual = 0;
|
||||||
|
|
||||||
|
|
@ -275,14 +252,14 @@ static int i830_dma_get_buffer(drm_device_t *dev, drm_i830_dma_t *d,
|
||||||
buf = i830_freelist_get(dev);
|
buf = i830_freelist_get(dev);
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
retcode = -ENOMEM;
|
retcode = -ENOMEM;
|
||||||
DRM_DEBUG("retcode=%d\n", retcode);
|
DRM_ERROR("retcode=%d\n", retcode);
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
retcode = i830_map_buffer(buf, filp);
|
retcode = i830_map_buffer(buf, filp);
|
||||||
if(retcode) {
|
if(retcode) {
|
||||||
i830_freelist_put(dev, buf);
|
i830_freelist_put(dev, buf);
|
||||||
DRM_DEBUG("mapbuf failed, retcode %d\n", retcode);
|
DRM_ERROR("mapbuf failed, retcode %d\n", retcode);
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
buf->pid = priv->pid;
|
buf->pid = priv->pid;
|
||||||
|
|
@ -303,32 +280,17 @@ static unsigned long i830_alloc_page(drm_device_t *dev)
|
||||||
if(address == 0UL)
|
if(address == 0UL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < 0x020409
|
|
||||||
atomic_inc(&virt_to_page(address)->count);
|
|
||||||
set_bit(PG_locked, &virt_to_page(address)->flags);
|
|
||||||
#else
|
|
||||||
get_page(virt_to_page(address));
|
get_page(virt_to_page(address));
|
||||||
#if LINUX_VERSION_CODE < 0x020500
|
|
||||||
LockPage(virt_to_page(address));
|
LockPage(virt_to_page(address));
|
||||||
#else
|
|
||||||
SetPageLocked(virt_to_page(address));
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
return address;
|
return address;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void i830_free_page(drm_device_t *dev, unsigned long page)
|
static void i830_free_page(drm_device_t *dev, unsigned long page)
|
||||||
{
|
{
|
||||||
if (page) {
|
if (page) {
|
||||||
#if LINUX_VERSION_CODE < 0x020409
|
|
||||||
atomic_dec(&virt_to_page(page)->count);
|
|
||||||
clear_bit(PG_locked, &virt_to_page(page)->flags);
|
|
||||||
wake_up(&virt_to_page(page)->wait);
|
|
||||||
#else
|
|
||||||
struct page *p = virt_to_page(page);
|
struct page *p = virt_to_page(page);
|
||||||
put_page(p);
|
put_page(p);
|
||||||
unlock_page(p);
|
UnlockPage(p);
|
||||||
#endif
|
|
||||||
free_page(page);
|
free_page(page);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -384,7 +346,7 @@ static int i830_wait_ring(drm_device_t *dev, int n)
|
||||||
}
|
}
|
||||||
|
|
||||||
iters++;
|
iters++;
|
||||||
if((signed)(end - jiffies) <= 0) {
|
if(time_before(end, jiffies)) {
|
||||||
DRM_ERROR("space: %d wanted %d\n", ring->space, n);
|
DRM_ERROR("space: %d wanted %d\n", ring->space, n);
|
||||||
DRM_ERROR("lockup\n");
|
DRM_ERROR("lockup\n");
|
||||||
goto out_wait_ring;
|
goto out_wait_ring;
|
||||||
|
|
@ -402,7 +364,7 @@ static void i830_kernel_lost_context(drm_device_t *dev)
|
||||||
drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
|
drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
|
||||||
|
|
||||||
ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
|
ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
|
||||||
ring->tail = I830_READ(LP_RING + RING_TAIL);
|
ring->tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR;
|
||||||
ring->space = ring->head - (ring->tail+8);
|
ring->space = ring->head - (ring->tail+8);
|
||||||
if (ring->space < 0) ring->space += ring->Size;
|
if (ring->space < 0) ring->space += ring->Size;
|
||||||
}
|
}
|
||||||
|
|
@ -478,9 +440,6 @@ static int i830_dma_initialize(drm_device_t *dev,
|
||||||
((u8 *)dev_priv->sarea_map->handle +
|
((u8 *)dev_priv->sarea_map->handle +
|
||||||
init->sarea_priv_offset);
|
init->sarea_priv_offset);
|
||||||
|
|
||||||
atomic_set(&dev_priv->flush_done, 0);
|
|
||||||
init_waitqueue_head(&dev_priv->flush_queue);
|
|
||||||
|
|
||||||
dev_priv->ring.Start = init->ring_start;
|
dev_priv->ring.Start = init->ring_start;
|
||||||
dev_priv->ring.End = init->ring_end;
|
dev_priv->ring.End = init->ring_end;
|
||||||
dev_priv->ring.Size = init->ring_size;
|
dev_priv->ring.Size = init->ring_size;
|
||||||
|
|
@ -504,11 +463,17 @@ static int i830_dma_initialize(drm_device_t *dev,
|
||||||
dev_priv->pitch = init->pitch;
|
dev_priv->pitch = init->pitch;
|
||||||
dev_priv->back_offset = init->back_offset;
|
dev_priv->back_offset = init->back_offset;
|
||||||
dev_priv->depth_offset = init->depth_offset;
|
dev_priv->depth_offset = init->depth_offset;
|
||||||
|
dev_priv->front_offset = init->front_offset;
|
||||||
|
|
||||||
dev_priv->front_di1 = init->front_offset | init->pitch_bits;
|
dev_priv->front_di1 = init->front_offset | init->pitch_bits;
|
||||||
dev_priv->back_di1 = init->back_offset | init->pitch_bits;
|
dev_priv->back_di1 = init->back_offset | init->pitch_bits;
|
||||||
dev_priv->zi1 = init->depth_offset | init->pitch_bits;
|
dev_priv->zi1 = init->depth_offset | init->pitch_bits;
|
||||||
|
|
||||||
|
DRM_DEBUG("front_di1 %x\n", dev_priv->front_di1);
|
||||||
|
DRM_DEBUG("back_offset %x\n", dev_priv->back_offset);
|
||||||
|
DRM_DEBUG("back_di1 %x\n", dev_priv->back_di1);
|
||||||
|
DRM_DEBUG("pitch_bits %x\n", init->pitch_bits);
|
||||||
|
|
||||||
dev_priv->cpp = init->cpp;
|
dev_priv->cpp = init->cpp;
|
||||||
/* We are using seperate values as placeholders for mechanisms for
|
/* We are using seperate values as placeholders for mechanisms for
|
||||||
* private backbuffer/depthbuffer usage.
|
* private backbuffer/depthbuffer usage.
|
||||||
|
|
@ -574,38 +539,57 @@ int i830_dma_init(struct inode *inode, struct file *filp,
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16))
|
||||||
|
#define ST1_ENABLE (1<<16)
|
||||||
|
#define ST1_MASK (0xffff)
|
||||||
|
|
||||||
/* Most efficient way to verify state for the i830 is as it is
|
/* Most efficient way to verify state for the i830 is as it is
|
||||||
* emitted. Non-conformant state is silently dropped.
|
* emitted. Non-conformant state is silently dropped.
|
||||||
*
|
|
||||||
* Use 'volatile' & local var tmp to force the emitted values to be
|
|
||||||
* identical to the verified ones.
|
|
||||||
*/
|
*/
|
||||||
static void i830EmitContextVerified( drm_device_t *dev,
|
static void i830EmitContextVerified( drm_device_t *dev,
|
||||||
volatile unsigned int *code )
|
unsigned int *code )
|
||||||
{
|
{
|
||||||
drm_i830_private_t *dev_priv = dev->dev_private;
|
drm_i830_private_t *dev_priv = dev->dev_private;
|
||||||
int i, j = 0;
|
int i, j = 0;
|
||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
||||||
BEGIN_LP_RING( I830_CTX_SETUP_SIZE );
|
BEGIN_LP_RING( I830_CTX_SETUP_SIZE + 2 );
|
||||||
for ( i = 0 ; i < I830_CTX_SETUP_SIZE ; i++ ) {
|
|
||||||
tmp = code[i];
|
|
||||||
|
|
||||||
#if 0
|
OUT_RING( GFX_OP_STIPPLE );
|
||||||
if ((tmp & (7<<29)) == (3<<29) &&
|
OUT_RING( 0 );
|
||||||
|
|
||||||
|
|
||||||
|
for ( i = 0 ; i < I830_CTXREG_BLENDCOLR0 ; i++ ) {
|
||||||
|
tmp = code[i];
|
||||||
|
if ((tmp & (7<<29)) == CMD_3D &&
|
||||||
(tmp & (0x1f<<24)) < (0x1d<<24)) {
|
(tmp & (0x1f<<24)) < (0x1d<<24)) {
|
||||||
OUT_RING( tmp );
|
OUT_RING( tmp );
|
||||||
j++;
|
j++;
|
||||||
} else {
|
} else {
|
||||||
printk("Skipping %d\n", i);
|
DRM_ERROR("Skipping %d\n", i);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
OUT_RING( tmp );
|
|
||||||
j++;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OUT_RING( STATE3D_CONST_BLEND_COLOR_CMD );
|
||||||
|
OUT_RING( code[I830_CTXREG_BLENDCOLR] );
|
||||||
|
j += 2;
|
||||||
|
|
||||||
|
for ( i = I830_CTXREG_VF ; i < I830_CTXREG_MCSB0 ; i++ ) {
|
||||||
|
tmp = code[i];
|
||||||
|
if ((tmp & (7<<29)) == CMD_3D &&
|
||||||
|
(tmp & (0x1f<<24)) < (0x1d<<24)) {
|
||||||
|
OUT_RING( tmp );
|
||||||
|
j++;
|
||||||
|
} else {
|
||||||
|
DRM_ERROR("Skipping %d\n", i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
OUT_RING( STATE3D_MAP_COORD_SETBIND_CMD );
|
||||||
|
OUT_RING( code[I830_CTXREG_MCSB1] );
|
||||||
|
j += 2;
|
||||||
|
|
||||||
if (j & 1)
|
if (j & 1)
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
|
|
||||||
|
|
@ -650,6 +634,9 @@ static void i830EmitTexBlendVerified( drm_device_t *dev,
|
||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
||||||
|
if (!num)
|
||||||
|
return;
|
||||||
|
|
||||||
BEGIN_LP_RING( num );
|
BEGIN_LP_RING( num );
|
||||||
|
|
||||||
for ( i = 0 ; i < num ; i++ ) {
|
for ( i = 0 ; i < num ; i++ ) {
|
||||||
|
|
@ -723,7 +710,7 @@ static void i830EmitDestVerified( drm_device_t *dev,
|
||||||
BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
|
BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
|
||||||
OUT_RING( dev_priv->zi1 );
|
OUT_RING( dev_priv->zi1 );
|
||||||
} else {
|
} else {
|
||||||
DRM_DEBUG("bad di1 %x (allow %x or %x)\n",
|
DRM_ERROR("bad di1 %x (allow %x or %x)\n",
|
||||||
tmp, dev_priv->front_di1, dev_priv->back_di1);
|
tmp, dev_priv->front_di1, dev_priv->back_di1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -745,7 +732,7 @@ static void i830EmitDestVerified( drm_device_t *dev,
|
||||||
if((tmp & ~0x3) == GFX_OP_SCISSOR_ENABLE) {
|
if((tmp & ~0x3) == GFX_OP_SCISSOR_ENABLE) {
|
||||||
OUT_RING( tmp );
|
OUT_RING( tmp );
|
||||||
} else {
|
} else {
|
||||||
DRM_DEBUG("bad scissor enable\n");
|
DRM_ERROR("bad scissor enable\n");
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -865,7 +852,7 @@ static void i830_dma_dispatch_clear( drm_device_t *dev, int flags,
|
||||||
OUT_RING( BR13 );
|
OUT_RING( BR13 );
|
||||||
OUT_RING( (pbox->y1 << 16) | pbox->x1 );
|
OUT_RING( (pbox->y1 << 16) | pbox->x1 );
|
||||||
OUT_RING( (pbox->y2 << 16) | pbox->x2 );
|
OUT_RING( (pbox->y2 << 16) | pbox->x2 );
|
||||||
OUT_RING( 0 );
|
OUT_RING( dev_priv->front_offset );
|
||||||
OUT_RING( clear_color );
|
OUT_RING( clear_color );
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
}
|
}
|
||||||
|
|
@ -953,7 +940,7 @@ static void i830_dma_dispatch_swap( drm_device_t *dev )
|
||||||
OUT_RING( (pbox->y2 << 16) |
|
OUT_RING( (pbox->y2 << 16) |
|
||||||
pbox->x2 );
|
pbox->x2 );
|
||||||
|
|
||||||
OUT_RING( 0 /* front ofs always zero */ );
|
OUT_RING( dev_priv->front_offset );
|
||||||
OUT_RING( (pbox->y1 << 16) |
|
OUT_RING( (pbox->y1 << 16) |
|
||||||
pbox->x1 );
|
pbox->x1 );
|
||||||
|
|
||||||
|
|
@ -993,7 +980,7 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (used > 4*1024)
|
if (used > 4*1023)
|
||||||
used = 0;
|
used = 0;
|
||||||
|
|
||||||
if (sarea_priv->dirty)
|
if (sarea_priv->dirty)
|
||||||
|
|
@ -1010,12 +997,17 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
|
||||||
DRM_DEBUG( "start + used - 4 : %ld\n", start + used - 4);
|
DRM_DEBUG( "start + used - 4 : %ld\n", start + used - 4);
|
||||||
|
|
||||||
if (buf_priv->currently_mapped == I830_BUF_MAPPED) {
|
if (buf_priv->currently_mapped == I830_BUF_MAPPED) {
|
||||||
*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE |
|
u32 *vp = buf_priv->virtual;
|
||||||
sarea_priv->vertex_prim |
|
|
||||||
((used/4)-2));
|
vp[0] = (GFX_OP_PRIMITIVE |
|
||||||
|
sarea_priv->vertex_prim |
|
||||||
|
((used/4)-2));
|
||||||
|
|
||||||
|
vp[used/4] = MI_BATCH_BUFFER_END;
|
||||||
|
used += 4;
|
||||||
|
|
||||||
if (used & 4) {
|
if (used & 4) {
|
||||||
*(u32 *)((u32)buf_priv->virtual + used) = 0;
|
vp[used/4] = 0;
|
||||||
used += 4;
|
used += 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1035,80 +1027,35 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_LP_RING(4);
|
BEGIN_LP_RING(2);
|
||||||
|
OUT_RING( MI_BATCH_BUFFER_START | (2<<6) );
|
||||||
OUT_RING( MI_BATCH_BUFFER );
|
|
||||||
OUT_RING( start | MI_BATCH_NON_SECURE );
|
OUT_RING( start | MI_BATCH_NON_SECURE );
|
||||||
OUT_RING( start + used - 4 );
|
|
||||||
OUT_RING( 0 );
|
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
|
|
||||||
} while (++i < nbox);
|
} while (++i < nbox);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_LP_RING(10);
|
|
||||||
OUT_RING( CMD_STORE_DWORD_IDX );
|
|
||||||
OUT_RING( 20 );
|
|
||||||
OUT_RING( dev_priv->counter );
|
|
||||||
OUT_RING( 0 );
|
|
||||||
|
|
||||||
if (discard) {
|
if (discard) {
|
||||||
|
dev_priv->counter++;
|
||||||
|
|
||||||
|
(void) cmpxchg(buf_priv->in_use, I830_BUF_CLIENT,
|
||||||
|
I830_BUF_HARDWARE);
|
||||||
|
|
||||||
|
BEGIN_LP_RING(8);
|
||||||
|
OUT_RING( CMD_STORE_DWORD_IDX );
|
||||||
|
OUT_RING( 20 );
|
||||||
|
OUT_RING( dev_priv->counter );
|
||||||
OUT_RING( CMD_STORE_DWORD_IDX );
|
OUT_RING( CMD_STORE_DWORD_IDX );
|
||||||
OUT_RING( buf_priv->my_use_idx );
|
OUT_RING( buf_priv->my_use_idx );
|
||||||
OUT_RING( I830_BUF_FREE );
|
OUT_RING( I830_BUF_FREE );
|
||||||
|
OUT_RING( CMD_REPORT_HEAD );
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
|
ADVANCE_LP_RING();
|
||||||
}
|
}
|
||||||
|
|
||||||
OUT_RING( CMD_REPORT_HEAD );
|
|
||||||
OUT_RING( 0 );
|
|
||||||
ADVANCE_LP_RING();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Interrupts are only for flushing */
|
|
||||||
void i830_dma_service(int irq, void *device, struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
drm_device_t *dev = (drm_device_t *)device;
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
u16 temp;
|
|
||||||
|
|
||||||
temp = I830_READ16(I830REG_INT_IDENTITY_R);
|
|
||||||
temp = temp & ~(0x6000);
|
|
||||||
if(temp != 0) I830_WRITE16(I830REG_INT_IDENTITY_R,
|
|
||||||
temp); /* Clear all interrupts */
|
|
||||||
else
|
|
||||||
return;
|
|
||||||
|
|
||||||
queue_task(&dev->tq, &tq_immediate);
|
|
||||||
mark_bh(IMMEDIATE_BH);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DRM(dma_immediate_bh)(void *device)
|
void i830_dma_quiescent(drm_device_t *dev)
|
||||||
{
|
|
||||||
drm_device_t *dev = (drm_device_t *) device;
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
|
|
||||||
atomic_set(&dev_priv->flush_done, 1);
|
|
||||||
wake_up_interruptible(&dev_priv->flush_queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void i830_dma_emit_flush(drm_device_t *dev)
|
|
||||||
{
|
|
||||||
drm_i830_private_t *dev_priv = dev->dev_private;
|
|
||||||
RING_LOCALS;
|
|
||||||
|
|
||||||
i830_kernel_lost_context(dev);
|
|
||||||
|
|
||||||
BEGIN_LP_RING(2);
|
|
||||||
OUT_RING( CMD_REPORT_HEAD );
|
|
||||||
OUT_RING( GFX_OP_USER_INTERRUPT );
|
|
||||||
ADVANCE_LP_RING();
|
|
||||||
|
|
||||||
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
|
||||||
atomic_set(&dev_priv->flush_done, 1);
|
|
||||||
wake_up_interruptible(&dev_priv->flush_queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void i830_dma_quiescent_emit(drm_device_t *dev)
|
|
||||||
{
|
{
|
||||||
drm_i830_private_t *dev_priv = dev->dev_private;
|
drm_i830_private_t *dev_priv = dev->dev_private;
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
@ -1119,79 +1066,27 @@ static inline void i830_dma_quiescent_emit(drm_device_t *dev)
|
||||||
OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
|
OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
|
||||||
OUT_RING( CMD_REPORT_HEAD );
|
OUT_RING( CMD_REPORT_HEAD );
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
OUT_RING( GFX_OP_USER_INTERRUPT );
|
OUT_RING( 0 );
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
|
|
||||||
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
||||||
atomic_set(&dev_priv->flush_done, 1);
|
|
||||||
wake_up_interruptible(&dev_priv->flush_queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
void i830_dma_quiescent(drm_device_t *dev)
|
|
||||||
{
|
|
||||||
DECLARE_WAITQUEUE(entry, current);
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
unsigned long end;
|
|
||||||
|
|
||||||
if(dev_priv == NULL) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
atomic_set(&dev_priv->flush_done, 0);
|
|
||||||
add_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
end = jiffies + (HZ*3);
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
current->state = TASK_INTERRUPTIBLE;
|
|
||||||
i830_dma_quiescent_emit(dev);
|
|
||||||
if (atomic_read(&dev_priv->flush_done) == 1) break;
|
|
||||||
if((signed)(end - jiffies) <= 0) {
|
|
||||||
DRM_ERROR("lockup\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
schedule_timeout(HZ*3);
|
|
||||||
if (signal_pending(current)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
current->state = TASK_RUNNING;
|
|
||||||
remove_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int i830_flush_queue(drm_device_t *dev)
|
static int i830_flush_queue(drm_device_t *dev)
|
||||||
{
|
{
|
||||||
DECLARE_WAITQUEUE(entry, current);
|
drm_i830_private_t *dev_priv = dev->dev_private;
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
drm_device_dma_t *dma = dev->dma;
|
drm_device_dma_t *dma = dev->dma;
|
||||||
unsigned long end;
|
int i, ret = 0;
|
||||||
int i, ret = 0;
|
RING_LOCALS;
|
||||||
|
|
||||||
|
i830_kernel_lost_context(dev);
|
||||||
|
|
||||||
if(dev_priv == NULL) {
|
BEGIN_LP_RING(2);
|
||||||
return 0;
|
OUT_RING( CMD_REPORT_HEAD );
|
||||||
}
|
OUT_RING( 0 );
|
||||||
atomic_set(&dev_priv->flush_done, 0);
|
ADVANCE_LP_RING();
|
||||||
add_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
end = jiffies + (HZ*3);
|
|
||||||
for (;;) {
|
|
||||||
current->state = TASK_INTERRUPTIBLE;
|
|
||||||
i830_dma_emit_flush(dev);
|
|
||||||
if (atomic_read(&dev_priv->flush_done) == 1) break;
|
|
||||||
if((signed)(end - jiffies) <= 0) {
|
|
||||||
DRM_ERROR("lockup\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
schedule_timeout(HZ*3);
|
|
||||||
if (signal_pending(current)) {
|
|
||||||
ret = -EINTR; /* Can't restart */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
current->state = TASK_RUNNING;
|
|
||||||
remove_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
|
|
||||||
|
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
||||||
|
|
||||||
for (i = 0; i < dma->buf_count; i++) {
|
for (i = 0; i < dma->buf_count; i++) {
|
||||||
drm_buf_t *buf = dma->buflist[ i ];
|
drm_buf_t *buf = dma->buflist[ i ];
|
||||||
|
|
@ -1203,7 +1098,7 @@ static int i830_flush_queue(drm_device_t *dev)
|
||||||
if (used == I830_BUF_HARDWARE)
|
if (used == I830_BUF_HARDWARE)
|
||||||
DRM_DEBUG("reclaimed from HARDWARE\n");
|
DRM_DEBUG("reclaimed from HARDWARE\n");
|
||||||
if (used == I830_BUF_CLIENT)
|
if (used == I830_BUF_CLIENT)
|
||||||
DRM_DEBUG("still on client HARDWARE\n");
|
DRM_DEBUG("still on client\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -1242,8 +1137,7 @@ int i830_flush_ioctl(struct inode *inode, struct file *filp,
|
||||||
{
|
{
|
||||||
drm_file_t *priv = filp->private_data;
|
drm_file_t *priv = filp->private_data;
|
||||||
drm_device_t *dev = priv->dev;
|
drm_device_t *dev = priv->dev;
|
||||||
|
|
||||||
DRM_DEBUG("i830_flush_ioctl\n");
|
|
||||||
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
||||||
DRM_ERROR("i830_flush_ioctl called without lock held\n");
|
DRM_ERROR("i830_flush_ioctl called without lock held\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
@ -1381,46 +1275,17 @@ int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
int i830_copybuf(struct inode *inode, struct file *filp, unsigned int cmd,
|
int i830_copybuf(struct inode *inode,
|
||||||
unsigned long arg)
|
struct file *filp,
|
||||||
|
unsigned int cmd,
|
||||||
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
drm_file_t *priv = filp->private_data;
|
/* Never copy - 2.4.x doesn't need it */
|
||||||
drm_device_t *dev = priv->dev;
|
|
||||||
drm_i830_copy_t d;
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
u32 *hw_status = (u32 *)dev_priv->hw_status_page;
|
|
||||||
drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *)
|
|
||||||
dev_priv->sarea_priv;
|
|
||||||
drm_buf_t *buf;
|
|
||||||
drm_i830_buf_priv_t *buf_priv;
|
|
||||||
drm_device_dma_t *dma = dev->dma;
|
|
||||||
|
|
||||||
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
|
||||||
DRM_ERROR("i830_dma called without lock held\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (copy_from_user(&d, (drm_i830_copy_t *)arg, sizeof(d)))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
if(d.idx < 0 || d.idx > dma->buf_count) return -EINVAL;
|
|
||||||
buf = dma->buflist[ d.idx ];
|
|
||||||
buf_priv = buf->dev_private;
|
|
||||||
if (buf_priv->currently_mapped != I830_BUF_MAPPED) return -EPERM;
|
|
||||||
|
|
||||||
if(d.used < 0 || d.used > buf->total) return -EINVAL;
|
|
||||||
|
|
||||||
if (copy_from_user(buf_priv->virtual, d.address, d.used))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
sarea_priv->last_dispatch = (int) hw_status[5];
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
|
int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
|
||||||
unsigned long arg)
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
if(VM_DONTCOPY == 0) return 1;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
* Jeff Hartmann <jhartmann@valinux.com>
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
* Gareth Hughes <gareth@valinux.com>
|
||||||
* Abraham vd Merwe <abraham@2d3d.co.za>
|
* Abraham vd Merwe <abraham@2d3d.co.za>
|
||||||
|
* Keith Whitwell <keith@tungstengraphics.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
|
|
|
||||||
|
|
@ -64,14 +64,13 @@ typedef struct drm_i830_private {
|
||||||
unsigned long hw_status_page;
|
unsigned long hw_status_page;
|
||||||
unsigned long counter;
|
unsigned long counter;
|
||||||
|
|
||||||
atomic_t flush_done;
|
|
||||||
wait_queue_head_t flush_queue; /* Processes waiting until flush */
|
|
||||||
drm_buf_t *mmap_buffer;
|
drm_buf_t *mmap_buffer;
|
||||||
|
|
||||||
u32 front_di1, back_di1, zi1;
|
u32 front_di1, back_di1, zi1;
|
||||||
|
|
||||||
int back_offset;
|
int back_offset;
|
||||||
int depth_offset;
|
int depth_offset;
|
||||||
|
int front_offset;
|
||||||
int w, h;
|
int w, h;
|
||||||
int pitch;
|
int pitch;
|
||||||
int back_pitch;
|
int back_pitch;
|
||||||
|
|
@ -107,14 +106,13 @@ extern int i830_swap_bufs(struct inode *inode, struct file *filp,
|
||||||
extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
unsigned int cmd, unsigned long arg);
|
unsigned int cmd, unsigned long arg);
|
||||||
|
|
||||||
#define I830_VERBOSE 0
|
|
||||||
|
|
||||||
#define I830_BASE(reg) ((unsigned long) \
|
#define I830_BASE(reg) ((unsigned long) \
|
||||||
dev_priv->mmio_map->handle)
|
dev_priv->mmio_map->handle)
|
||||||
#define I830_ADDR(reg) (I830_BASE(reg) + reg)
|
#define I830_ADDR(reg) (I830_BASE(reg) + reg)
|
||||||
#define I830_DEREF(reg) *(__volatile__ int *)I830_ADDR(reg)
|
#define I830_DEREF(reg) *(__volatile__ unsigned int *)I830_ADDR(reg)
|
||||||
#define I830_READ(reg) I830_DEREF(reg)
|
#define I830_READ(reg) readl((volatile u32 *)I830_ADDR(reg))
|
||||||
#define I830_WRITE(reg,val) do { I830_DEREF(reg) = val; } while (0)
|
#define I830_WRITE(reg,val) writel(val, (volatile u32 *)I830_ADDR(reg))
|
||||||
#define I830_DEREF16(reg) *(__volatile__ u16 *)I830_ADDR(reg)
|
#define I830_DEREF16(reg) *(__volatile__ u16 *)I830_ADDR(reg)
|
||||||
#define I830_READ16(reg) I830_DEREF16(reg)
|
#define I830_READ16(reg) I830_DEREF16(reg)
|
||||||
#define I830_WRITE16(reg,val) do { I830_DEREF16(reg) = val; } while (0)
|
#define I830_WRITE16(reg,val) do { I830_DEREF16(reg) = val; } while (0)
|
||||||
|
|
@ -143,15 +141,15 @@ extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
#define LP_RING 0x2030
|
#define LP_RING 0x2030
|
||||||
#define HP_RING 0x2040
|
#define HP_RING 0x2040
|
||||||
#define RING_TAIL 0x00
|
#define RING_TAIL 0x00
|
||||||
#define TAIL_ADDR 0x000FFFF8
|
#define TAIL_ADDR 0x001FFFF8
|
||||||
#define RING_HEAD 0x04
|
#define RING_HEAD 0x04
|
||||||
#define HEAD_WRAP_COUNT 0xFFE00000
|
#define HEAD_WRAP_COUNT 0xFFE00000
|
||||||
#define HEAD_WRAP_ONE 0x00200000
|
#define HEAD_WRAP_ONE 0x00200000
|
||||||
#define HEAD_ADDR 0x001FFFFC
|
#define HEAD_ADDR 0x001FFFFC
|
||||||
#define RING_START 0x08
|
#define RING_START 0x08
|
||||||
#define START_ADDR 0x00FFFFF8
|
#define START_ADDR 0x0xFFFFF000
|
||||||
#define RING_LEN 0x0C
|
#define RING_LEN 0x0C
|
||||||
#define RING_NR_PAGES 0x000FF000
|
#define RING_NR_PAGES 0x001FF000
|
||||||
#define RING_REPORT_MASK 0x00000006
|
#define RING_REPORT_MASK 0x00000006
|
||||||
#define RING_REPORT_64K 0x00000002
|
#define RING_REPORT_64K 0x00000002
|
||||||
#define RING_REPORT_128K 0x00000004
|
#define RING_REPORT_128K 0x00000004
|
||||||
|
|
@ -182,6 +180,9 @@ extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
|
|
||||||
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
||||||
|
|
||||||
|
#define CMD_3D (0x3<<29)
|
||||||
|
#define STATE3D_CONST_BLEND_COLOR_CMD (CMD_3D|(0x1d<<24)|(0x88<<16))
|
||||||
|
#define STATE3D_MAP_COORD_SETBIND_CMD (CMD_3D|(0x1d<<24)|(0x02<<16))
|
||||||
|
|
||||||
#define BR00_BITBLT_CLIENT 0x40000000
|
#define BR00_BITBLT_CLIENT 0x40000000
|
||||||
#define BR00_OP_COLOR_BLT 0x10000000
|
#define BR00_OP_COLOR_BLT 0x10000000
|
||||||
|
|
@ -206,6 +207,8 @@ extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
#define XY_SRC_COPY_BLT_WRITE_RGB (1<<20)
|
#define XY_SRC_COPY_BLT_WRITE_RGB (1<<20)
|
||||||
|
|
||||||
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
||||||
|
#define MI_BATCH_BUFFER_START (0x31<<23)
|
||||||
|
#define MI_BATCH_BUFFER_END (0xA<<23)
|
||||||
#define MI_BATCH_NON_SECURE (1)
|
#define MI_BATCH_NON_SECURE (1)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,9 @@ PRGLIBS =
|
||||||
# This may not be correct, but it is the best assumption we can make.
|
# This may not be correct, but it is the best assumption we can make.
|
||||||
|
|
||||||
VERSION := $(shell uname -r)
|
VERSION := $(shell uname -r)
|
||||||
|
# For Red Hat...
|
||||||
|
RHVERS := $(shell uname -r)custom
|
||||||
|
|
||||||
A := /lib/modules/$(VERSION)/build/include
|
A := /lib/modules/$(VERSION)/build/include
|
||||||
B := /usr/src/linux-$(VERSION)/include
|
B := /usr/src/linux-$(VERSION)/include
|
||||||
C := /usr/src/linux/include
|
C := /usr/src/linux/include
|
||||||
|
|
@ -90,23 +93,31 @@ V := $(shell gcc -E -nostdinc -I$A picker.c 2>/dev/null \
|
||||||
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
||||||
ifeq ($(V),"$(VERSION)")
|
ifeq ($(V),"$(VERSION)")
|
||||||
TREE := $A
|
TREE := $A
|
||||||
|
else
|
||||||
|
ifeq ($(V),"$(RHVERS)")
|
||||||
|
TREE := $A
|
||||||
else
|
else
|
||||||
V := $(shell gcc -E -nostdinc -I$B picker.c 2>/dev/null \
|
V := $(shell gcc -E -nostdinc -I$B picker.c 2>/dev/null \
|
||||||
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
||||||
ifeq ($(V),"$(VERSION)")
|
ifeq ($(V),"$(VERSION)")
|
||||||
TREE := $B
|
TREE := $B
|
||||||
else
|
else
|
||||||
V := $(shell gcc -E -nostdinc -I$C picker.c 2>/dev/null \
|
ifeq ($(V),"$(RHVERS)")
|
||||||
|
TREE := $B
|
||||||
|
else
|
||||||
|
V := $(shell gcc -E -nostdinc -I$C picker.c 2>/dev/null \
|
||||||
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
||||||
ifeq ($(V),"$(VERSION)")
|
ifeq ($(V),"$(VERSION)")
|
||||||
TREE := $C
|
TREE := $C
|
||||||
else
|
else
|
||||||
V := $(shell gcc -E -nostdinc -I$D picker.c 2>/dev/null \
|
V := $(shell gcc -E -nostdinc -I$D picker.c 2>/dev/null \
|
||||||
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
| grep -s 'RELEASE = ' | cut -d' ' -f3)
|
||||||
ifeq ($(V),"$(VERSION)")
|
ifeq ($(V),"$(VERSION)")
|
||||||
TREE := $D
|
TREE := $D
|
||||||
else
|
else
|
||||||
TREE := 0
|
TREE := 0
|
||||||
|
endif
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
@ -124,11 +135,16 @@ MODVERSIONS := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
|
||||||
AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
|
AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
|
||||||
| grep -s 'AGP = ' | cut -d' ' -f3)
|
| grep -s 'AGP = ' | cut -d' ' -f3)
|
||||||
MACHINE := $(shell echo `uname -m`)
|
MACHINE := $(shell echo `uname -m`)
|
||||||
|
# Red Hat's kernels have 4 args to do_munmap()
|
||||||
|
DOMUNMAP := $(shell grep do_munmap $(TREE)/linux/mm.h | grep -c acct)
|
||||||
ifeq ($(AGP),0)
|
ifeq ($(AGP),0)
|
||||||
AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
|
AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \
|
||||||
| grep -s 'AGP_MODULE = ' | cut -d' ' -f3)
|
| grep -s 'AGP_MODULE = ' | cut -d' ' -f3)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(DOMUNMAP),1)
|
||||||
|
MODCFLAGS += -DDO_MUNMAP_4_ARGS
|
||||||
|
endif
|
||||||
ifeq ($(AGP),1)
|
ifeq ($(AGP),1)
|
||||||
MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
|
MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
|
||||||
DRMTEMPLATES += drm_agpsupport.h
|
DRMTEMPLATES += drm_agpsupport.h
|
||||||
|
|
|
||||||
15
linux/drmP.h
15
linux/drmP.h
|
|
@ -53,6 +53,7 @@
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/smp_lock.h> /* For (un)lock_kernel */
|
#include <linux/smp_lock.h> /* For (un)lock_kernel */
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
|
#include <linux/pagemap.h>
|
||||||
#if defined(__alpha__) || defined(__powerpc__)
|
#if defined(__alpha__) || defined(__powerpc__)
|
||||||
#include <asm/pgtable.h> /* For pte_wrprotect */
|
#include <asm/pgtable.h> /* For pte_wrprotect */
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -165,7 +166,7 @@
|
||||||
#define pte_unmap(pte)
|
#define pte_unmap(pte)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < 0x020413 /* KERNEL_VERSION(2,4,19) */
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
|
||||||
static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
{
|
{
|
||||||
unsigned long addr = (unsigned long) vmalloc_addr;
|
unsigned long addr = (unsigned long) vmalloc_addr;
|
||||||
|
|
@ -190,7 +191,7 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < 0x020500
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
|
||||||
#define DRM_RPR_ARG(vma)
|
#define DRM_RPR_ARG(vma)
|
||||||
#else
|
#else
|
||||||
#define DRM_RPR_ARG(vma) vma,
|
#define DRM_RPR_ARG(vma) vma,
|
||||||
|
|
@ -201,9 +202,9 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
|
|
||||||
/* Macros to make printk easier */
|
/* Macros to make printk easier */
|
||||||
#define DRM_ERROR(fmt, arg...) \
|
#define DRM_ERROR(fmt, arg...) \
|
||||||
printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg)
|
printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg)
|
||||||
#define DRM_MEM_ERROR(area, fmt, arg...) \
|
#define DRM_MEM_ERROR(area, fmt, arg...) \
|
||||||
printk(KERN_ERR "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \
|
printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \
|
||||||
DRM(mem_stats)[area].name , ##arg)
|
DRM(mem_stats)[area].name , ##arg)
|
||||||
#define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
|
#define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
|
||||||
|
|
||||||
|
|
@ -212,8 +213,8 @@ static inline struct page * vmalloc_to_page(void * vmalloc_addr)
|
||||||
do { \
|
do { \
|
||||||
if ( DRM(flags) & DRM_FLAG_DEBUG ) \
|
if ( DRM(flags) & DRM_FLAG_DEBUG ) \
|
||||||
printk(KERN_DEBUG \
|
printk(KERN_DEBUG \
|
||||||
"[" DRM_NAME ":" __FUNCTION__ "] " fmt , \
|
"[" DRM_NAME ":%s] " fmt , \
|
||||||
##arg); \
|
__FUNCTION__ , ##arg); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#else
|
#else
|
||||||
#define DRM_DEBUG(fmt, arg...) do { } while (0)
|
#define DRM_DEBUG(fmt, arg...) do { } while (0)
|
||||||
|
|
@ -597,7 +598,7 @@ typedef struct drm_device {
|
||||||
#endif
|
#endif
|
||||||
struct pci_dev *pdev;
|
struct pci_dev *pdev;
|
||||||
#ifdef __alpha__
|
#ifdef __alpha__
|
||||||
#if LINUX_VERSION_CODE < 0x020403
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
|
||||||
struct pci_controler *hose;
|
struct pci_controler *hose;
|
||||||
#else
|
#else
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
|
||||||
}
|
}
|
||||||
map->offset = (unsigned long)map->handle;
|
map->offset = (unsigned long)map->handle;
|
||||||
if ( map->flags & _DRM_CONTAINS_LOCK ) {
|
if ( map->flags & _DRM_CONTAINS_LOCK ) {
|
||||||
|
dev->sigdata.lock =
|
||||||
dev->lock.hw_lock = map->handle; /* Pointer to lock */
|
dev->lock.hw_lock = map->handle; /* Pointer to lock */
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ static int DRM(setup)( drm_device_t *dev )
|
||||||
dev->map_count = 0;
|
dev->map_count = 0;
|
||||||
|
|
||||||
dev->vmalist = NULL;
|
dev->vmalist = NULL;
|
||||||
dev->lock.hw_lock = NULL;
|
dev->sigdata.lock = dev->lock.hw_lock = NULL;
|
||||||
init_waitqueue_head( &dev->lock.lock_queue );
|
init_waitqueue_head( &dev->lock.lock_queue );
|
||||||
dev->queue_count = 0;
|
dev->queue_count = 0;
|
||||||
dev->queue_reserved = 0;
|
dev->queue_reserved = 0;
|
||||||
|
|
@ -491,7 +491,7 @@ static int DRM(takedown)( drm_device_t *dev )
|
||||||
DRM(dma_takedown)( dev );
|
DRM(dma_takedown)( dev );
|
||||||
#endif
|
#endif
|
||||||
if ( dev->lock.hw_lock ) {
|
if ( dev->lock.hw_lock ) {
|
||||||
dev->lock.hw_lock = NULL; /* SHM removed */
|
dev->sigdata.lock = dev->lock.hw_lock = NULL; /* SHM removed */
|
||||||
dev->lock.pid = 0;
|
dev->lock.pid = 0;
|
||||||
wake_up_interruptible( &dev->lock.lock_queue );
|
wake_up_interruptible( &dev->lock.lock_queue );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -237,7 +237,7 @@ int DRM(notifier)(void *priv)
|
||||||
|
|
||||||
|
|
||||||
/* Allow signal delivery if lock isn't held */
|
/* Allow signal delivery if lock isn't held */
|
||||||
if (!_DRM_LOCK_IS_HELD(s->lock->lock)
|
if (!s->lock || !_DRM_LOCK_IS_HELD(s->lock->lock)
|
||||||
|| _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1;
|
|| _DRM_LOCKING_CONTEXT(s->lock->lock) != s->context) return 1;
|
||||||
|
|
||||||
/* Otherwise, set flag to force call to
|
/* Otherwise, set flag to force call to
|
||||||
|
|
|
||||||
52
linux/i830.h
52
linux/i830.h
|
|
@ -45,11 +45,11 @@
|
||||||
|
|
||||||
#define DRIVER_NAME "i830"
|
#define DRIVER_NAME "i830"
|
||||||
#define DRIVER_DESC "Intel 830M"
|
#define DRIVER_DESC "Intel 830M"
|
||||||
#define DRIVER_DATE "20011004"
|
#define DRIVER_DATE "20020828"
|
||||||
|
|
||||||
#define DRIVER_MAJOR 1
|
#define DRIVER_MAJOR 1
|
||||||
#define DRIVER_MINOR 2
|
#define DRIVER_MINOR 2
|
||||||
#define DRIVER_PATCHLEVEL 0
|
#define DRIVER_PATCHLEVEL 1
|
||||||
|
|
||||||
#define DRIVER_IOCTLS \
|
#define DRIVER_IOCTLS \
|
||||||
[DRM_IOCTL_NR(DRM_IOCTL_I830_INIT)] = { i830_dma_init, 1, 1 }, \
|
[DRM_IOCTL_NR(DRM_IOCTL_I830_INIT)] = { i830_dma_init, 1, 1 }, \
|
||||||
|
|
@ -87,50 +87,10 @@
|
||||||
i830_dma_quiescent( dev ); \
|
i830_dma_quiescent( dev ); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define __HAVE_DMA_IRQ 1
|
/* Don't need an irq any more. The template code will make sure that
|
||||||
#define __HAVE_DMA_IRQ_BH 1
|
* a noop stub is generated for compatibility.
|
||||||
#define __HAVE_SHARED_IRQ 1
|
*/
|
||||||
#define DRIVER_PREINSTALL() do { \
|
#define __HAVE_DMA_IRQ 0
|
||||||
drm_i830_private_t *dev_priv = \
|
|
||||||
(drm_i830_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
tmp = I830_READ16( I830REG_HWSTAM ); \
|
|
||||||
tmp = tmp & 0x6000; \
|
|
||||||
I830_WRITE16( I830REG_HWSTAM, tmp ); \
|
|
||||||
\
|
|
||||||
tmp = I830_READ16( I830REG_INT_MASK_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Unmask interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_MASK_R, tmp ); \
|
|
||||||
tmp = I830_READ16( I830REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Disable all interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DRIVER_POSTINSTALL() do { \
|
|
||||||
drm_i830_private_t *dev_priv = \
|
|
||||||
(drm_i830_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
tmp = I830_READ16( I830REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; \
|
|
||||||
tmp = tmp | 0x0003; /* Enable bp & user interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DRIVER_UNINSTALL() do { \
|
|
||||||
drm_i830_private_t *dev_priv = \
|
|
||||||
(drm_i830_private_t *)dev->dev_private; \
|
|
||||||
u16 tmp; \
|
|
||||||
if ( dev_priv ) { \
|
|
||||||
tmp = I830_READ16( I830REG_INT_IDENTITY_R ); \
|
|
||||||
tmp = tmp & ~(0x6000); /* Clear all interrupts */ \
|
|
||||||
if ( tmp != 0 ) \
|
|
||||||
I830_WRITE16( I830REG_INT_IDENTITY_R, tmp ); \
|
|
||||||
\
|
|
||||||
tmp = I830_READ16( I830REG_INT_ENABLE_R ); \
|
|
||||||
tmp = tmp & 0x6000; /* Disable all interrupts */ \
|
|
||||||
I830_WRITE16( I830REG_INT_ENABLE_R, tmp ); \
|
|
||||||
} \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
/* Buffer customization:
|
/* Buffer customization:
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
411
linux/i830_dma.c
411
linux/i830_dma.c
|
|
@ -26,8 +26,8 @@
|
||||||
*
|
*
|
||||||
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
|
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
* Jeff Hartmann <jhartmann@valinux.com>
|
||||||
* Keith Whitwell <keithw@valinux.com>
|
* Keith Whitwell <keith@tungstengraphics.com>
|
||||||
* Abraham vd Merwe <abraham@2d3d.co.za>
|
* Abraham vd Merwe <abraham@2d3d.co.za>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -40,9 +40,10 @@
|
||||||
#include <linux/interrupt.h> /* For task queue support */
|
#include <linux/interrupt.h> /* For task queue support */
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
|
|
||||||
/* in case we don't have a 2.3.99-pre6 kernel or later: */
|
#ifdef DO_MUNMAP_4_ARGS
|
||||||
#ifndef VM_DONTCOPY
|
#define DO_MUNMAP(m, a, l) do_munmap(m, a, l, 1)
|
||||||
#define VM_DONTCOPY 0
|
#else
|
||||||
|
#define DO_MUNMAP(m, a, l) do_munmap(m, a, l)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define I830_BUF_FREE 2
|
#define I830_BUF_FREE 2
|
||||||
|
|
@ -54,26 +55,24 @@
|
||||||
|
|
||||||
#define RING_LOCALS unsigned int outring, ringmask; volatile char *virt;
|
#define RING_LOCALS unsigned int outring, ringmask; volatile char *virt;
|
||||||
|
|
||||||
|
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,2)
|
||||||
|
#define down_write down
|
||||||
|
#define up_write up
|
||||||
|
#endif
|
||||||
|
|
||||||
#define DO_IDLE_WORKAROUND() \
|
#ifndef LockPage
|
||||||
do { \
|
#define LockPage(page) set_bit(PG_locked, &(page)->flags)
|
||||||
int _head; \
|
#endif
|
||||||
int _tail; \
|
#ifndef UnlockPage
|
||||||
do { \
|
#define UnlockPage(page) unlock_page(page)
|
||||||
_head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR; \
|
#endif
|
||||||
_tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR; \
|
|
||||||
udelay(10); \
|
|
||||||
} while(_head != _tail); \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
#define I830_SYNC_WORKAROUND 0
|
#define I830_VERBOSE 0
|
||||||
|
|
||||||
#define BEGIN_LP_RING(n) do { \
|
#define BEGIN_LP_RING(n) do { \
|
||||||
if (I830_VERBOSE) \
|
if (I830_VERBOSE) \
|
||||||
DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \
|
printk("BEGIN_LP_RING(%d) in %s\n", \
|
||||||
n, __FUNCTION__); \
|
n, __FUNCTION__); \
|
||||||
if (I830_SYNC_WORKAROUND) \
|
|
||||||
DO_IDLE_WORKAROUND(); \
|
|
||||||
if (dev_priv->ring.space < n*4) \
|
if (dev_priv->ring.space < n*4) \
|
||||||
i830_wait_ring(dev, n*4); \
|
i830_wait_ring(dev, n*4); \
|
||||||
dev_priv->ring.space -= n*4; \
|
dev_priv->ring.space -= n*4; \
|
||||||
|
|
@ -83,13 +82,13 @@ do { \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define ADVANCE_LP_RING() do { \
|
#define ADVANCE_LP_RING() do { \
|
||||||
if (I830_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING\n"); \
|
if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring); \
|
||||||
dev_priv->ring.tail = outring; \
|
dev_priv->ring.tail = outring; \
|
||||||
I830_WRITE(LP_RING + RING_TAIL, outring); \
|
I830_WRITE(LP_RING + RING_TAIL, outring); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
#define OUT_RING(n) do { \
|
#define OUT_RING(n) do { \
|
||||||
if (I830_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \
|
if (I830_VERBOSE) printk(" OUT_RING %x\n", (int)(n)); \
|
||||||
*(volatile unsigned int *)(virt + outring) = n; \
|
*(volatile unsigned int *)(virt + outring) = n; \
|
||||||
outring += 4; \
|
outring += 4; \
|
||||||
outring &= ringmask; \
|
outring &= ringmask; \
|
||||||
|
|
@ -201,36 +200,24 @@ static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
|
||||||
|
|
||||||
if(buf_priv->currently_mapped == I830_BUF_MAPPED) return -EINVAL;
|
if(buf_priv->currently_mapped == I830_BUF_MAPPED) return -EINVAL;
|
||||||
|
|
||||||
if(VM_DONTCOPY != 0) {
|
down_write( ¤t->mm->mmap_sem );
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
old_fops = filp->f_op;
|
||||||
down( ¤t->mm->mmap_sem );
|
filp->f_op = &i830_buffer_fops;
|
||||||
#else
|
dev_priv->mmap_buffer = buf;
|
||||||
down_write( ¤t->mm->mmap_sem );
|
buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
|
||||||
#endif
|
PROT_READ|PROT_WRITE,
|
||||||
old_fops = filp->f_op;
|
MAP_SHARED,
|
||||||
filp->f_op = &i830_buffer_fops;
|
buf->bus_address);
|
||||||
dev_priv->mmap_buffer = buf;
|
dev_priv->mmap_buffer = NULL;
|
||||||
buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
|
filp->f_op = old_fops;
|
||||||
PROT_READ|PROT_WRITE,
|
if ((unsigned long)buf_priv->virtual > -1024UL) {
|
||||||
MAP_SHARED,
|
/* Real error */
|
||||||
buf->bus_address);
|
DRM_ERROR("mmap error\n");
|
||||||
dev_priv->mmap_buffer = NULL;
|
retcode = (signed int)buf_priv->virtual;
|
||||||
filp->f_op = old_fops;
|
buf_priv->virtual = 0;
|
||||||
if ((unsigned long)buf_priv->virtual > -1024UL) {
|
|
||||||
/* Real error */
|
|
||||||
DRM_DEBUG("mmap error\n");
|
|
||||||
retcode = (signed int)buf_priv->virtual;
|
|
||||||
buf_priv->virtual = 0;
|
|
||||||
}
|
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
|
||||||
up( ¤t->mm->mmap_sem );
|
|
||||||
#else
|
|
||||||
up_write( ¤t->mm->mmap_sem );
|
|
||||||
#endif
|
|
||||||
} else {
|
|
||||||
buf_priv->virtual = buf_priv->kernel_virtual;
|
|
||||||
buf_priv->currently_mapped = I830_BUF_MAPPED;
|
|
||||||
}
|
}
|
||||||
|
up_write( ¤t->mm->mmap_sem );
|
||||||
|
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -239,25 +226,15 @@ static int i830_unmap_buffer(drm_buf_t *buf)
|
||||||
drm_i830_buf_priv_t *buf_priv = buf->dev_private;
|
drm_i830_buf_priv_t *buf_priv = buf->dev_private;
|
||||||
int retcode = 0;
|
int retcode = 0;
|
||||||
|
|
||||||
if(VM_DONTCOPY != 0) {
|
if(buf_priv->currently_mapped != I830_BUF_MAPPED)
|
||||||
if(buf_priv->currently_mapped != I830_BUF_MAPPED)
|
return -EINVAL;
|
||||||
return -EINVAL;
|
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
|
||||||
down( ¤t->mm->mmap_sem );
|
|
||||||
#else
|
|
||||||
down_write( ¤t->mm->mmap_sem );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
retcode = do_munmap(current->mm,
|
down_write(¤t->mm->mmap_sem);
|
||||||
(unsigned long)buf_priv->virtual,
|
retcode = DO_MUNMAP(current->mm,
|
||||||
(size_t) buf->total);
|
(unsigned long)buf_priv->virtual,
|
||||||
|
(size_t) buf->total);
|
||||||
|
up_write(¤t->mm->mmap_sem);
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE <= 0x020402
|
|
||||||
up( ¤t->mm->mmap_sem );
|
|
||||||
#else
|
|
||||||
up_write( ¤t->mm->mmap_sem );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
buf_priv->currently_mapped = I830_BUF_UNMAPPED;
|
buf_priv->currently_mapped = I830_BUF_UNMAPPED;
|
||||||
buf_priv->virtual = 0;
|
buf_priv->virtual = 0;
|
||||||
|
|
||||||
|
|
@ -275,14 +252,14 @@ static int i830_dma_get_buffer(drm_device_t *dev, drm_i830_dma_t *d,
|
||||||
buf = i830_freelist_get(dev);
|
buf = i830_freelist_get(dev);
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
retcode = -ENOMEM;
|
retcode = -ENOMEM;
|
||||||
DRM_DEBUG("retcode=%d\n", retcode);
|
DRM_ERROR("retcode=%d\n", retcode);
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
retcode = i830_map_buffer(buf, filp);
|
retcode = i830_map_buffer(buf, filp);
|
||||||
if(retcode) {
|
if(retcode) {
|
||||||
i830_freelist_put(dev, buf);
|
i830_freelist_put(dev, buf);
|
||||||
DRM_DEBUG("mapbuf failed, retcode %d\n", retcode);
|
DRM_ERROR("mapbuf failed, retcode %d\n", retcode);
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
buf->pid = priv->pid;
|
buf->pid = priv->pid;
|
||||||
|
|
@ -303,32 +280,17 @@ static unsigned long i830_alloc_page(drm_device_t *dev)
|
||||||
if(address == 0UL)
|
if(address == 0UL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < 0x020409
|
|
||||||
atomic_inc(&virt_to_page(address)->count);
|
|
||||||
set_bit(PG_locked, &virt_to_page(address)->flags);
|
|
||||||
#else
|
|
||||||
get_page(virt_to_page(address));
|
get_page(virt_to_page(address));
|
||||||
#if LINUX_VERSION_CODE < 0x020500
|
|
||||||
LockPage(virt_to_page(address));
|
LockPage(virt_to_page(address));
|
||||||
#else
|
|
||||||
SetPageLocked(virt_to_page(address));
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
return address;
|
return address;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void i830_free_page(drm_device_t *dev, unsigned long page)
|
static void i830_free_page(drm_device_t *dev, unsigned long page)
|
||||||
{
|
{
|
||||||
if (page) {
|
if (page) {
|
||||||
#if LINUX_VERSION_CODE < 0x020409
|
|
||||||
atomic_dec(&virt_to_page(page)->count);
|
|
||||||
clear_bit(PG_locked, &virt_to_page(page)->flags);
|
|
||||||
wake_up(&virt_to_page(page)->wait);
|
|
||||||
#else
|
|
||||||
struct page *p = virt_to_page(page);
|
struct page *p = virt_to_page(page);
|
||||||
put_page(p);
|
put_page(p);
|
||||||
unlock_page(p);
|
UnlockPage(p);
|
||||||
#endif
|
|
||||||
free_page(page);
|
free_page(page);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -384,7 +346,7 @@ static int i830_wait_ring(drm_device_t *dev, int n)
|
||||||
}
|
}
|
||||||
|
|
||||||
iters++;
|
iters++;
|
||||||
if((signed)(end - jiffies) <= 0) {
|
if(time_before(end, jiffies)) {
|
||||||
DRM_ERROR("space: %d wanted %d\n", ring->space, n);
|
DRM_ERROR("space: %d wanted %d\n", ring->space, n);
|
||||||
DRM_ERROR("lockup\n");
|
DRM_ERROR("lockup\n");
|
||||||
goto out_wait_ring;
|
goto out_wait_ring;
|
||||||
|
|
@ -402,7 +364,7 @@ static void i830_kernel_lost_context(drm_device_t *dev)
|
||||||
drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
|
drm_i830_ring_buffer_t *ring = &(dev_priv->ring);
|
||||||
|
|
||||||
ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
|
ring->head = I830_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
|
||||||
ring->tail = I830_READ(LP_RING + RING_TAIL);
|
ring->tail = I830_READ(LP_RING + RING_TAIL) & TAIL_ADDR;
|
||||||
ring->space = ring->head - (ring->tail+8);
|
ring->space = ring->head - (ring->tail+8);
|
||||||
if (ring->space < 0) ring->space += ring->Size;
|
if (ring->space < 0) ring->space += ring->Size;
|
||||||
}
|
}
|
||||||
|
|
@ -478,9 +440,6 @@ static int i830_dma_initialize(drm_device_t *dev,
|
||||||
((u8 *)dev_priv->sarea_map->handle +
|
((u8 *)dev_priv->sarea_map->handle +
|
||||||
init->sarea_priv_offset);
|
init->sarea_priv_offset);
|
||||||
|
|
||||||
atomic_set(&dev_priv->flush_done, 0);
|
|
||||||
init_waitqueue_head(&dev_priv->flush_queue);
|
|
||||||
|
|
||||||
dev_priv->ring.Start = init->ring_start;
|
dev_priv->ring.Start = init->ring_start;
|
||||||
dev_priv->ring.End = init->ring_end;
|
dev_priv->ring.End = init->ring_end;
|
||||||
dev_priv->ring.Size = init->ring_size;
|
dev_priv->ring.Size = init->ring_size;
|
||||||
|
|
@ -504,11 +463,17 @@ static int i830_dma_initialize(drm_device_t *dev,
|
||||||
dev_priv->pitch = init->pitch;
|
dev_priv->pitch = init->pitch;
|
||||||
dev_priv->back_offset = init->back_offset;
|
dev_priv->back_offset = init->back_offset;
|
||||||
dev_priv->depth_offset = init->depth_offset;
|
dev_priv->depth_offset = init->depth_offset;
|
||||||
|
dev_priv->front_offset = init->front_offset;
|
||||||
|
|
||||||
dev_priv->front_di1 = init->front_offset | init->pitch_bits;
|
dev_priv->front_di1 = init->front_offset | init->pitch_bits;
|
||||||
dev_priv->back_di1 = init->back_offset | init->pitch_bits;
|
dev_priv->back_di1 = init->back_offset | init->pitch_bits;
|
||||||
dev_priv->zi1 = init->depth_offset | init->pitch_bits;
|
dev_priv->zi1 = init->depth_offset | init->pitch_bits;
|
||||||
|
|
||||||
|
DRM_DEBUG("front_di1 %x\n", dev_priv->front_di1);
|
||||||
|
DRM_DEBUG("back_offset %x\n", dev_priv->back_offset);
|
||||||
|
DRM_DEBUG("back_di1 %x\n", dev_priv->back_di1);
|
||||||
|
DRM_DEBUG("pitch_bits %x\n", init->pitch_bits);
|
||||||
|
|
||||||
dev_priv->cpp = init->cpp;
|
dev_priv->cpp = init->cpp;
|
||||||
/* We are using seperate values as placeholders for mechanisms for
|
/* We are using seperate values as placeholders for mechanisms for
|
||||||
* private backbuffer/depthbuffer usage.
|
* private backbuffer/depthbuffer usage.
|
||||||
|
|
@ -574,38 +539,57 @@ int i830_dma_init(struct inode *inode, struct file *filp,
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define GFX_OP_STIPPLE ((0x3<<29)|(0x1d<<24)|(0x83<<16))
|
||||||
|
#define ST1_ENABLE (1<<16)
|
||||||
|
#define ST1_MASK (0xffff)
|
||||||
|
|
||||||
/* Most efficient way to verify state for the i830 is as it is
|
/* Most efficient way to verify state for the i830 is as it is
|
||||||
* emitted. Non-conformant state is silently dropped.
|
* emitted. Non-conformant state is silently dropped.
|
||||||
*
|
|
||||||
* Use 'volatile' & local var tmp to force the emitted values to be
|
|
||||||
* identical to the verified ones.
|
|
||||||
*/
|
*/
|
||||||
static void i830EmitContextVerified( drm_device_t *dev,
|
static void i830EmitContextVerified( drm_device_t *dev,
|
||||||
volatile unsigned int *code )
|
unsigned int *code )
|
||||||
{
|
{
|
||||||
drm_i830_private_t *dev_priv = dev->dev_private;
|
drm_i830_private_t *dev_priv = dev->dev_private;
|
||||||
int i, j = 0;
|
int i, j = 0;
|
||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
||||||
BEGIN_LP_RING( I830_CTX_SETUP_SIZE );
|
BEGIN_LP_RING( I830_CTX_SETUP_SIZE + 2 );
|
||||||
for ( i = 0 ; i < I830_CTX_SETUP_SIZE ; i++ ) {
|
|
||||||
tmp = code[i];
|
|
||||||
|
|
||||||
#if 0
|
OUT_RING( GFX_OP_STIPPLE );
|
||||||
if ((tmp & (7<<29)) == (3<<29) &&
|
OUT_RING( 0 );
|
||||||
|
|
||||||
|
|
||||||
|
for ( i = 0 ; i < I830_CTXREG_BLENDCOLR0 ; i++ ) {
|
||||||
|
tmp = code[i];
|
||||||
|
if ((tmp & (7<<29)) == CMD_3D &&
|
||||||
(tmp & (0x1f<<24)) < (0x1d<<24)) {
|
(tmp & (0x1f<<24)) < (0x1d<<24)) {
|
||||||
OUT_RING( tmp );
|
OUT_RING( tmp );
|
||||||
j++;
|
j++;
|
||||||
} else {
|
} else {
|
||||||
printk("Skipping %d\n", i);
|
DRM_ERROR("Skipping %d\n", i);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
OUT_RING( tmp );
|
|
||||||
j++;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OUT_RING( STATE3D_CONST_BLEND_COLOR_CMD );
|
||||||
|
OUT_RING( code[I830_CTXREG_BLENDCOLR] );
|
||||||
|
j += 2;
|
||||||
|
|
||||||
|
for ( i = I830_CTXREG_VF ; i < I830_CTXREG_MCSB0 ; i++ ) {
|
||||||
|
tmp = code[i];
|
||||||
|
if ((tmp & (7<<29)) == CMD_3D &&
|
||||||
|
(tmp & (0x1f<<24)) < (0x1d<<24)) {
|
||||||
|
OUT_RING( tmp );
|
||||||
|
j++;
|
||||||
|
} else {
|
||||||
|
DRM_ERROR("Skipping %d\n", i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
OUT_RING( STATE3D_MAP_COORD_SETBIND_CMD );
|
||||||
|
OUT_RING( code[I830_CTXREG_MCSB1] );
|
||||||
|
j += 2;
|
||||||
|
|
||||||
if (j & 1)
|
if (j & 1)
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
|
|
||||||
|
|
@ -650,6 +634,9 @@ static void i830EmitTexBlendVerified( drm_device_t *dev,
|
||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
||||||
|
if (!num)
|
||||||
|
return;
|
||||||
|
|
||||||
BEGIN_LP_RING( num );
|
BEGIN_LP_RING( num );
|
||||||
|
|
||||||
for ( i = 0 ; i < num ; i++ ) {
|
for ( i = 0 ; i < num ; i++ ) {
|
||||||
|
|
@ -723,7 +710,7 @@ static void i830EmitDestVerified( drm_device_t *dev,
|
||||||
BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
|
BUF_3D_PITCH(dev_priv->depth_pitch * dev_priv->cpp));
|
||||||
OUT_RING( dev_priv->zi1 );
|
OUT_RING( dev_priv->zi1 );
|
||||||
} else {
|
} else {
|
||||||
DRM_DEBUG("bad di1 %x (allow %x or %x)\n",
|
DRM_ERROR("bad di1 %x (allow %x or %x)\n",
|
||||||
tmp, dev_priv->front_di1, dev_priv->back_di1);
|
tmp, dev_priv->front_di1, dev_priv->back_di1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -745,7 +732,7 @@ static void i830EmitDestVerified( drm_device_t *dev,
|
||||||
if((tmp & ~0x3) == GFX_OP_SCISSOR_ENABLE) {
|
if((tmp & ~0x3) == GFX_OP_SCISSOR_ENABLE) {
|
||||||
OUT_RING( tmp );
|
OUT_RING( tmp );
|
||||||
} else {
|
} else {
|
||||||
DRM_DEBUG("bad scissor enable\n");
|
DRM_ERROR("bad scissor enable\n");
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -865,7 +852,7 @@ static void i830_dma_dispatch_clear( drm_device_t *dev, int flags,
|
||||||
OUT_RING( BR13 );
|
OUT_RING( BR13 );
|
||||||
OUT_RING( (pbox->y1 << 16) | pbox->x1 );
|
OUT_RING( (pbox->y1 << 16) | pbox->x1 );
|
||||||
OUT_RING( (pbox->y2 << 16) | pbox->x2 );
|
OUT_RING( (pbox->y2 << 16) | pbox->x2 );
|
||||||
OUT_RING( 0 );
|
OUT_RING( dev_priv->front_offset );
|
||||||
OUT_RING( clear_color );
|
OUT_RING( clear_color );
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
}
|
}
|
||||||
|
|
@ -953,7 +940,7 @@ static void i830_dma_dispatch_swap( drm_device_t *dev )
|
||||||
OUT_RING( (pbox->y2 << 16) |
|
OUT_RING( (pbox->y2 << 16) |
|
||||||
pbox->x2 );
|
pbox->x2 );
|
||||||
|
|
||||||
OUT_RING( 0 /* front ofs always zero */ );
|
OUT_RING( dev_priv->front_offset );
|
||||||
OUT_RING( (pbox->y1 << 16) |
|
OUT_RING( (pbox->y1 << 16) |
|
||||||
pbox->x1 );
|
pbox->x1 );
|
||||||
|
|
||||||
|
|
@ -993,7 +980,7 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (used > 4*1024)
|
if (used > 4*1023)
|
||||||
used = 0;
|
used = 0;
|
||||||
|
|
||||||
if (sarea_priv->dirty)
|
if (sarea_priv->dirty)
|
||||||
|
|
@ -1010,12 +997,17 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
|
||||||
DRM_DEBUG( "start + used - 4 : %ld\n", start + used - 4);
|
DRM_DEBUG( "start + used - 4 : %ld\n", start + used - 4);
|
||||||
|
|
||||||
if (buf_priv->currently_mapped == I830_BUF_MAPPED) {
|
if (buf_priv->currently_mapped == I830_BUF_MAPPED) {
|
||||||
*(u32 *)buf_priv->virtual = (GFX_OP_PRIMITIVE |
|
u32 *vp = buf_priv->virtual;
|
||||||
sarea_priv->vertex_prim |
|
|
||||||
((used/4)-2));
|
vp[0] = (GFX_OP_PRIMITIVE |
|
||||||
|
sarea_priv->vertex_prim |
|
||||||
|
((used/4)-2));
|
||||||
|
|
||||||
|
vp[used/4] = MI_BATCH_BUFFER_END;
|
||||||
|
used += 4;
|
||||||
|
|
||||||
if (used & 4) {
|
if (used & 4) {
|
||||||
*(u32 *)((u32)buf_priv->virtual + used) = 0;
|
vp[used/4] = 0;
|
||||||
used += 4;
|
used += 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1035,80 +1027,35 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_LP_RING(4);
|
BEGIN_LP_RING(2);
|
||||||
|
OUT_RING( MI_BATCH_BUFFER_START | (2<<6) );
|
||||||
OUT_RING( MI_BATCH_BUFFER );
|
|
||||||
OUT_RING( start | MI_BATCH_NON_SECURE );
|
OUT_RING( start | MI_BATCH_NON_SECURE );
|
||||||
OUT_RING( start + used - 4 );
|
|
||||||
OUT_RING( 0 );
|
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
|
|
||||||
} while (++i < nbox);
|
} while (++i < nbox);
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_LP_RING(10);
|
|
||||||
OUT_RING( CMD_STORE_DWORD_IDX );
|
|
||||||
OUT_RING( 20 );
|
|
||||||
OUT_RING( dev_priv->counter );
|
|
||||||
OUT_RING( 0 );
|
|
||||||
|
|
||||||
if (discard) {
|
if (discard) {
|
||||||
|
dev_priv->counter++;
|
||||||
|
|
||||||
|
(void) cmpxchg(buf_priv->in_use, I830_BUF_CLIENT,
|
||||||
|
I830_BUF_HARDWARE);
|
||||||
|
|
||||||
|
BEGIN_LP_RING(8);
|
||||||
|
OUT_RING( CMD_STORE_DWORD_IDX );
|
||||||
|
OUT_RING( 20 );
|
||||||
|
OUT_RING( dev_priv->counter );
|
||||||
OUT_RING( CMD_STORE_DWORD_IDX );
|
OUT_RING( CMD_STORE_DWORD_IDX );
|
||||||
OUT_RING( buf_priv->my_use_idx );
|
OUT_RING( buf_priv->my_use_idx );
|
||||||
OUT_RING( I830_BUF_FREE );
|
OUT_RING( I830_BUF_FREE );
|
||||||
|
OUT_RING( CMD_REPORT_HEAD );
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
|
ADVANCE_LP_RING();
|
||||||
}
|
}
|
||||||
|
|
||||||
OUT_RING( CMD_REPORT_HEAD );
|
|
||||||
OUT_RING( 0 );
|
|
||||||
ADVANCE_LP_RING();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Interrupts are only for flushing */
|
|
||||||
void i830_dma_service(int irq, void *device, struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
drm_device_t *dev = (drm_device_t *)device;
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
u16 temp;
|
|
||||||
|
|
||||||
temp = I830_READ16(I830REG_INT_IDENTITY_R);
|
|
||||||
temp = temp & ~(0x6000);
|
|
||||||
if(temp != 0) I830_WRITE16(I830REG_INT_IDENTITY_R,
|
|
||||||
temp); /* Clear all interrupts */
|
|
||||||
else
|
|
||||||
return;
|
|
||||||
|
|
||||||
queue_task(&dev->tq, &tq_immediate);
|
|
||||||
mark_bh(IMMEDIATE_BH);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DRM(dma_immediate_bh)(void *device)
|
void i830_dma_quiescent(drm_device_t *dev)
|
||||||
{
|
|
||||||
drm_device_t *dev = (drm_device_t *) device;
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
|
|
||||||
atomic_set(&dev_priv->flush_done, 1);
|
|
||||||
wake_up_interruptible(&dev_priv->flush_queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void i830_dma_emit_flush(drm_device_t *dev)
|
|
||||||
{
|
|
||||||
drm_i830_private_t *dev_priv = dev->dev_private;
|
|
||||||
RING_LOCALS;
|
|
||||||
|
|
||||||
i830_kernel_lost_context(dev);
|
|
||||||
|
|
||||||
BEGIN_LP_RING(2);
|
|
||||||
OUT_RING( CMD_REPORT_HEAD );
|
|
||||||
OUT_RING( GFX_OP_USER_INTERRUPT );
|
|
||||||
ADVANCE_LP_RING();
|
|
||||||
|
|
||||||
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
|
||||||
atomic_set(&dev_priv->flush_done, 1);
|
|
||||||
wake_up_interruptible(&dev_priv->flush_queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void i830_dma_quiescent_emit(drm_device_t *dev)
|
|
||||||
{
|
{
|
||||||
drm_i830_private_t *dev_priv = dev->dev_private;
|
drm_i830_private_t *dev_priv = dev->dev_private;
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
@ -1119,79 +1066,27 @@ static inline void i830_dma_quiescent_emit(drm_device_t *dev)
|
||||||
OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
|
OUT_RING( INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE );
|
||||||
OUT_RING( CMD_REPORT_HEAD );
|
OUT_RING( CMD_REPORT_HEAD );
|
||||||
OUT_RING( 0 );
|
OUT_RING( 0 );
|
||||||
OUT_RING( GFX_OP_USER_INTERRUPT );
|
OUT_RING( 0 );
|
||||||
ADVANCE_LP_RING();
|
ADVANCE_LP_RING();
|
||||||
|
|
||||||
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
||||||
atomic_set(&dev_priv->flush_done, 1);
|
|
||||||
wake_up_interruptible(&dev_priv->flush_queue);
|
|
||||||
}
|
|
||||||
|
|
||||||
void i830_dma_quiescent(drm_device_t *dev)
|
|
||||||
{
|
|
||||||
DECLARE_WAITQUEUE(entry, current);
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
unsigned long end;
|
|
||||||
|
|
||||||
if(dev_priv == NULL) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
atomic_set(&dev_priv->flush_done, 0);
|
|
||||||
add_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
end = jiffies + (HZ*3);
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
current->state = TASK_INTERRUPTIBLE;
|
|
||||||
i830_dma_quiescent_emit(dev);
|
|
||||||
if (atomic_read(&dev_priv->flush_done) == 1) break;
|
|
||||||
if((signed)(end - jiffies) <= 0) {
|
|
||||||
DRM_ERROR("lockup\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
schedule_timeout(HZ*3);
|
|
||||||
if (signal_pending(current)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
current->state = TASK_RUNNING;
|
|
||||||
remove_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int i830_flush_queue(drm_device_t *dev)
|
static int i830_flush_queue(drm_device_t *dev)
|
||||||
{
|
{
|
||||||
DECLARE_WAITQUEUE(entry, current);
|
drm_i830_private_t *dev_priv = dev->dev_private;
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
drm_device_dma_t *dma = dev->dma;
|
drm_device_dma_t *dma = dev->dma;
|
||||||
unsigned long end;
|
int i, ret = 0;
|
||||||
int i, ret = 0;
|
RING_LOCALS;
|
||||||
|
|
||||||
|
i830_kernel_lost_context(dev);
|
||||||
|
|
||||||
if(dev_priv == NULL) {
|
BEGIN_LP_RING(2);
|
||||||
return 0;
|
OUT_RING( CMD_REPORT_HEAD );
|
||||||
}
|
OUT_RING( 0 );
|
||||||
atomic_set(&dev_priv->flush_done, 0);
|
ADVANCE_LP_RING();
|
||||||
add_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
end = jiffies + (HZ*3);
|
|
||||||
for (;;) {
|
|
||||||
current->state = TASK_INTERRUPTIBLE;
|
|
||||||
i830_dma_emit_flush(dev);
|
|
||||||
if (atomic_read(&dev_priv->flush_done) == 1) break;
|
|
||||||
if((signed)(end - jiffies) <= 0) {
|
|
||||||
DRM_ERROR("lockup\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
schedule_timeout(HZ*3);
|
|
||||||
if (signal_pending(current)) {
|
|
||||||
ret = -EINTR; /* Can't restart */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
current->state = TASK_RUNNING;
|
|
||||||
remove_wait_queue(&dev_priv->flush_queue, &entry);
|
|
||||||
|
|
||||||
|
i830_wait_ring( dev, dev_priv->ring.Size - 8 );
|
||||||
|
|
||||||
for (i = 0; i < dma->buf_count; i++) {
|
for (i = 0; i < dma->buf_count; i++) {
|
||||||
drm_buf_t *buf = dma->buflist[ i ];
|
drm_buf_t *buf = dma->buflist[ i ];
|
||||||
|
|
@ -1203,7 +1098,7 @@ static int i830_flush_queue(drm_device_t *dev)
|
||||||
if (used == I830_BUF_HARDWARE)
|
if (used == I830_BUF_HARDWARE)
|
||||||
DRM_DEBUG("reclaimed from HARDWARE\n");
|
DRM_DEBUG("reclaimed from HARDWARE\n");
|
||||||
if (used == I830_BUF_CLIENT)
|
if (used == I830_BUF_CLIENT)
|
||||||
DRM_DEBUG("still on client HARDWARE\n");
|
DRM_DEBUG("still on client\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -1242,8 +1137,7 @@ int i830_flush_ioctl(struct inode *inode, struct file *filp,
|
||||||
{
|
{
|
||||||
drm_file_t *priv = filp->private_data;
|
drm_file_t *priv = filp->private_data;
|
||||||
drm_device_t *dev = priv->dev;
|
drm_device_t *dev = priv->dev;
|
||||||
|
|
||||||
DRM_DEBUG("i830_flush_ioctl\n");
|
|
||||||
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
||||||
DRM_ERROR("i830_flush_ioctl called without lock held\n");
|
DRM_ERROR("i830_flush_ioctl called without lock held\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
@ -1381,46 +1275,17 @@ int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
|
||||||
return retcode;
|
return retcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
int i830_copybuf(struct inode *inode, struct file *filp, unsigned int cmd,
|
int i830_copybuf(struct inode *inode,
|
||||||
unsigned long arg)
|
struct file *filp,
|
||||||
|
unsigned int cmd,
|
||||||
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
drm_file_t *priv = filp->private_data;
|
/* Never copy - 2.4.x doesn't need it */
|
||||||
drm_device_t *dev = priv->dev;
|
|
||||||
drm_i830_copy_t d;
|
|
||||||
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
|
|
||||||
u32 *hw_status = (u32 *)dev_priv->hw_status_page;
|
|
||||||
drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *)
|
|
||||||
dev_priv->sarea_priv;
|
|
||||||
drm_buf_t *buf;
|
|
||||||
drm_i830_buf_priv_t *buf_priv;
|
|
||||||
drm_device_dma_t *dma = dev->dma;
|
|
||||||
|
|
||||||
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
|
||||||
DRM_ERROR("i830_dma called without lock held\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (copy_from_user(&d, (drm_i830_copy_t *)arg, sizeof(d)))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
if(d.idx < 0 || d.idx > dma->buf_count) return -EINVAL;
|
|
||||||
buf = dma->buflist[ d.idx ];
|
|
||||||
buf_priv = buf->dev_private;
|
|
||||||
if (buf_priv->currently_mapped != I830_BUF_MAPPED) return -EPERM;
|
|
||||||
|
|
||||||
if(d.used < 0 || d.used > buf->total) return -EINVAL;
|
|
||||||
|
|
||||||
if (copy_from_user(buf_priv->virtual, d.address, d.used))
|
|
||||||
return -EFAULT;
|
|
||||||
|
|
||||||
sarea_priv->last_dispatch = (int) hw_status[5];
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
|
int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
|
||||||
unsigned long arg)
|
unsigned long arg)
|
||||||
{
|
{
|
||||||
if(VM_DONTCOPY == 0) return 1;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@
|
||||||
* Jeff Hartmann <jhartmann@valinux.com>
|
* Jeff Hartmann <jhartmann@valinux.com>
|
||||||
* Gareth Hughes <gareth@valinux.com>
|
* Gareth Hughes <gareth@valinux.com>
|
||||||
* Abraham vd Merwe <abraham@2d3d.co.za>
|
* Abraham vd Merwe <abraham@2d3d.co.za>
|
||||||
|
* Keith Whitwell <keith@tungstengraphics.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
|
|
|
||||||
|
|
@ -64,14 +64,13 @@ typedef struct drm_i830_private {
|
||||||
unsigned long hw_status_page;
|
unsigned long hw_status_page;
|
||||||
unsigned long counter;
|
unsigned long counter;
|
||||||
|
|
||||||
atomic_t flush_done;
|
|
||||||
wait_queue_head_t flush_queue; /* Processes waiting until flush */
|
|
||||||
drm_buf_t *mmap_buffer;
|
drm_buf_t *mmap_buffer;
|
||||||
|
|
||||||
u32 front_di1, back_di1, zi1;
|
u32 front_di1, back_di1, zi1;
|
||||||
|
|
||||||
int back_offset;
|
int back_offset;
|
||||||
int depth_offset;
|
int depth_offset;
|
||||||
|
int front_offset;
|
||||||
int w, h;
|
int w, h;
|
||||||
int pitch;
|
int pitch;
|
||||||
int back_pitch;
|
int back_pitch;
|
||||||
|
|
@ -107,14 +106,13 @@ extern int i830_swap_bufs(struct inode *inode, struct file *filp,
|
||||||
extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
unsigned int cmd, unsigned long arg);
|
unsigned int cmd, unsigned long arg);
|
||||||
|
|
||||||
#define I830_VERBOSE 0
|
|
||||||
|
|
||||||
#define I830_BASE(reg) ((unsigned long) \
|
#define I830_BASE(reg) ((unsigned long) \
|
||||||
dev_priv->mmio_map->handle)
|
dev_priv->mmio_map->handle)
|
||||||
#define I830_ADDR(reg) (I830_BASE(reg) + reg)
|
#define I830_ADDR(reg) (I830_BASE(reg) + reg)
|
||||||
#define I830_DEREF(reg) *(__volatile__ int *)I830_ADDR(reg)
|
#define I830_DEREF(reg) *(__volatile__ unsigned int *)I830_ADDR(reg)
|
||||||
#define I830_READ(reg) I830_DEREF(reg)
|
#define I830_READ(reg) readl((volatile u32 *)I830_ADDR(reg))
|
||||||
#define I830_WRITE(reg,val) do { I830_DEREF(reg) = val; } while (0)
|
#define I830_WRITE(reg,val) writel(val, (volatile u32 *)I830_ADDR(reg))
|
||||||
#define I830_DEREF16(reg) *(__volatile__ u16 *)I830_ADDR(reg)
|
#define I830_DEREF16(reg) *(__volatile__ u16 *)I830_ADDR(reg)
|
||||||
#define I830_READ16(reg) I830_DEREF16(reg)
|
#define I830_READ16(reg) I830_DEREF16(reg)
|
||||||
#define I830_WRITE16(reg,val) do { I830_DEREF16(reg) = val; } while (0)
|
#define I830_WRITE16(reg,val) do { I830_DEREF16(reg) = val; } while (0)
|
||||||
|
|
@ -143,15 +141,15 @@ extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
#define LP_RING 0x2030
|
#define LP_RING 0x2030
|
||||||
#define HP_RING 0x2040
|
#define HP_RING 0x2040
|
||||||
#define RING_TAIL 0x00
|
#define RING_TAIL 0x00
|
||||||
#define TAIL_ADDR 0x000FFFF8
|
#define TAIL_ADDR 0x001FFFF8
|
||||||
#define RING_HEAD 0x04
|
#define RING_HEAD 0x04
|
||||||
#define HEAD_WRAP_COUNT 0xFFE00000
|
#define HEAD_WRAP_COUNT 0xFFE00000
|
||||||
#define HEAD_WRAP_ONE 0x00200000
|
#define HEAD_WRAP_ONE 0x00200000
|
||||||
#define HEAD_ADDR 0x001FFFFC
|
#define HEAD_ADDR 0x001FFFFC
|
||||||
#define RING_START 0x08
|
#define RING_START 0x08
|
||||||
#define START_ADDR 0x00FFFFF8
|
#define START_ADDR 0x0xFFFFF000
|
||||||
#define RING_LEN 0x0C
|
#define RING_LEN 0x0C
|
||||||
#define RING_NR_PAGES 0x000FF000
|
#define RING_NR_PAGES 0x001FF000
|
||||||
#define RING_REPORT_MASK 0x00000006
|
#define RING_REPORT_MASK 0x00000006
|
||||||
#define RING_REPORT_64K 0x00000002
|
#define RING_REPORT_64K 0x00000002
|
||||||
#define RING_REPORT_128K 0x00000004
|
#define RING_REPORT_128K 0x00000004
|
||||||
|
|
@ -182,6 +180,9 @@ extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
|
|
||||||
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
||||||
|
|
||||||
|
#define CMD_3D (0x3<<29)
|
||||||
|
#define STATE3D_CONST_BLEND_COLOR_CMD (CMD_3D|(0x1d<<24)|(0x88<<16))
|
||||||
|
#define STATE3D_MAP_COORD_SETBIND_CMD (CMD_3D|(0x1d<<24)|(0x02<<16))
|
||||||
|
|
||||||
#define BR00_BITBLT_CLIENT 0x40000000
|
#define BR00_BITBLT_CLIENT 0x40000000
|
||||||
#define BR00_OP_COLOR_BLT 0x10000000
|
#define BR00_OP_COLOR_BLT 0x10000000
|
||||||
|
|
@ -206,6 +207,8 @@ extern int i830_clear_bufs(struct inode *inode, struct file *filp,
|
||||||
#define XY_SRC_COPY_BLT_WRITE_RGB (1<<20)
|
#define XY_SRC_COPY_BLT_WRITE_RGB (1<<20)
|
||||||
|
|
||||||
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
||||||
|
#define MI_BATCH_BUFFER_START (0x31<<23)
|
||||||
|
#define MI_BATCH_BUFFER_END (0xA<<23)
|
||||||
#define MI_BATCH_NON_SECURE (1)
|
#define MI_BATCH_NON_SECURE (1)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1018,7 +1018,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_priv->is_r200 = (init->func == RADEON_INIT_R200_CP);
|
dev_priv->is_r200 = (init->func == RADEON_INIT_R200_CP);
|
||||||
dev_priv->do_boxes = 1;
|
dev_priv->do_boxes = 0;
|
||||||
dev_priv->cp_mode = init->cp_mode;
|
dev_priv->cp_mode = init->cp_mode;
|
||||||
|
|
||||||
/* We don't support anything other than bus-mastering ring mode,
|
/* We don't support anything other than bus-mastering ring mode,
|
||||||
|
|
|
||||||
|
|
@ -2172,6 +2172,9 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS )
|
||||||
dev_priv->stats.last_clear_reads++;
|
dev_priv->stats.last_clear_reads++;
|
||||||
value = GET_SCRATCH( 2 );
|
value = GET_SCRATCH( 2 );
|
||||||
break;
|
break;
|
||||||
|
case RADEON_PARAM_IRQ_ACTIVE:
|
||||||
|
value = dev->irq ? 1 : 0;
|
||||||
|
break;
|
||||||
case RADEON_PARAM_AGP_BASE:
|
case RADEON_PARAM_AGP_BASE:
|
||||||
value = dev_priv->agp_vm_start;
|
value = dev_priv->agp_vm_start;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -1018,7 +1018,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_priv->is_r200 = (init->func == RADEON_INIT_R200_CP);
|
dev_priv->is_r200 = (init->func == RADEON_INIT_R200_CP);
|
||||||
dev_priv->do_boxes = 1;
|
dev_priv->do_boxes = 0;
|
||||||
dev_priv->cp_mode = init->cp_mode;
|
dev_priv->cp_mode = init->cp_mode;
|
||||||
|
|
||||||
/* We don't support anything other than bus-mastering ring mode,
|
/* We don't support anything other than bus-mastering ring mode,
|
||||||
|
|
|
||||||
|
|
@ -2172,6 +2172,9 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS )
|
||||||
dev_priv->stats.last_clear_reads++;
|
dev_priv->stats.last_clear_reads++;
|
||||||
value = GET_SCRATCH( 2 );
|
value = GET_SCRATCH( 2 );
|
||||||
break;
|
break;
|
||||||
|
case RADEON_PARAM_IRQ_ACTIVE:
|
||||||
|
value = dev->irq ? 1 : 0;
|
||||||
|
break;
|
||||||
case RADEON_PARAM_AGP_BASE:
|
case RADEON_PARAM_AGP_BASE:
|
||||||
value = dev_priv->agp_vm_start;
|
value = dev_priv->agp_vm_start;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue