summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/mga_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-11-11 23:11:34 +1100
committerDave Airlie <airlied@linux.ie>2005-11-11 23:11:34 +1100
commit7ccf800e9415daf9214eb667318e356f9a3d81fc (patch)
tree90c60097909170f1248854d27f86aac71bdbe3b0 /drivers/char/drm/mga_drv.h
parentc0be4d240483f3ebd138db467b5e8fbe15c520e2 (diff)
downloadblackbird-op-linux-7ccf800e9415daf9214eb667318e356f9a3d81fc.tar.gz
blackbird-op-linux-7ccf800e9415daf9214eb667318e356f9a3d81fc.zip
drm: update mga driver for new bootstrap code
The MGA driver needs to use the full AGP interface. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/mga_drv.h')
-rw-r--r--drivers/char/drm/mga_drv.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index 137bfdd5e92b..6b0c53193506 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/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;
extern drm_ioctl_desc_t mga_ioctls[];
OpenPOWER on IntegriCloud