summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJeff Hartmann <jhartmann@valinux.com>2000-01-13 06:36:12 +0000
committerJeff Hartmann <jhartmann@valinux.com>2000-01-13 06:36:12 +0000
commit49c8510611af16b5fbd313d7f0fdcb06a9315629 (patch)
tree7120e2afa49d66cf2c63eba51992b7e8125b007b /linux-core
parent94fcb29e3b96cb750b674463a3c1d224086024b1 (diff)
dma checkin, still need to figure out how to pass TT_FLAGS and do some
testing
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h4
-rw-r--r--linux-core/mga_drv.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 4bd2f690..74516821 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -386,6 +386,9 @@ typedef struct drm_device_dma {
int page_count;
unsigned long *pagelist;
unsigned long byte_count;
+ enum {
+ _DRM_DMA_USE_AGP = 0x01
+ } flags;
/* DMA support */
drm_buf_t *this_buffer; /* Buffer being sent */
@@ -511,6 +514,7 @@ typedef struct drm_device {
drm_agp_head_t *agp;
#endif
unsigned long *ctx_bitmap;
+ void *SAREAprivate;
} drm_device_t;
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index b703db9a..f7c636a2 100644
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -381,6 +381,7 @@ int mga_init(void)
mga_takedown(dev);
return retcode;
}
+ mga_dma_init(dev);
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
MGA_NAME,
@@ -408,6 +409,7 @@ void mga_cleanup(void)
DRM_INFO("Module unloaded\n");
}
drm_ctxbitmap_cleanup(dev);
+ mga_dma_cleanup(dev);
mga_takedown(dev);
if (dev->agp) {
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);