aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/via_mm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/via_mm.c')
-rw-r--r--drivers/char/drm/via_mm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 36f2547254f9..fe68cbbe787c 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -149,7 +149,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
149 149
150 tmpSize = (mem.size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT; 150 tmpSize = (mem.size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
151 item = drm_sman_alloc(&dev_priv->sman, mem.type, tmpSize, 0, 151 item = drm_sman_alloc(&dev_priv->sman, mem.type, tmpSize, 0,
152 (unsigned long)priv); 152 (unsigned long)file_priv);
153 mutex_unlock(&dev->struct_mutex); 153 mutex_unlock(&dev->struct_mutex);
154 if (item) { 154 if (item) {
155 mem.offset = ((mem.type == VIA_MEM_VIDEO) ? 155 mem.offset = ((mem.type == VIA_MEM_VIDEO) ?
@@ -188,13 +188,13 @@ int via_mem_free(DRM_IOCTL_ARGS)
188} 188}
189 189
190 190
191void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp) 191void via_reclaim_buffers_locked(struct drm_device * dev,
192 struct drm_file *file_priv)
192{ 193{
193 drm_via_private_t *dev_priv = dev->dev_private; 194 drm_via_private_t *dev_priv = dev->dev_private;
194 struct drm_file *priv = filp->private_data;
195 195
196 mutex_lock(&dev->struct_mutex); 196 mutex_lock(&dev->struct_mutex);
197 if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) { 197 if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)file_priv)) {
198 mutex_unlock(&dev->struct_mutex); 198 mutex_unlock(&dev->struct_mutex);
199 return; 199 return;
200 } 200 }
@@ -203,7 +203,7 @@ void via_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
203 dev->driver->dma_quiescent(dev); 203 dev->driver->dma_quiescent(dev);
204 } 204 }
205 205
206 drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)priv); 206 drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
207 mutex_unlock(&dev->struct_mutex); 207 mutex_unlock(&dev->struct_mutex);
208 return; 208 return;
209} 209}