diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-11-03 00:38:25 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-11-03 00:38:25 +0000 |
| commit | 39615ec06e8ca9280b4feefc42e008c9795541bd (patch) | |
| tree | c6bdd5fd5ae23a3e9a5773ab91b873857f3e2252 /shared-core/mga_drv.h | |
| parent | 10ec05793f9b0ca47ce0a07aa445f8799d2ceba1 (diff) | |
Converts the remaining drm_agp_foo functions to be a drm_agp_foo and
drm_agp_foo_ioctl pair. Modifies the MGA DRM to use the drm_agp_foo
functions instead of the drm_foo_agp functions. The drm_foo_agp
functions are no longer exported by drm.ko.
Ensures that dma->seg_count and dma->page_count are properly set in
drm_addbufs_{agp,sg,fb}. drm_addbufs_pci was already correct.
Ensures that mga_do_agp_dma_bootstrap correctly sets agp_buffer_token.
At this point PCI DMA is still broken.
Xorg bug: #4797 Reviewed by: Dave Airlie, Eric Anholt Signed-off-by: Ian
Romanick <idr@us.ibm.com>
Diffstat (limited to 'shared-core/mga_drv.h')
| -rw-r--r-- | shared-core/mga_drv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/mga_drv.h b/shared-core/mga_drv.h index 94549874..526dc4c9 100644 --- a/shared-core/mga_drv.h +++ b/shared-core/mga_drv.h @@ -38,11 +38,11 @@ #define DRIVER_NAME "mga" #define DRIVER_DESC "Matrox G200/G400" -#define DRIVER_DATE "20050607" +#define DRIVER_DATE "20051102" #define DRIVER_MAJOR 3 #define DRIVER_MINOR 2 -#define DRIVER_PATCHLEVEL 0 +#define DRIVER_PATCHLEVEL 1 typedef struct drm_mga_primary_buffer { u8 *start; @@ -144,8 +144,8 @@ typedef struct drm_mga_private { drm_local_map_t *primary; drm_local_map_t *agp_textures; - DRM_AGP_MEM *agp_mem; - unsigned int agp_pages; + unsigned long agp_handle; + unsigned int agp_size; } drm_mga_private_t; /* mga_dma.c */ |