| Message ID | 1418727733-16341-1-git-send-email-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 16, 2014 at 12:02:13PM +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Commit 28a62277e06f ("drm: Convert proc files to seq_file and introduce > debugfs") converted /proc files to debugfs and in the process dropped > the entry for the vblank statistics. Since that file has been gone for > almost five years, there is no use to keep the code that provides the > file's content around. > > Signed-off-by: Thierry Reding <treding@nvidia.com> Applied to drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/drm_info.c | 24 ------------------------ > drivers/gpu/drm/drm_internal.h | 1 - > 2 files changed, 25 deletions(-) > > diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c > index 51efebd434f3..f1b32f91d941 100644 > --- a/drivers/gpu/drm/drm_info.c > +++ b/drivers/gpu/drm/drm_info.c > @@ -153,30 +153,6 @@ int drm_bufs_info(struct seq_file *m, void *data) > } > > /** > - * Called when "/proc/dri/.../vblank" is read. > - */ > -int drm_vblank_info(struct seq_file *m, void *data) > -{ > - struct drm_info_node *node = (struct drm_info_node *) m->private; > - struct drm_device *dev = node->minor->dev; > - int crtc; > - > - mutex_lock(&dev->struct_mutex); > - for (crtc = 0; crtc < dev->num_crtcs; crtc++) { > - seq_printf(m, "CRTC %d enable: %d\n", > - crtc, atomic_read(&dev->vblank[crtc].refcount)); > - seq_printf(m, "CRTC %d counter: %d\n", > - crtc, drm_vblank_count(dev, crtc)); > - seq_printf(m, "CRTC %d last wait: %d\n", > - crtc, dev->vblank[crtc].last_wait); > - seq_printf(m, "CRTC %d in modeset: %d\n", > - crtc, dev->vblank[crtc].inmodeset); > - } > - mutex_unlock(&dev->struct_mutex); > - return 0; > -} > - > -/** > * Called when "/proc/dri/.../clients" is read. > * > */ > diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h > index 7cc0a3516871..12a61d706827 100644 > --- a/drivers/gpu/drm/drm_internal.h > +++ b/drivers/gpu/drm/drm_internal.h > @@ -55,7 +55,6 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr > int drm_name_info(struct seq_file *m, void *data); > int drm_vm_info(struct seq_file *m, void *data); > int drm_bufs_info(struct seq_file *m, void *data); > -int drm_vblank_info(struct seq_file *m, void *data); > int drm_clients_info(struct seq_file *m, void* data); > int drm_gem_name_info(struct seq_file *m, void *data); > > -- > 2.1.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index 51efebd434f3..f1b32f91d941 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c @@ -153,30 +153,6 @@ int drm_bufs_info(struct seq_file *m, void *data) } /** - * Called when "/proc/dri/.../vblank" is read. - */ -int drm_vblank_info(struct seq_file *m, void *data) -{ - struct drm_info_node *node = (struct drm_info_node *) m->private; - struct drm_device *dev = node->minor->dev; - int crtc; - - mutex_lock(&dev->struct_mutex); - for (crtc = 0; crtc < dev->num_crtcs; crtc++) { - seq_printf(m, "CRTC %d enable: %d\n", - crtc, atomic_read(&dev->vblank[crtc].refcount)); - seq_printf(m, "CRTC %d counter: %d\n", - crtc, drm_vblank_count(dev, crtc)); - seq_printf(m, "CRTC %d last wait: %d\n", - crtc, dev->vblank[crtc].last_wait); - seq_printf(m, "CRTC %d in modeset: %d\n", - crtc, dev->vblank[crtc].inmodeset); - } - mutex_unlock(&dev->struct_mutex); - return 0; -} - -/** * Called when "/proc/dri/.../clients" is read. * */ diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 7cc0a3516871..12a61d706827 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -55,7 +55,6 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr int drm_name_info(struct seq_file *m, void *data); int drm_vm_info(struct seq_file *m, void *data); int drm_bufs_info(struct seq_file *m, void *data); -int drm_vblank_info(struct seq_file *m, void *data); int drm_clients_info(struct seq_file *m, void* data); int drm_gem_name_info(struct seq_file *m, void *data);