From 5654880eeed0646a53655b093f4d3bf5608ebcc7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 20 Sep 2004 11:29:16 +0000 Subject: remove HAVE_COUNTERS --- shared/i915.h | 6 ------ shared/i915_dma.c | 6 ++++++ shared/mga.h | 5 ----- shared/mga_dma.c | 5 +++++ shared/sis.h | 2 -- shared/via_drv.c | 2 -- 6 files changed, 11 insertions(+), 15 deletions(-) (limited to 'shared') diff --git a/shared/i915.h b/shared/i915.h index ed4e13d7..d76d737b 100644 --- a/shared/i915.h +++ b/shared/i915.h @@ -45,12 +45,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_I915_INIT_HEAP)] = { i915_mem_init_heap, 1, 1 }, \ [DRM_IOCTL_NR(DRM_IOCTL_I915_CMDBUFFER)] = { i915_cmdbuffer, 1, 0 } -#define __HAVE_COUNTERS 4 -#define __HAVE_COUNTER6 _DRM_STAT_IRQ -#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY -#define __HAVE_COUNTER8 _DRM_STAT_SECONDARY -#define __HAVE_COUNTER9 _DRM_STAT_DMA - /* We use our own dma mechanisms, not the drm template code. However, * the shared IRQ code is useful to us: */ diff --git a/shared/i915_dma.c b/shared/i915_dma.c index 34552008..cf0333f6 100644 --- a/shared/i915_dma.c +++ b/shared/i915_dma.c @@ -761,4 +761,10 @@ void i915_driver_register_fns(drm_device_t *dev) dev->fn_tbl.irq_postinstall = i915_driver_irq_postinstall; dev->fn_tbl.irq_uninstall = i915_driver_irq_uninstall; dev->fn_tbl.irq_handler = i915_driver_irq_handler; + + 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; } diff --git a/shared/mga.h b/shared/mga.h index ec63e7f4..5356519e 100644 --- a/shared/mga.h +++ b/shared/mga.h @@ -60,9 +60,4 @@ [DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)] = { mga_dma_blit, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_MGA_GETPARAM)]= { mga_getparam, 1, 0 }, -#define __HAVE_COUNTERS 3 -#define __HAVE_COUNTER6 _DRM_STAT_IRQ -#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY -#define __HAVE_COUNTER8 _DRM_STAT_SECONDARY - #endif diff --git a/shared/mga_dma.c b/shared/mga_dma.c index 409f0ab7..0288f1c2 100644 --- a/shared/mga_dma.c +++ b/shared/mga_dma.c @@ -821,4 +821,9 @@ void mga_driver_register_fns(drm_device_t *dev) dev->fn_tbl.irq_postinstall = mga_driver_irq_postinstall; dev->fn_tbl.irq_uninstall = mga_driver_irq_uninstall; dev->fn_tbl.irq_handler = mga_driver_irq_handler; + + dev->counters += 3; + dev->types[6] = _DRM_STAT_IRQ; + dev->types[7] = _DRM_STAT_PRIMARY; + dev->types[8] = _DRM_STAT_SECONDARY; } diff --git a/shared/sis.h b/shared/sis.h index 1b149ebc..5f703700 100644 --- a/shared/sis.h +++ b/shared/sis.h @@ -54,6 +54,4 @@ [DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_FREE)] = { sis_ioctl_agp_free, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_INIT)] = { sis_fb_init, 1, 1 } -#define __HAVE_COUNTERS 5 - #endif diff --git a/shared/via_drv.c b/shared/via_drv.c index 8c4e7480..a6321d04 100644 --- a/shared/via_drv.c +++ b/shared/via_drv.c @@ -52,8 +52,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_VIA_PCICMD)] = { via_pci_cmdbuffer, 1, 0} -#define __HAVE_COUNTERS 0 - #include "drm_auth.h" #include "drm_agpsupport.h" #include "drm_bufs.h" -- cgit v1.2.3