aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_info.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/drm_info.c')
-rw-r--r--drivers/gpu/drm/drm_info.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index 7d5a152eeb02..7473035dd28b 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -186,14 +186,14 @@ int drm_clients_info(struct seq_file *m, void *data)
186 struct drm_file *priv; 186 struct drm_file *priv;
187 187
188 mutex_lock(&dev->struct_mutex); 188 mutex_lock(&dev->struct_mutex);
189 seq_printf(m, "a dev pid uid magic ioctls\n\n"); 189 seq_printf(m, "a dev pid uid magic\n\n");
190 list_for_each_entry(priv, &dev->filelist, lhead) { 190 list_for_each_entry(priv, &dev->filelist, lhead) {
191 seq_printf(m, "%c %3d %5d %5d %10u %10lu\n", 191 seq_printf(m, "%c %3d %5d %5d %10u\n",
192 priv->authenticated ? 'y' : 'n', 192 priv->authenticated ? 'y' : 'n',
193 priv->minor->index, 193 priv->minor->index,
194 pid_vnr(priv->pid), 194 pid_vnr(priv->pid),
195 from_kuid_munged(seq_user_ns(m), priv->uid), 195 from_kuid_munged(seq_user_ns(m), priv->uid),
196 priv->magic, priv->ioctl_count); 196 priv->magic);
197 } 197 }
198 mutex_unlock(&dev->struct_mutex); 198 mutex_unlock(&dev->struct_mutex);
199 return 0; 199 return 0;
@@ -234,14 +234,18 @@ int drm_vma_info(struct seq_file *m, void *data)
234 struct drm_device *dev = node->minor->dev; 234 struct drm_device *dev = node->minor->dev;
235 struct drm_vma_entry *pt; 235 struct drm_vma_entry *pt;
236 struct vm_area_struct *vma; 236 struct vm_area_struct *vma;
237 unsigned long vma_count = 0;
237#if defined(__i386__) 238#if defined(__i386__)
238 unsigned int pgprot; 239 unsigned int pgprot;
239#endif 240#endif
240 241
241 mutex_lock(&dev->struct_mutex); 242 mutex_lock(&dev->struct_mutex);
242 seq_printf(m, "vma use count: %d, high_memory = %pK, 0x%pK\n", 243 list_for_each_entry(pt, &dev->vmalist, head)
243 atomic_read(&dev->vma_count), 244 vma_count++;
244 high_memory, (void *)(unsigned long)virt_to_phys(high_memory)); 245
246 seq_printf(m, "vma use count: %lu, high_memory = %pK, 0x%pK\n",
247 vma_count, high_memory,
248 (void *)(unsigned long)virt_to_phys(high_memory));
245 249
246 list_for_each_entry(pt, &dev->vmalist, head) { 250 list_for_each_entry(pt, &dev->vmalist, head) {
247 vma = pt->vma; 251 vma = pt->vma;