mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-03 05:00:09 +01:00
Adjust mga drivers to remove redundant h file for sarea and IOCTLs
This commit is contained in:
parent
ba5c49ab42
commit
d613cca2e4
10 changed files with 52 additions and 430 deletions
|
|
@ -26,7 +26,6 @@
|
|||
* Keith Whitwell <keith@tungstengraphics.com>
|
||||
*/
|
||||
|
||||
#include "mga_common.h"
|
||||
#include "mga_xmesa.h"
|
||||
#include "context.h"
|
||||
#include "matrix.h"
|
||||
|
|
@ -242,7 +241,7 @@ mgaInitDriver(__DRIscreenPrivate *sPriv)
|
|||
|
||||
if (sPriv->drmMinor >= 1) {
|
||||
int ret;
|
||||
drmMGAGetParam gp;
|
||||
drm_mga_getparam_t gp;
|
||||
|
||||
gp.param = MGA_PARAM_IRQ_NR;
|
||||
gp.value = &mgaScreen->irq;
|
||||
|
|
@ -495,7 +494,7 @@ mgaCreateContext( const __GLcontextModes *mesaVis,
|
|||
mgaContextPtr mmesa;
|
||||
__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
|
||||
mgaScreenPrivate *mgaScreen = (mgaScreenPrivate *)sPriv->private;
|
||||
MGASAREAPrivPtr saPriv=(MGASAREAPrivPtr)(((char*)sPriv->pSAREA)+
|
||||
drm_mga_sarea_t *saPriv = (drm_mga_sarea_t *)(((char*)sPriv->pSAREA)+
|
||||
mgaScreen->sarea_priv_offset);
|
||||
struct dd_function_table functions;
|
||||
|
||||
|
|
@ -551,9 +550,9 @@ mgaCreateContext( const __GLcontextModes *mesaVis,
|
|||
mgaScreen->textureSize[i],
|
||||
6,
|
||||
MGA_NR_TEX_REGIONS,
|
||||
mmesa->sarea->texList[i],
|
||||
& mmesa->sarea->texAge[i],
|
||||
& mmesa->swapped,
|
||||
(drmTextureRegionPtr)mmesa->sarea->texList[i],
|
||||
&mmesa->sarea->texAge[i],
|
||||
&mmesa->swapped,
|
||||
sizeof( mgaTextureObject_t ),
|
||||
(destroy_texture_object_t *) mgaDestroyTexObj );
|
||||
}
|
||||
|
|
@ -862,7 +861,7 @@ mgaMakeCurrent(__DRIcontextPrivate *driContextPriv,
|
|||
void mgaGetLock( mgaContextPtr mmesa, GLuint flags )
|
||||
{
|
||||
__DRIdrawablePrivate *dPriv = mmesa->driDrawable;
|
||||
MGASAREAPrivPtr sarea = mmesa->sarea;
|
||||
drm_mga_sarea_t *sarea = mmesa->sarea;
|
||||
int me = mmesa->hHWContext;
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
|
||||
#include <sys/time.h>
|
||||
#include "dri_util.h"
|
||||
#include "mga_drm.h"
|
||||
#include "mtypes.h"
|
||||
#include "mgaregs.h"
|
||||
#include "mga_common.h"
|
||||
#include "xmlconfig.h"
|
||||
|
||||
typedef struct mga_screen_private_s {
|
||||
|
|
@ -65,10 +65,10 @@ typedef struct mga_screen_private_s {
|
|||
|
||||
unsigned int dmaOffset;
|
||||
|
||||
unsigned int textureOffset[DRM_MGA_NR_TEX_HEAPS];
|
||||
unsigned int textureSize[DRM_MGA_NR_TEX_HEAPS];
|
||||
int logTextureGranularity[DRM_MGA_NR_TEX_HEAPS];
|
||||
char *texVirtual[DRM_MGA_NR_TEX_HEAPS];
|
||||
unsigned int textureOffset[MGA_NR_TEX_HEAPS];
|
||||
unsigned int textureSize[MGA_NR_TEX_HEAPS];
|
||||
int logTextureGranularity[MGA_NR_TEX_HEAPS];
|
||||
char *texVirtual[MGA_NR_TEX_HEAPS];
|
||||
|
||||
|
||||
__DRIscreenPrivate *sPriv;
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@
|
|||
#include "dri_util.h"
|
||||
#include "mtypes.h"
|
||||
#include "xf86drm.h"
|
||||
#include "mga_drm.h"
|
||||
#include "mm.h"
|
||||
#include "mga_sarea.h"
|
||||
#include "colormac.h"
|
||||
#include "texmem.h"
|
||||
#include "macros.h"
|
||||
|
|
@ -147,7 +147,7 @@ typedef struct mga_texture_object_s
|
|||
int texelBytes;
|
||||
GLuint age;
|
||||
|
||||
mga_texture_regs_t setup;
|
||||
drm_mga_texture_regs_t setup;
|
||||
|
||||
/* If one texture dimension wraps with GL_CLAMP and the other with
|
||||
* GL_CLAMP_TO_EDGE, we have to fallback to software. We would also have
|
||||
|
|
@ -238,7 +238,7 @@ struct mga_context_t {
|
|||
GLuint NewGLState;
|
||||
GLuint dirty;
|
||||
|
||||
mga_context_regs_t setup;
|
||||
drm_mga_context_regs_t setup;
|
||||
|
||||
GLuint ClearColor;
|
||||
GLuint ClearDepth;
|
||||
|
|
@ -310,7 +310,7 @@ struct mga_context_t {
|
|||
|
||||
__DRIscreenPrivate *driScreen;
|
||||
struct mga_screen_private_s *mgaScreen;
|
||||
MGASAREAPrivPtr sarea;
|
||||
drm_mga_sarea_t *sarea;
|
||||
|
||||
/* Configuration cache
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include "mgavb.h"
|
||||
#include "mgaioctl.h"
|
||||
#include "mgatris.h"
|
||||
#include "mga_common.h"
|
||||
|
||||
#include "vblank.h"
|
||||
|
||||
|
|
@ -51,7 +50,7 @@ static void mga_iload_dma_ioctl(mgaContextPtr mmesa,
|
|||
int length)
|
||||
{
|
||||
drmBufPtr buf = mmesa->iload_buffer;
|
||||
drmMGAIload iload;
|
||||
drm_mga_iload_t iload;
|
||||
int ret, i;
|
||||
|
||||
if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
|
||||
|
|
@ -72,7 +71,7 @@ static void mga_iload_dma_ioctl(mgaContextPtr mmesa,
|
|||
i = 0;
|
||||
do {
|
||||
ret = drmCommandWrite( mmesa->driFd, DRM_MGA_ILOAD,
|
||||
&iload, sizeof(drmMGAIload) );
|
||||
&iload, sizeof(iload) );
|
||||
} while ( ret == -EBUSY && i++ < DRM_MGA_IDLE_RETRY );
|
||||
|
||||
if ( ret < 0 ) {
|
||||
|
|
@ -170,7 +169,7 @@ mgaClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
|
|||
int ret;
|
||||
int i;
|
||||
static int nrclears;
|
||||
drmMGAClearRec clear;
|
||||
drm_mga_clear_t clear;
|
||||
|
||||
FLUSH_BATCH( mmesa );
|
||||
|
||||
|
|
@ -264,7 +263,7 @@ mgaClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
|
|||
clear.color_mask = color_mask;
|
||||
clear.depth_mask = depth_mask;
|
||||
ret = drmCommandWrite( mmesa->driFd, DRM_MGA_CLEAR,
|
||||
&clear, sizeof(drmMGAClearRec));
|
||||
&clear, sizeof(clear));
|
||||
if ( ret ) {
|
||||
fprintf( stderr, "send clear retcode = %d\n", ret );
|
||||
exit( 1 );
|
||||
|
|
@ -459,7 +458,7 @@ void mgaFlushVerticesLocked( mgaContextPtr mmesa )
|
|||
drm_clip_rect_t *pbox = mmesa->pClipRects;
|
||||
int nbox = mmesa->numClipRects;
|
||||
drmBufPtr buffer = mmesa->vertex_dma_buffer;
|
||||
drmMGAVertex vertex;
|
||||
drm_mga_vertex_t vertex;
|
||||
int i;
|
||||
|
||||
mmesa->vertex_dma_buffer = 0;
|
||||
|
|
@ -545,7 +544,7 @@ void mgaFlushVerticesLocked( mgaContextPtr mmesa )
|
|||
vertex.used = buffer->used;
|
||||
vertex.discard = discard;
|
||||
drmCommandWrite( mmesa->driFd, DRM_MGA_VERTEX,
|
||||
&vertex, sizeof(drmMGAVertex) );
|
||||
&vertex, sizeof(vertex) );
|
||||
|
||||
age_mmesa(mmesa, mmesa->sarea->last_enqueue);
|
||||
}
|
||||
|
|
@ -622,7 +621,7 @@ static void mgaFlush( GLcontext *ctx )
|
|||
|
||||
void mgaReleaseBufLocked( mgaContextPtr mmesa, drmBufPtr buffer )
|
||||
{
|
||||
drmMGAVertex vertex;
|
||||
drm_mga_vertex_t vertex;
|
||||
|
||||
if (!buffer) return;
|
||||
|
||||
|
|
@ -630,22 +629,22 @@ void mgaReleaseBufLocked( mgaContextPtr mmesa, drmBufPtr buffer )
|
|||
vertex.used = 0;
|
||||
vertex.discard = 1;
|
||||
drmCommandWrite( mmesa->driFd, DRM_MGA_VERTEX,
|
||||
&vertex, sizeof(drmMGAVertex) );
|
||||
&vertex, sizeof(vertex) );
|
||||
}
|
||||
|
||||
int mgaFlushDMA( int fd, drmLockFlags flags )
|
||||
{
|
||||
drmMGALock lock;
|
||||
drm_lock_t lock;
|
||||
int ret, i = 0;
|
||||
|
||||
memset( &lock, 0, sizeof(drmMGALock) );
|
||||
memset( &lock, 0, sizeof(lock) );
|
||||
|
||||
if ( flags & DRM_LOCK_QUIESCENT ) lock.flags |= DRM_LOCK_QUIESCENT;
|
||||
if ( flags & DRM_LOCK_FLUSH ) lock.flags |= DRM_LOCK_FLUSH;
|
||||
if ( flags & DRM_LOCK_FLUSH_ALL ) lock.flags |= DRM_LOCK_FLUSH_ALL;
|
||||
|
||||
do {
|
||||
ret = drmCommandWrite( fd, DRM_MGA_FLUSH, &lock, sizeof(drmMGALock) );
|
||||
ret = drmCommandWrite( fd, DRM_MGA_FLUSH, &lock, sizeof(lock) );
|
||||
} while ( ret && errno == EBUSY && i++ < DRM_MGA_IDLE_RETRY );
|
||||
|
||||
if ( ret == 0 )
|
||||
|
|
@ -659,7 +658,7 @@ int mgaFlushDMA( int fd, drmLockFlags flags )
|
|||
lock.flags &= ~(DRM_LOCK_FLUSH | DRM_LOCK_FLUSH_ALL);
|
||||
|
||||
do {
|
||||
ret = drmCommandWrite( fd, DRM_MGA_FLUSH, &lock, sizeof(drmMGALock) );
|
||||
ret = drmCommandWrite( fd, DRM_MGA_FLUSH, &lock, sizeof(lock) );
|
||||
} while ( ret && errno == EBUSY && i++ < DRM_MGA_IDLE_RETRY );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@
|
|||
#include "mgapixel.h"
|
||||
#include "mgastate.h"
|
||||
|
||||
#include "mga_common.h"
|
||||
|
||||
#include "swrast/swrast.h"
|
||||
#include "imports.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -792,7 +792,7 @@ static void mgaXMesaSetBackClipRects( mgaContextPtr mmesa )
|
|||
void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers )
|
||||
{
|
||||
__DRIdrawablePrivate *driDrawable = mmesa->driDrawable;
|
||||
MGASAREAPrivPtr sarea = mmesa->sarea;
|
||||
drm_mga_sarea_t *sarea = mmesa->sarea;
|
||||
|
||||
|
||||
DRI_VALIDATE_DRAWABLE_INFO(mmesa->driScreen, driDrawable);
|
||||
|
|
@ -959,7 +959,7 @@ static void mgaDDPrintDirty( const char *msg, GLuint state )
|
|||
*/
|
||||
void mgaEmitHwStateLocked( mgaContextPtr mmesa )
|
||||
{
|
||||
MGASAREAPrivPtr sarea = mmesa->sarea;
|
||||
drm_mga_sarea_t *sarea = mmesa->sarea;
|
||||
GLcontext * ctx = mmesa->glCtx;
|
||||
|
||||
if (MGA_DEBUG & DEBUG_VERBOSE_MSG)
|
||||
|
|
@ -1001,31 +1001,31 @@ void mgaEmitHwStateLocked( mgaContextPtr mmesa )
|
|||
((AC_src_one | AC_dst_zero) & ~mmesa->hw.blend_func_enable) |
|
||||
mmesa->hw.alpha_sel;
|
||||
|
||||
memcpy( &sarea->ContextState, &mmesa->setup, sizeof(mmesa->setup));
|
||||
memcpy( &sarea->context_state, &mmesa->setup, sizeof(mmesa->setup));
|
||||
}
|
||||
|
||||
if ((mmesa->dirty & MGA_UPLOAD_TEX0) && mmesa->CurrentTexObj[0]) {
|
||||
memcpy(&sarea->TexState[0],
|
||||
memcpy(&sarea->tex_state[0],
|
||||
&mmesa->CurrentTexObj[0]->setup,
|
||||
sizeof(sarea->TexState[0]));
|
||||
sizeof(sarea->tex_state[0]));
|
||||
}
|
||||
|
||||
if ((mmesa->dirty & MGA_UPLOAD_TEX1) && mmesa->CurrentTexObj[1]) {
|
||||
memcpy(&sarea->TexState[1],
|
||||
memcpy(&sarea->tex_state[1],
|
||||
&mmesa->CurrentTexObj[1]->setup,
|
||||
sizeof(sarea->TexState[1]));
|
||||
sizeof(sarea->tex_state[1]));
|
||||
}
|
||||
|
||||
if (mmesa->dirty & (MGA_UPLOAD_TEX0 | MGA_UPLOAD_TEX1)) {
|
||||
sarea->TexState[0].texctl2 &= ~TMC_specen_enable;
|
||||
sarea->TexState[1].texctl2 &= ~TMC_specen_enable;
|
||||
sarea->TexState[0].texctl2 |= mmesa->hw.specen;
|
||||
sarea->TexState[1].texctl2 |= mmesa->hw.specen;
|
||||
sarea->tex_state[0].texctl2 &= ~TMC_specen_enable;
|
||||
sarea->tex_state[1].texctl2 &= ~TMC_specen_enable;
|
||||
sarea->tex_state[0].texctl2 |= mmesa->hw.specen;
|
||||
sarea->tex_state[1].texctl2 |= mmesa->hw.specen;
|
||||
}
|
||||
|
||||
if (mmesa->dirty & MGA_UPLOAD_PIPE) {
|
||||
/* mmesa->sarea->wacceptseq = mmesa->hw_primitive; */
|
||||
mmesa->sarea->WarpPipe = mmesa->vertex_format;
|
||||
mmesa->sarea->warp_pipe = mmesa->vertex_format;
|
||||
mmesa->sarea->vertsize = mmesa->vertex_size;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,152 +0,0 @@
|
|||
/* mga_common.h -- common header definitions for MGA 2D/3D/DRM suite
|
||||
*
|
||||
* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* 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.
|
||||
*
|
||||
* Converted to common header format:
|
||||
* Jens Owen <jens@tungstengraphics.com>
|
||||
*
|
||||
* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 2002/12/16 16:19:18 dawes Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _MGA_COMMON_H_
|
||||
#define _MGA_COMMON_H_
|
||||
|
||||
/*
|
||||
* WARNING: If you change any of these defines, make sure to change
|
||||
* the kernel include file as well (mga_drm.h)
|
||||
*/
|
||||
|
||||
#define DRM_MGA_IDLE_RETRY 2048
|
||||
#define DRM_MGA_NR_TEX_HEAPS 2
|
||||
|
||||
typedef struct {
|
||||
int installed;
|
||||
unsigned long phys_addr;
|
||||
int size;
|
||||
} drmMGAWarpIndex;
|
||||
|
||||
/* Driver specific DRM command indices
|
||||
* NOTE: these are not OS specific, but they are driver specific
|
||||
*/
|
||||
#define DRM_MGA_INIT 0x00
|
||||
#define DRM_MGA_FLUSH 0x01
|
||||
#define DRM_MGA_RESET 0x02
|
||||
#define DRM_MGA_SWAP 0x03
|
||||
#define DRM_MGA_CLEAR 0x04
|
||||
#define DRM_MGA_VERTEX 0x05
|
||||
#define DRM_MGA_INDICES 0x06
|
||||
#define DRM_MGA_ILOAD 0x07
|
||||
#define DRM_MGA_BLIT 0x08
|
||||
#define DRM_MGA_GETPARAM 0x09
|
||||
|
||||
typedef struct {
|
||||
enum {
|
||||
MGA_INIT_DMA = 0x01,
|
||||
MGA_CLEANUP_DMA = 0x02
|
||||
} func;
|
||||
|
||||
unsigned long sarea_priv_offset;
|
||||
|
||||
int chipset;
|
||||
int sgram;
|
||||
|
||||
unsigned int maccess;
|
||||
|
||||
unsigned int fb_cpp;
|
||||
unsigned int front_offset, front_pitch;
|
||||
unsigned int back_offset, back_pitch;
|
||||
|
||||
unsigned int depth_cpp;
|
||||
unsigned int depth_offset, depth_pitch;
|
||||
|
||||
unsigned int texture_offset[DRM_MGA_NR_TEX_HEAPS];
|
||||
unsigned int texture_size[DRM_MGA_NR_TEX_HEAPS];
|
||||
|
||||
unsigned long fb_offset;
|
||||
unsigned long mmio_offset;
|
||||
unsigned long status_offset;
|
||||
unsigned long warp_offset;
|
||||
unsigned long primary_offset;
|
||||
unsigned long buffers_offset;
|
||||
} drmMGAInit;
|
||||
|
||||
typedef enum {
|
||||
DRM_MGA_LOCK_READY = 0x01, /* Wait until hardware is ready for DMA */
|
||||
DRM_MGA_LOCK_QUIESCENT = 0x02, /* Wait until hardware quiescent */
|
||||
DRM_MGA_LOCK_FLUSH = 0x04, /* Flush this context's DMA queue first */
|
||||
DRM_MGA_LOCK_FLUSH_ALL = 0x08, /* Flush all DMA queues first */
|
||||
/* These *HALT* flags aren't supported yet
|
||||
-- they will be used to support the
|
||||
full-screen DGA-like mode. */
|
||||
DRM_MGA_HALT_ALL_QUEUES = 0x10, /* Halt all current and future queues */
|
||||
DRM_MGA_HALT_CUR_QUEUES = 0x20 /* Halt all current queues */
|
||||
} drmMGALockFlags;
|
||||
|
||||
typedef struct {
|
||||
int context;
|
||||
drmMGALockFlags flags;
|
||||
} drmMGALock;
|
||||
|
||||
typedef struct {
|
||||
int idx;
|
||||
unsigned int dstorg;
|
||||
unsigned int length;
|
||||
} drmMGAIload;
|
||||
|
||||
typedef struct {
|
||||
unsigned int flags;
|
||||
unsigned int clear_color;
|
||||
unsigned int clear_depth;
|
||||
unsigned int color_mask;
|
||||
unsigned int depth_mask;
|
||||
} drmMGAClearRec;
|
||||
|
||||
typedef struct {
|
||||
int idx; /* buffer to queue */
|
||||
int used; /* bytes in use */
|
||||
int discard; /* client finished with buffer? */
|
||||
} drmMGAVertex;
|
||||
|
||||
typedef struct {
|
||||
unsigned int planemask;
|
||||
unsigned int srcorg;
|
||||
unsigned int dstorg;
|
||||
int src_pitch, dst_pitch;
|
||||
int delta_sx, delta_sy;
|
||||
int delta_dx, delta_dy;
|
||||
int height, ydir; /* flip image vertically */
|
||||
int source_pitch, dest_pitch;
|
||||
} drmMGABlit;
|
||||
|
||||
/* 3.1: An ioctl to get parameters that aren't available to the 3d
|
||||
* client any other way.
|
||||
*/
|
||||
#define MGA_PARAM_IRQ_NR 1
|
||||
|
||||
typedef struct {
|
||||
int param;
|
||||
void *value;
|
||||
} drmMGAGetParam;
|
||||
|
||||
#endif
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
#include "mga.h"
|
||||
#include "mga_macros.h"
|
||||
#include "mga_dri.h"
|
||||
#include "mga_sarea.h"
|
||||
|
||||
|
||||
/* Quiescence, locking
|
||||
|
|
@ -50,27 +49,27 @@
|
|||
|
||||
static void MGAWaitForIdleDMA( struct DRIDriverContextRec *ctx, MGAPtr pMga )
|
||||
{
|
||||
drmMGALock lock;
|
||||
drm_lock_t lock;
|
||||
int ret;
|
||||
int i = 0;
|
||||
|
||||
memset( &lock, 0, sizeof(drmMGALock) );
|
||||
memset( &lock, 0, sizeof(lock) );
|
||||
|
||||
for (;;) {
|
||||
do {
|
||||
/* first ask for quiescent and flush */
|
||||
lock.flags = DRM_MGA_LOCK_QUIESCENT | DRM_MGA_LOCK_FLUSH;
|
||||
lock.flags = DRM_LOCK_QUIESCENT | DRM_LOCK_FLUSH;
|
||||
do {
|
||||
ret = drmCommandWrite( ctx->drmFD, DRM_MGA_FLUSH,
|
||||
&lock, sizeof( drmMGALock ) );
|
||||
&lock, sizeof( lock ) );
|
||||
} while ( ret == -EBUSY && i++ < DRM_MGA_IDLE_RETRY );
|
||||
|
||||
/* if it's still busy just try quiescent */
|
||||
if ( ret == -EBUSY ) {
|
||||
lock.flags = DRM_MGA_LOCK_QUIESCENT;
|
||||
lock.flags = DRM_LOCK_QUIESCENT;
|
||||
do {
|
||||
ret = drmCommandWrite( ctx->drmFD, DRM_MGA_FLUSH,
|
||||
&lock, sizeof( drmMGALock ) );
|
||||
&lock, sizeof( lock ) );
|
||||
} while ( ret == -EBUSY && i++ < DRM_MGA_IDLE_RETRY );
|
||||
}
|
||||
} while ( ( ret == -EBUSY ) && ( i++ < MGA_TIMEOUT ) );
|
||||
|
|
@ -358,10 +357,10 @@ static int MGADRIMapInit( struct DRIDriverContextRec *ctx, MGAPtr pMga )
|
|||
|
||||
static int MGADRIKernelInit( struct DRIDriverContextRec *ctx, MGAPtr pMga )
|
||||
{
|
||||
drmMGAInit init;
|
||||
drm_mga_init_t init;
|
||||
int ret;
|
||||
|
||||
memset( &init, 0, sizeof(drmMGAInit) );
|
||||
memset( &init, 0, sizeof(init) );
|
||||
|
||||
init.func = MGA_INIT_DMA;
|
||||
init.sarea_priv_offset = sizeof(drm_sarea_t);
|
||||
|
|
@ -420,7 +419,7 @@ static int MGADRIKernelInit( struct DRIDriverContextRec *ctx, MGAPtr pMga )
|
|||
init.texture_offset[1] = pMga->agpTextures.handle;
|
||||
init.texture_size[1] = pMga->agpTextures.size;
|
||||
|
||||
ret = drmCommandWrite( ctx->drmFD, DRM_MGA_INIT, &init, sizeof(drmMGAInit));
|
||||
ret = drmCommandWrite( ctx->drmFD, DRM_MGA_INIT, &init, sizeof(init));
|
||||
if ( ret < 0 ) {
|
||||
fprintf( stderr,
|
||||
"[drm] Failed to initialize DMA! (%d)\n", ret );
|
||||
|
|
@ -796,8 +795,8 @@ static int MGAScreenInit( struct DRIDriverContextRec *ctx, MGAPtr pMga )
|
|||
|
||||
/* Initialize the SAREA private data structure */
|
||||
{
|
||||
MGASAREAPrivPtr pSAREAPriv;
|
||||
pSAREAPriv = (MGASAREAPrivPtr)(((char*)ctx->pSAREA) +
|
||||
drm_mga_sarea_t *pSAREAPriv;
|
||||
pSAREAPriv = (drm_mga_sarea_t *)(((char*)ctx->pSAREA) +
|
||||
sizeof(drm_sarea_t));
|
||||
memset(pSAREAPriv, 0, sizeof(*pSAREAPriv));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@
|
|||
#define __MGA_DRI_H__
|
||||
|
||||
#include "xf86drm.h"
|
||||
#include "mga_common.h"
|
||||
#include "drm.h"
|
||||
#include "mga_drm.h"
|
||||
|
||||
#define MGA_DEFAULT_AGP_SIZE 64
|
||||
#define MGA_DEFAULT_AGP_MODE 4
|
||||
|
|
|
|||
|
|
@ -1,222 +0,0 @@
|
|||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h,v 1.1 2001/03/21 17:11:47 dawes Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2000 Gareth Hughes
|
||||
* 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
|
||||
* GARETH HUGHES 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 __MGA_SAREA_H__
|
||||
#define __MGA_SAREA_H__
|
||||
|
||||
/* WARNING: If you change any of these defines, make sure to change
|
||||
* the kernel include file as well (mga_drm.h)
|
||||
*/
|
||||
#ifndef __MGA_SAREA_DEFINES__
|
||||
#define __MGA_SAREA_DEFINES__
|
||||
|
||||
/* WARP pipe flags
|
||||
*/
|
||||
#define MGA_F 0x1 /* fog */
|
||||
#define MGA_A 0x2 /* alpha */
|
||||
#define MGA_S 0x4 /* specular */
|
||||
#define MGA_T2 0x8 /* multitexture */
|
||||
|
||||
#define MGA_WARP_TGZ 0
|
||||
#define MGA_WARP_TGZF (MGA_F)
|
||||
#define MGA_WARP_TGZA (MGA_A)
|
||||
#define MGA_WARP_TGZAF (MGA_F|MGA_A)
|
||||
#define MGA_WARP_TGZS (MGA_S)
|
||||
#define MGA_WARP_TGZSF (MGA_S|MGA_F)
|
||||
#define MGA_WARP_TGZSA (MGA_S|MGA_A)
|
||||
#define MGA_WARP_TGZSAF (MGA_S|MGA_F|MGA_A)
|
||||
#define MGA_WARP_T2GZ (MGA_T2)
|
||||
#define MGA_WARP_T2GZF (MGA_T2|MGA_F)
|
||||
#define MGA_WARP_T2GZA (MGA_T2|MGA_A)
|
||||
#define MGA_WARP_T2GZAF (MGA_T2|MGA_A|MGA_F)
|
||||
#define MGA_WARP_T2GZS (MGA_T2|MGA_S)
|
||||
#define MGA_WARP_T2GZSF (MGA_T2|MGA_S|MGA_F)
|
||||
#define MGA_WARP_T2GZSA (MGA_T2|MGA_S|MGA_A)
|
||||
#define MGA_WARP_T2GZSAF (MGA_T2|MGA_S|MGA_F|MGA_A)
|
||||
|
||||
#define MGA_MAX_G200_PIPES 8 /* no multitex */
|
||||
#define MGA_MAX_G400_PIPES 16
|
||||
#define MGA_MAX_WARP_PIPES MGA_MAX_G400_PIPES
|
||||
#define MGA_WARP_UCODE_SIZE 32768 /* in bytes */
|
||||
|
||||
#define MGA_CARD_TYPE_G200 1
|
||||
#define MGA_CARD_TYPE_G400 2
|
||||
|
||||
|
||||
#define MGA_FRONT 0x1
|
||||
#define MGA_BACK 0x2
|
||||
#define MGA_DEPTH 0x4
|
||||
|
||||
/* What needs to be changed for the current vertex dma buffer?
|
||||
*/
|
||||
#define MGA_UPLOAD_CONTEXT 0x1
|
||||
#define MGA_UPLOAD_TEX0 0x2
|
||||
#define MGA_UPLOAD_TEX1 0x4
|
||||
#define MGA_UPLOAD_PIPE 0x8
|
||||
#define MGA_UPLOAD_TEX0IMAGE 0x10
|
||||
#define MGA_UPLOAD_TEX1IMAGE 0x20
|
||||
#define MGA_UPLOAD_2D 0x40
|
||||
#define MGA_WAIT_AGE 0x80 /* handled client-side */
|
||||
#define MGA_UPLOAD_CLIPRECTS 0x100 /* handled client-side */
|
||||
#if 0
|
||||
#define MGA_DMA_FLUSH 0x200 /* set when someone gets the lock
|
||||
quiescent */
|
||||
#endif
|
||||
|
||||
/* 32 buffers of 64k each, total 1 meg.
|
||||
*/
|
||||
#define MGA_BUFFER_SIZE (1 << 16)
|
||||
#define MGA_NUM_BUFFERS 128
|
||||
|
||||
/* Keep these small for testing.
|
||||
*/
|
||||
#define MGA_NR_SAREA_CLIPRECTS 8
|
||||
|
||||
/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
|
||||
* regions, subject to a minimum region size of (1<<16) == 64k.
|
||||
*
|
||||
* Clients may subdivide regions internally, but when sharing between
|
||||
* clients, the region size is the minimum granularity.
|
||||
*/
|
||||
|
||||
#define MGA_CARD_HEAP 0
|
||||
#define MGA_AGP_HEAP 1
|
||||
#define MGA_NR_TEX_HEAPS 2
|
||||
#define MGA_NR_TEX_REGIONS 16
|
||||
#define MGA_LOG_MIN_TEX_REGION_SIZE 16
|
||||
|
||||
#endif /* __MGA_SAREA_DEFINES__ */
|
||||
|
||||
|
||||
/* Setup registers for 3D context
|
||||
*/
|
||||
typedef struct {
|
||||
unsigned int dstorg;
|
||||
unsigned int maccess;
|
||||
unsigned int plnwt;
|
||||
unsigned int dwgctl;
|
||||
unsigned int alphactrl;
|
||||
unsigned int fogcolor;
|
||||
unsigned int wflag;
|
||||
unsigned int tdualstage0;
|
||||
unsigned int tdualstage1;
|
||||
unsigned int fcol;
|
||||
unsigned int stencil;
|
||||
unsigned int stencilctl;
|
||||
} mga_context_regs_t;
|
||||
|
||||
/* Setup registers for 2D, X server
|
||||
*/
|
||||
typedef struct {
|
||||
unsigned int pitch;
|
||||
} mga_server_regs_t;
|
||||
|
||||
/* Setup registers for each texture unit
|
||||
*/
|
||||
typedef struct {
|
||||
unsigned int texctl;
|
||||
unsigned int texctl2;
|
||||
unsigned int texfilter;
|
||||
unsigned int texbordercol;
|
||||
unsigned int texorg;
|
||||
unsigned int texwidth;
|
||||
unsigned int texheight;
|
||||
unsigned int texorg1;
|
||||
unsigned int texorg2;
|
||||
unsigned int texorg3;
|
||||
unsigned int texorg4;
|
||||
} mga_texture_regs_t;
|
||||
|
||||
/* General ageing mechanism
|
||||
*/
|
||||
typedef struct {
|
||||
unsigned int head; /* Position of head pointer */
|
||||
unsigned int wrap; /* Primary DMA wrap count */
|
||||
} mga_age_t;
|
||||
|
||||
|
||||
/* WARNING: Do not change the SAREA structure without changing the kernel
|
||||
* as well.
|
||||
*/
|
||||
typedef struct {
|
||||
/* The channel for communication of state information to the kernel
|
||||
* on firing a vertex dma buffer.
|
||||
*/
|
||||
mga_context_regs_t ContextState;
|
||||
mga_server_regs_t ServerState;
|
||||
mga_texture_regs_t TexState[2];
|
||||
unsigned int WarpPipe;
|
||||
unsigned int dirty;
|
||||
unsigned int vertsize;
|
||||
|
||||
/* The current cliprects, or a subset thereof.
|
||||
*/
|
||||
drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS];
|
||||
unsigned int nbox;
|
||||
|
||||
/* Information about the most recently used 3d drawable. The
|
||||
* client fills in the req_* fields, the server fills in the
|
||||
* exported_ fields and puts the cliprects into boxes, above.
|
||||
*
|
||||
* The client clears the exported_drawable field before
|
||||
* clobbering the boxes data.
|
||||
*/
|
||||
|
||||
unsigned int req_draw_buffer; /* MGA_FRONT or MGA_BACK */
|
||||
|
||||
unsigned int exported_drawable;
|
||||
unsigned int exported_index;
|
||||
unsigned int exported_stamp;
|
||||
unsigned int exported_buffers;
|
||||
unsigned int exported_nfront; /* FIXME: verify signedness... */
|
||||
unsigned int exported_nback;
|
||||
int exported_back_x, exported_front_x, exported_w;
|
||||
int exported_back_y, exported_front_y, exported_h;
|
||||
drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS];
|
||||
|
||||
/* Counters for aging textures and for client-side throttling.
|
||||
*/
|
||||
unsigned int status[4];
|
||||
unsigned int last_wrap;
|
||||
|
||||
mga_age_t last_frame;
|
||||
unsigned int last_enqueue; /* last time a buffer was enqueued */
|
||||
unsigned int last_dispatch; /* age of the most recently dispatched buffer */
|
||||
unsigned int last_quiescent; /* */
|
||||
|
||||
/* LRU lists for texture memory in agp space and on the card.
|
||||
*/
|
||||
drmTextureRegion texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS+1];
|
||||
unsigned int texAge[MGA_NR_TEX_HEAPS];
|
||||
|
||||
/* Last context that uploaded statel
|
||||
*/
|
||||
int ctxOwner;
|
||||
} MGASAREAPrivRec, *MGASAREAPrivPtr;
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue