Minor cleanups for dri/drmstat test progs (Both still need targets for new

    Makefile)

diff --git a/tests/dristat.c b/tests/dristat.c
index 07ab54e..1fba0f0 100644 (file)
--- 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 8c691c4..4edaeb3 100644 (file)
--- 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");