drm: Kill drm perf counter leftovers

The user of these counters was killed in

 commit d79cdc8312689b39c6d83718c1c196af4b3cd18c
 Author: Daniel Vetter <daniel.vetter@ffwll.ch>
 Date:   Thu Aug 8 15:41:32 2013 +0200

    drm: no-op out GET_STATS ioctl

so clean up the leftovers as well.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

7 files changed, 0 insertions, 43 deletions

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 34d372ed904c..6495bdfd35dc 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -315,7 +315,6 @@ long drm_ioctl(struct file *filp,
                 return -ENODEV;
 
         atomic_inc(&dev->ioctl_count);
-        atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
         ++file_priv->ioctl_count;
 
         if ((nr >= DRM_CORE_IOCTL_COUNT) &&
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 621b45e08bd1..d0e27667a4eb 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -113,7 +113,6 @@ int drm_open(struct inode *inode, struct file *filp)
         retcode = drm_open_helper(inode, filp, dev);
         if (retcode)
                 goto err_undo;
-        atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
         if (need_setup) {
                 retcode = drm_setup(dev);
                 if (retcode)
@@ -392,17 +391,12 @@ static void drm_events_release(struct drm_file *file_priv)
  */
 static void drm_legacy_dev_reinit(struct drm_device *dev)
 {
-        int i;
-
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 return;
 
         atomic_set(&dev->ioctl_count, 0);
         atomic_set(&dev->vma_count, 0);
 
-        for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
-                atomic_set(&dev->counts[i], 0);
-
         dev->sigdata.lock = NULL;
 
         dev->context_flag = 0;
@@ -585,7 +579,6 @@ int drm_release(struct inode *inode, struct file *filp)
          * End inline drm_release
          */
 
-        atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
         if (!--dev->open_count) {
                 if (atomic_read(&dev->ioctl_count)) {
                         DRM_ERROR("Device busy: %d\n",
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index d752c96d6090..f6452682141b 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -86,7 +86,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                 if (drm_lock_take(&master->lock, lock->context)) {
                         master->lock.file_priv = file_priv;
                         master->lock.lock_time = jiffies;
-                        atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
                         break;  /* Got lock */
                 }
 
@@ -157,8 +156,6 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                 return -EINVAL;
         }
 
-        atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
-
         if (drm_lock_free(&master->lock, lock->context)) {
                 /* FIXME: Should really bail out here. */
         }
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 2badef766d20..26055abf94ee 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -431,15 +431,6 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
         mutex_init(&dev->struct_mutex);
         mutex_init(&dev->ctxlist_mutex);
 
-        /* the DRM has 6 basic counters */
-        dev->counters = 6;
-        dev->types[0] = _DRM_STAT_LOCK;
-        dev->types[1] = _DRM_STAT_OPENS;
-        dev->types[2] = _DRM_STAT_CLOSES;
-        dev->types[3] = _DRM_STAT_IOCTLS;
-        dev->types[4] = _DRM_STAT_LOCKS;
-        dev->types[5] = _DRM_STAT_UNLOCKS;
-
         if (drm_ht_create(&dev->map_hash, 12))
                 goto err_free;
 
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index ab1892eb1074..249fdff305c6 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -944,8 +944,6 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
                                  dma->buflist[vertex->idx],
                                  vertex->discard, vertex->used);
 
-        atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
-        atomic_inc(&dev->counts[_DRM_STAT_DMA]);
         sarea_priv->last_enqueue = dev_priv->counter - 1;
         sarea_priv->last_dispatch = (int)hw_status[5];
 
@@ -1105,8 +1103,6 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
         i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
                              mc->last_render);
 
-        atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
-        atomic_inc(&dev->counts[_DRM_STAT_DMA]);
         sarea_priv->last_enqueue = dev_priv->counter - 1;
         sarea_priv->last_dispatch = (int)hw_status[5];
 
@@ -1197,13 +1193,6 @@ static int i810_flip_bufs(struct drm_device *dev, void *data,
 
 int i810_driver_load(struct drm_device *dev, unsigned long flags)
 {
-        /* i810 has 4 more counters */
-        dev->counters += 4;
-        dev->types[6] = _DRM_STAT_IRQ;
-        dev->types[7] = _DRM_STAT_PRIMARY;
-        dev->types[8] = _DRM_STAT_SECONDARY;
-        dev->types[9] = _DRM_STAT_DMA;
-
         pci_set_master(dev->pdev);
 
         return 0;
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index d8478f7cdbf0..637b695eafbd 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1473,13 +1473,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET))
                 return -ENODEV;
 
-        /* i915 has 4 more counters */
-        dev->counters += 4;
-        dev->types[6] = _DRM_STAT_IRQ;
-        dev->types[7] = _DRM_STAT_PRIMARY;
-        dev->types[8] = _DRM_STAT_SECONDARY;
-        dev->types[9] = _DRM_STAT_DMA;
-
         dev_priv = kzalloc(sizeof(drm_i915_private_t), GFP_KERNEL);
         if (dev_priv == NULL)
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index cc3166dd445a..087db33f6cff 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
@@ -406,11 +406,6 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags)
         dev_priv->mmio_base = pci_resource_start(dev->pdev, 1);
         dev_priv->mmio_size = pci_resource_len(dev->pdev, 1);
 
-        dev->counters += 3;
-        dev->types[6] = _DRM_STAT_IRQ;
-        dev->types[7] = _DRM_STAT_PRIMARY;
-        dev->types[8] = _DRM_STAT_SECONDARY;
-
         ret = drm_vblank_init(dev, 1);
 
         if (ret) {