summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/dristat.c14
-rw-r--r--tests/drmstat.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/dristat.c b/tests/dristat.c
index 07ab54ea..1fba0f05 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -82,7 +82,8 @@ static void getvm(int fd)
drmHandle handle;
int mtrr;
- printf(" VM map information (Restricted locked kernel WC Lock):\n");
+ printf(" VM map information:\n");
+ printf(" flags: (R)estricted (r)ead/(w)rite (l)ocked (k)ernel (W)rite-combine (L)ock:\n");
printf(" slot offset size type flags address mtrr\n");
for (i = 0;
@@ -90,11 +91,12 @@ static void getvm(int fd)
i++) {
switch (type) {
- case DRM_FRAME_BUFFER: typename = "FB"; break;
- case DRM_REGISTERS: typename = "REG"; break;
- case DRM_SHM: typename = "SHM"; break;
- case DRM_AGP: typename = "AGP"; break;
- default: typename = "???"; break;
+ case DRM_FRAME_BUFFER: typename = "FB"; break;
+ case DRM_REGISTERS: typename = "REG"; break;
+ case DRM_SHM: typename = "SHM"; break;
+ case DRM_AGP: typename = "AGP"; break;
+ case DRM_SCATTER_GATHER: typename = "SG"; break;
+ default: typename = "???"; break;
}
flagname[0] = (flags & DRM_RESTRICTED) ? 'R' : ' ';
diff --git a/tests/drmstat.c b/tests/drmstat.c
index 8c691c49..4edaeb38 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -314,7 +314,7 @@ int main(int argc, char **argv)
printf("===== /proc/%d/maps =====\n", getpid());
sprintf(buf, "cat /proc/%d/maps", getpid());
system(buf);
- printf("===== /proc/grphics/0/mem =====\n");
+ printf("===== /proc/dri/0/mem =====\n");
sprintf(buf, "cat /proc/dri/0/mem");
system(buf);
printf("===== /proc/dri/0/vma =====\n");
' href='#n178'>178 179 180 181 182 183 184 185 186 187 188 189 190 191
/*-
 * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
 * All Rights Reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 * OTHER DEALINGS IN THE SOFTWARE.
 *
 * Authors:
 *    Rickard E. (Rik) Faith <faith@valinux.com>
 *    Gareth Hughes <gareth@valinux.com>
 *
 */

/** @file drm_lock.c
 * Implementation of the ioctls and other support code for dealing with the