diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2000-02-04 07:32:24 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2000-02-04 07:32:24 +0000 |
| commit | 4db40c2a8b53b1e02e6607fb301a5ca886d461ce (patch) | |
| tree | 8dd6a9b392ddf609a9e3b76e21e6eb49d833844f /linux-core | |
| parent | 484f610fb1abe449968e796a652b5834b6b95bee (diff) | |
Added code for swapbuffers and clearbuffers.
Added code to emit all driver state, including context, texture and warp
states.
Added a hack for carrying state along with a dma buffer. Hopefully Jeff
will have a better solution for this problem.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 14 | ||||
| -rw-r--r-- | linux-core/mga_drv.c | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 97d2539a..5bbf1bfe 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -260,14 +260,12 @@ typedef struct drm_buf { DRM_LIST_PRIO = 4, DRM_LIST_RECLAIM = 5 } list; /* Which list we're on */ -#if 0 - enum { - TT_GENERAL, - TT_BLIT, - TT_VECTOR, - TT_VERTEX - } transfer_type; -#endif + + + int type; /* push into dev_priv? */ + void *dev_priv; + + #if DRM_DMA_HISTOGRAM cycles_t time_queued; /* Queued to kernel DMA queue */ cycles_t time_dispatched; /* Dispatched to hardware */ diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c index 81c08e81..60cf9b1d 100644 --- a/linux-core/mga_drv.c +++ b/linux-core/mga_drv.c @@ -259,7 +259,7 @@ static int mga_takedown(drm_device_t *dev) drm_agp_mem_t *nexte; /* Remove AGP resources, but leave dev->agp - intact until r128_cleanup is called. */ + intact until cleanup is called. */ for (entry = dev->agp->memory; entry; entry = nexte) { nexte = entry->next; if (entry->bound) drm_unbind_agp(entry->memory); |