aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_lock.c10
-rw-r--r--include/drm/drmP.h1
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index d9146f240d33..1e28b9072068 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -37,6 +37,8 @@
37 37
38static int drm_notifier(void *priv); 38static int drm_notifier(void *priv);
39 39
40static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
41
40/** 42/**
41 * Lock ioctl. 43 * Lock ioctl.
42 * 44 *
@@ -172,6 +174,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
172 * 174 *
173 * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction. 175 * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction.
174 */ 176 */
177static
175int drm_lock_take(struct drm_lock_data *lock_data, 178int drm_lock_take(struct drm_lock_data *lock_data,
176 unsigned int context) 179 unsigned int context)
177{ 180{
@@ -208,7 +211,6 @@ int drm_lock_take(struct drm_lock_data *lock_data,
208 } 211 }
209 return 0; 212 return 0;
210} 213}
211EXPORT_SYMBOL(drm_lock_take);
212 214
213/** 215/**
214 * This takes a lock forcibly and hands it to context. Should ONLY be used 216 * This takes a lock forcibly and hands it to context. Should ONLY be used
@@ -276,7 +278,6 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
276 wake_up_interruptible(&lock_data->lock_queue); 278 wake_up_interruptible(&lock_data->lock_queue);
277 return 0; 279 return 0;
278} 280}
279EXPORT_SYMBOL(drm_lock_free);
280 281
281/** 282/**
282 * If we get here, it means that the process has called DRM_IOCTL_LOCK 283 * If we get here, it means that the process has called DRM_IOCTL_LOCK
@@ -339,7 +340,6 @@ void drm_idlelock_take(struct drm_lock_data *lock_data)
339 } 340 }
340 spin_unlock_bh(&lock_data->spinlock); 341 spin_unlock_bh(&lock_data->spinlock);
341} 342}
342EXPORT_SYMBOL(drm_idlelock_take);
343 343
344void drm_idlelock_release(struct drm_lock_data *lock_data) 344void drm_idlelock_release(struct drm_lock_data *lock_data)
345{ 345{
@@ -359,8 +359,6 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
359 } 359 }
360 spin_unlock_bh(&lock_data->spinlock); 360 spin_unlock_bh(&lock_data->spinlock);
361} 361}
362EXPORT_SYMBOL(drm_idlelock_release);
363
364 362
365int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv) 363int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)
366{ 364{
@@ -369,5 +367,3 @@ int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)
369 _DRM_LOCK_IS_HELD(master->lock.hw_lock->lock) && 367 _DRM_LOCK_IS_HELD(master->lock.hw_lock->lock) &&
370 master->lock.file_priv == file_priv); 368 master->lock.file_priv == file_priv);
371} 369}
372
373EXPORT_SYMBOL(drm_i_have_hw_lock);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 70a14a4faa1e..45d09639e9d2 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1252,7 +1252,6 @@ extern int drm_lock(struct drm_device *dev, void *data,
1252 struct drm_file *file_priv); 1252 struct drm_file *file_priv);
1253extern int drm_unlock(struct drm_device *dev, void *data, 1253extern int drm_unlock(struct drm_device *dev, void *data,
1254 struct drm_file *file_priv); 1254 struct drm_file *file_priv);
1255extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
1256extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context); 1255extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);
1257extern void drm_idlelock_take(struct drm_lock_data *lock_data); 1256extern void drm_idlelock_take(struct drm_lock_data *lock_data);
1258extern void drm_idlelock_release(struct drm_lock_data *lock_data); 1257extern void drm_idlelock_release(struct drm_lock_data *lock_data);