diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-23 17:00:41 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-23 17:00:41 +0800 |
| commit | e7cd5a1e2df29c1a06b74439faf750c6c5bb8e4a (patch) | |
| tree | 5c074a2bea8454dc343993a3af2d1ebb3a444f3b /linux-core/drm_proc.c | |
| parent | 0467ad41188031073cbbad1139a916e2439af2f1 (diff) | |
| parent | 4988fa48869098b18a3b60884550614818d60445 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core/drm_proc.c')
| -rw-r--r-- | linux-core/drm_proc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c index d6da86b2..af62c62a 100644 --- a/linux-core/drm_proc.c +++ b/linux-core/drm_proc.c @@ -244,7 +244,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request, DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", i, map->offset, - map->size, type, map->flags, + map->size, type, map->flags, (unsigned long) r_list->user_token); if (map->mtrr < 0) { @@ -438,7 +438,7 @@ static int drm__objects_info(char *buf, char **start, off_t offset, int request, drm_device_t *dev = (drm_device_t *) data; int len = 0; drm_buffer_manager_t *bm = &dev->bm; - drm_fence_manager_t *fm = &dev->fm; + drm_fence_manager_t *fm = &dev->fm; drm_u64_t used_mem; drm_u64_t low_mem; drm_u64_t high_mem; @@ -451,17 +451,17 @@ static int drm__objects_info(char *buf, char **start, off_t offset, int request, *start = &buf[offset]; *eof = 0; - + DRM_PROC_PRINT("Object accounting:\n\n"); if (fm->initialized) { - DRM_PROC_PRINT("Number of active fence objects: %d.\n", + DRM_PROC_PRINT("Number of active fence objects: %d.\n", atomic_read(&fm->count)); } else { DRM_PROC_PRINT("Fence objects are not supported by this driver\n"); } if (bm->initialized) { - DRM_PROC_PRINT("Number of active buffer objects: %d.\n\n", + DRM_PROC_PRINT("Number of active buffer objects: %d.\n\n", atomic_read(&bm->count)); } DRM_PROC_PRINT("Memory accounting:\n\n"); @@ -473,16 +473,16 @@ static int drm__objects_info(char *buf, char **start, off_t offset, int request, drm_query_memctl(&used_mem, &low_mem, &high_mem); - if (used_mem > 16*PAGE_SIZE) { - DRM_PROC_PRINT("Used object memory is %lu pages.\n", + if (used_mem > 16*PAGE_SIZE) { + DRM_PROC_PRINT("Used object memory is %lu pages.\n", (unsigned long) (used_mem >> PAGE_SHIFT)); } else { - DRM_PROC_PRINT("Used object memory is %lu bytes.\n", + DRM_PROC_PRINT("Used object memory is %lu bytes.\n", (unsigned long) used_mem); } - DRM_PROC_PRINT("Soft object memory usage threshold is %lu pages.\n", + DRM_PROC_PRINT("Soft object memory usage threshold is %lu pages.\n", (unsigned long) (low_mem >> PAGE_SHIFT)); - DRM_PROC_PRINT("Hard object memory usage threshold is %lu pages.\n", + DRM_PROC_PRINT("Hard object memory usage threshold is %lu pages.\n", (unsigned long) (high_mem >> PAGE_SHIFT)); DRM_PROC_PRINT("\n"); |