From 0c965f990fefe082e485a62b0c9ddb6ff37e0001 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 30 May 2001 10:33:21 +0000 Subject: kernel changes for merged mga driver --- linux/mga_drm.h | 1 - linux/mga_state.c | 5 +++-- linux/sis.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 linux/sis.h diff --git a/linux/mga_drm.h b/linux/mga_drm.h index 433c4dbb..0b461baa 100644 --- a/linux/mga_drm.h +++ b/linux/mga_drm.h @@ -219,7 +219,6 @@ typedef struct _drm_mga_sarea { /* Mechanism to validate card state. */ int ctxOwner; - int vertexsize; unsigned int wacceptseq; } drm_mga_sarea_t; diff --git a/linux/mga_state.c b/linux/mga_state.c index cf7732e2..2d77a5f5 100644 --- a/linux/mga_state.c +++ b/linux/mga_state.c @@ -270,6 +270,7 @@ static inline void mga_g400_emit_pipe( drm_mga_private_t *dev_priv ) { drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; unsigned int pipe = sarea_priv->warp_pipe; + unsigned int wacceptseq = sarea_priv->wacceptseq; DMA_LOCALS; BEGIN_DMA( 10 ); @@ -288,7 +289,7 @@ static inline void mga_g400_emit_pipe( drm_mga_private_t *dev_priv ) DMA_BLOCK( MGA_WACCEPTSEQ, 0x00000000, MGA_WACCEPTSEQ, 0x00000000, MGA_WACCEPTSEQ, 0x00000000, - MGA_WACCEPTSEQ, 0x1e000000 ); + MGA_WACCEPTSEQ, wacceptseq ); } else { if ( dev_priv->warp_pipe & MGA_T2 ) { /* Flush the WARP pipe */ @@ -317,7 +318,7 @@ static inline void mga_g400_emit_pipe( drm_mga_private_t *dev_priv ) DMA_BLOCK( MGA_WACCEPTSEQ, 0x00000000, MGA_WACCEPTSEQ, 0x00000000, MGA_WACCEPTSEQ, 0x00000000, - MGA_WACCEPTSEQ, 0x18000000 ); + MGA_WACCEPTSEQ, wacceptseq ); } DMA_BLOCK( MGA_WFLAG, 0x00000000, diff --git a/linux/sis.h b/linux/sis.h new file mode 100644 index 00000000..1f33a1e2 --- /dev/null +++ b/linux/sis.h @@ -0,0 +1,50 @@ +/* sis_drv.h -- Private header for sis driver -*- linux-c -*- + * + * 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. + * + */ +/* $XFree86$ */ + +#ifndef __SIS_H__ +#define __SIS_H__ + +/* This remains constant for all DRM template files. + * Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel + * that's used for fb devices + */ +#define DRM(x) sisdrv_##x + +/* General customization: + */ +#define __HAVE_AGP 1 +#define __MUST_HAVE_AGP 0 +#define __HAVE_MTRR 1 +#define __HAVE_CTX_BITMAP 1 + +/* Buffer customization: + */ +#define DRIVER_AGP_BUFFERS_MAP( dev ) \ + ((drm_sis_private_t *)((dev)->dev_private))->buffers + +#endif -- cgit v1.2.3