diff options
Diffstat (limited to 'drivers/char/drm/i830_dma.c')
-rw-r--r-- | drivers/char/drm/i830_dma.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c index dc94f1914425..01dfdb944e1f 100644 --- a/drivers/char/drm/i830_dma.c +++ b/drivers/char/drm/i830_dma.c | |||
@@ -1517,12 +1517,24 @@ static int i830_setparam(struct inode *inode, struct file *filp, | |||
1517 | return 0; | 1517 | return 0; |
1518 | } | 1518 | } |
1519 | 1519 | ||
1520 | void i830_driver_pretakedown(drm_device_t * dev) | 1520 | int i830_driver_load(drm_device_t *dev, unsigned long flags) |
1521 | { | ||
1522 | /* i830 has 4 more counters */ | ||
1523 | dev->counters += 4; | ||
1524 | dev->types[6] = _DRM_STAT_IRQ; | ||
1525 | dev->types[7] = _DRM_STAT_PRIMARY; | ||
1526 | dev->types[8] = _DRM_STAT_SECONDARY; | ||
1527 | dev->types[9] = _DRM_STAT_DMA; | ||
1528 | |||
1529 | return 0; | ||
1530 | } | ||
1531 | |||
1532 | void i830_driver_lastclose(drm_device_t * dev) | ||
1521 | { | 1533 | { |
1522 | i830_dma_cleanup(dev); | 1534 | i830_dma_cleanup(dev); |
1523 | } | 1535 | } |
1524 | 1536 | ||
1525 | void i830_driver_prerelease(drm_device_t * dev, DRMFILE filp) | 1537 | void i830_driver_preclose(drm_device_t * dev, DRMFILE filp) |
1526 | { | 1538 | { |
1527 | if (dev->dev_private) { | 1539 | if (dev->dev_private) { |
1528 | drm_i830_private_t *dev_priv = dev->dev_private; | 1540 | drm_i830_private_t *dev_priv = dev->dev_private; |
@@ -1532,7 +1544,7 @@ void i830_driver_prerelease(drm_device_t * dev, DRMFILE filp) | |||
1532 | } | 1544 | } |
1533 | } | 1545 | } |
1534 | 1546 | ||
1535 | void i830_driver_release(drm_device_t * dev, struct file *filp) | 1547 | void i830_driver_reclaim_buffers_locked(drm_device_t * dev, struct file *filp) |
1536 | { | 1548 | { |
1537 | i830_reclaim_buffers(dev, filp); | 1549 | i830_reclaim_buffers(dev, filp); |
1538 | } | 1550 | } |