diff options
| -rw-r--r-- | linux-core/drm_crtc.c | 2 | ||||
| -rw-r--r-- | shared-core/i915_dma.c | 2 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 2 | ||||
| -rw-r--r-- | shared-core/i915_init.c | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c index 04d3b723..65ccc870 100644 --- a/linux-core/drm_crtc.c +++ b/linux-core/drm_crtc.c @@ -912,7 +912,7 @@ void drm_mode_config_cleanup(drm_device_t *dev) /* If this FB was the kernel one, free it */ if (fb->bo->type == drm_bo_type_kernel) { mutex_lock(&dev->struct_mutex); - drm_bo_usage_deref_locked(fb->bo); + drm_bo_usage_deref_locked(&fb->bo); mutex_unlock(&dev->struct_mutex); } drm_framebuffer_destroy(fb); diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index c95f1857..59bf15ef 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -78,7 +78,7 @@ void i915_kernel_lost_context(drm_device_t * dev) dev_priv->sarea_priv->perf_boxes |= I915_BOX_RING_EMPTY; } -static int i915_dma_cleanup(drm_device_t * dev) +int i915_dma_cleanup(drm_device_t * dev) { /* Make sure interrupts are disabled here because the uninstall ioctl * may not have been called from userspace and after dev_private diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 35451feb..35e5be1c 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -213,7 +213,6 @@ extern int i915_max_ioctl; extern void i915_kernel_lost_context(drm_device_t * dev); extern int i915_driver_load(struct drm_device *, unsigned long flags); extern int i915_driver_unload(drm_device_t *dev); -extern int i915_driver_firstopen(struct drm_device *dev); extern void i915_driver_lastclose(drm_device_t * dev); extern void i915_driver_preclose(drm_device_t * dev, DRMFILE filp); extern int i915_driver_device_is_agp(drm_device_t * dev); @@ -222,7 +221,6 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, extern void i915_emit_breadcrumb(drm_device_t *dev); extern void i915_dispatch_flip(drm_device_t * dev, int pipes, int sync); extern int i915_emit_mi_flush(drm_device_t *dev, uint32_t flush); -extern int i915_driver_firstopen(struct drm_device *dev); extern int i915_dma_cleanup(drm_device_t * dev); /* i915_irq.c */ diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 83219e49..e4a2cdef 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -275,7 +275,7 @@ int i915_driver_unload(drm_device_t *dev) DRM_DEBUG("usage is %d\n", atomic_read(&dev_priv->ring_buffer->usage)); mutex_lock(&dev->struct_mutex); - drm_bo_usage_deref_locked(dev_priv->ring_buffer); + drm_bo_usage_deref_locked(&dev_priv->ring_buffer); mutex_unlock(&dev->struct_mutex); if (drm_bo_clean_mm(dev, DRM_BO_MEM_VRAM)) { @@ -302,7 +302,6 @@ void i915_driver_lastclose(drm_device_t * dev) i915_mem_takedown(&(dev_priv->agp_heap)); i915_dma_cleanup(dev); - } void i915_driver_preclose(drm_device_t * dev, DRMFILE filp) |