diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-10-04 07:53:41 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-10-09 01:55:33 -0400 |
commit | 0111be42186fc5461b9e9d579014c70869ab3152 (patch) | |
tree | d557ba527f1df28ef5ed22a0e1abacbb9ea110cd /drivers/gpu/drm/i810/i810_dma.c | |
parent | ffbab09bf939975b62ec233c426bf7df0dd4cea8 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/i810/i810_dma.c')
-rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c | 11 |
1 files changed, 0 insertions, 11 deletions
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, | |||
944 | dma->buflist[vertex->idx], | 944 | dma->buflist[vertex->idx], |
945 | vertex->discard, vertex->used); | 945 | vertex->discard, vertex->used); |
946 | 946 | ||
947 | atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]); | ||
948 | atomic_inc(&dev->counts[_DRM_STAT_DMA]); | ||
949 | sarea_priv->last_enqueue = dev_priv->counter - 1; | 947 | sarea_priv->last_enqueue = dev_priv->counter - 1; |
950 | sarea_priv->last_dispatch = (int)hw_status[5]; | 948 | sarea_priv->last_dispatch = (int)hw_status[5]; |
951 | 949 | ||
@@ -1105,8 +1103,6 @@ static int i810_dma_mc(struct drm_device *dev, void *data, | |||
1105 | i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used, | 1103 | i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used, |
1106 | mc->last_render); | 1104 | mc->last_render); |
1107 | 1105 | ||
1108 | atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]); | ||
1109 | atomic_inc(&dev->counts[_DRM_STAT_DMA]); | ||
1110 | sarea_priv->last_enqueue = dev_priv->counter - 1; | 1106 | sarea_priv->last_enqueue = dev_priv->counter - 1; |
1111 | sarea_priv->last_dispatch = (int)hw_status[5]; | 1107 | sarea_priv->last_dispatch = (int)hw_status[5]; |
1112 | 1108 | ||
@@ -1197,13 +1193,6 @@ static int i810_flip_bufs(struct drm_device *dev, void *data, | |||
1197 | 1193 | ||
1198 | int i810_driver_load(struct drm_device *dev, unsigned long flags) | 1194 | int i810_driver_load(struct drm_device *dev, unsigned long flags) |
1199 | { | 1195 | { |
1200 | /* i810 has 4 more counters */ | ||
1201 | dev->counters += 4; | ||
1202 | dev->types[6] = _DRM_STAT_IRQ; | ||
1203 | dev->types[7] = _DRM_STAT_PRIMARY; | ||
1204 | dev->types[8] = _DRM_STAT_SECONDARY; | ||
1205 | dev->types[9] = _DRM_STAT_DMA; | ||
1206 | |||
1207 | pci_set_master(dev->pdev); | 1196 | pci_set_master(dev->pdev); |
1208 | 1197 | ||
1209 | return 0; | 1198 | return 0; |