summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/drmP.h
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2004-01-06 04:34:53 +0000
committeranholt <anholt@FreeBSD.org>2004-01-06 04:34:53 +0000
commit7a30cbbe36c3da10547bc71289118de8e9bf0798 (patch)
treedc23cbfd6e49f2154d34faf1bfc9e044ed6193d3 /sys/dev/drm/drmP.h
parent6ecda71663ef14ce4784c7105163615d9178cfb9 (diff)
downloadFreeBSD-src-7a30cbbe36c3da10547bc71289118de8e9bf0798.zip
FreeBSD-src-7a30cbbe36c3da10547bc71289118de8e9bf0798.tar.gz
Merge from DRI CVS. No longer maps the framebuffer into KVA on radeon, r128,
and mga. MTRR code cleanups. Includes new Radeon and Rage 128 PCI IDs.
Diffstat (limited to 'sys/dev/drm/drmP.h')
-rw-r--r--sys/dev/drm/drmP.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index dc1ab7e..7872c79 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -268,7 +268,7 @@ typedef struct drm_agp_head {
int enabled;
int acquired;
unsigned long base;
- int agp_mtrr;
+ int mtrr;
int cant_use_aperture;
unsigned long page_mask;
} drm_agp_head_t;
@@ -288,7 +288,7 @@ typedef struct drm_local_map {
drm_map_flags_t flags; /* Flags */
void *handle; /* User-space: "Handle" to pass to mmap */
/* Kernel-space: kernel-virtual address */
- int mtrr; /* MTRR slot used */
+ int mtrr; /* Boolean: MTRR used */
/* Private data */
bus_space_tag_t iot;
bus_space_handle_t ioh;
OpenPOWER on IntegriCloud