diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-10-09 10:58:19 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-10-09 10:58:19 +0000 |
| commit | e09229d6c85bcb8b899f09fd70f264b4e1d6d0bd (patch) | |
| tree | 35032e5e4aec32b0f1f42d75f2e8f7a2b9118b3f | |
| parent | d24194e904cbfc85147efae6922e497e0102b2eb (diff) | |
remove unused dma remnants that were gamma only - these could cause an oops
on via
| -rw-r--r-- | linux-core/drmP.h | 7 | ||||
| -rw-r--r-- | linux-core/drm_irq.c | 4 | ||||
| -rw-r--r-- | linux/drmP.h | 7 | ||||
| -rw-r--r-- | linux/drm_irq.h | 4 |
4 files changed, 0 insertions, 22 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index f3a76c2a..92fd4f01 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -430,13 +430,6 @@ typedef struct drm_device_dma { _DRM_DMA_USE_SG = 0x02 } flags; - /** \name DMA support */ - /*@{ */ - drm_buf_t *this_buffer; /**< Buffer being sent */ - drm_buf_t *next_buffer; /**< Selected buffer to send */ - drm_queue_t *next_queue; /**< Queue from which buffer selected*/ - wait_queue_head_t waiting; /**< Processes waiting on free bufs */ - /*@} */ } drm_device_dma_t; /** diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index 8d4bf327..30caa529 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -114,10 +114,6 @@ int drm_irq_install(drm_device_t * dev) DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq); - dev->dma->next_buffer = NULL; - dev->dma->next_queue = NULL; - dev->dma->this_buffer = NULL; - if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) { init_waitqueue_head(&dev->vbl_queue); diff --git a/linux/drmP.h b/linux/drmP.h index 7ed64535..6717d2c9 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -422,13 +422,6 @@ typedef struct drm_device_dma { _DRM_DMA_USE_SG = 0x02 } flags; - /** \name DMA support */ - /*@{*/ - drm_buf_t *this_buffer; /**< Buffer being sent */ - drm_buf_t *next_buffer; /**< Selected buffer to send */ - drm_queue_t *next_queue; /**< Queue from which buffer selected*/ - wait_queue_head_t waiting; /**< Processes waiting on free bufs */ - /*@}*/ } drm_device_dma_t; /** diff --git a/linux/drm_irq.h b/linux/drm_irq.h index 3e0cfe25..e0f803cf 100644 --- a/linux/drm_irq.h +++ b/linux/drm_irq.h @@ -116,10 +116,6 @@ int DRM(irq_install)( drm_device_t *dev ) DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, dev->irq ); - dev->dma->next_buffer = NULL; - dev->dma->next_queue = NULL; - dev->dma->this_buffer = NULL; - if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) { init_waitqueue_head(&dev->vbl_queue); |