drm: don't export dri1 locking functions

Only used by ioctl, not by any in-tree drivers.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Daniel Vetter 2010-08-23 22:53:34 +02:00 committed by Dave Airlie
parent 793a97e4cc
commit 4ac5ec40ec
2 changed files with 3 additions and 8 deletions

View File

@ -37,6 +37,8 @@
static int drm_notifier(void *priv); static int drm_notifier(void *priv);
static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
/** /**
* Lock ioctl. * Lock ioctl.
* *
@ -172,6 +174,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
* *
* Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction. * Attempt to mark the lock as held by the given context, via the \p cmpxchg instruction.
*/ */
static
int drm_lock_take(struct drm_lock_data *lock_data, int drm_lock_take(struct drm_lock_data *lock_data,
unsigned int context) unsigned int context)
{ {
@ -208,7 +211,6 @@ int drm_lock_take(struct drm_lock_data *lock_data,
} }
return 0; return 0;
} }
EXPORT_SYMBOL(drm_lock_take);
/** /**
* This takes a lock forcibly and hands it to context. Should ONLY be used * 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)
wake_up_interruptible(&lock_data->lock_queue); wake_up_interruptible(&lock_data->lock_queue);
return 0; return 0;
} }
EXPORT_SYMBOL(drm_lock_free);
/** /**
* If we get here, it means that the process has called DRM_IOCTL_LOCK * 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)
} }
spin_unlock_bh(&lock_data->spinlock); spin_unlock_bh(&lock_data->spinlock);
} }
EXPORT_SYMBOL(drm_idlelock_take);
void drm_idlelock_release(struct drm_lock_data *lock_data) void drm_idlelock_release(struct drm_lock_data *lock_data)
{ {
@ -359,8 +359,6 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
} }
spin_unlock_bh(&lock_data->spinlock); spin_unlock_bh(&lock_data->spinlock);
} }
EXPORT_SYMBOL(drm_idlelock_release);
int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv) int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)
{ {
@ -369,5 +367,3 @@ int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)
_DRM_LOCK_IS_HELD(master->lock.hw_lock->lock) && _DRM_LOCK_IS_HELD(master->lock.hw_lock->lock) &&
master->lock.file_priv == file_priv); master->lock.file_priv == file_priv);
} }
EXPORT_SYMBOL(drm_i_have_hw_lock);

View File

@ -1252,7 +1252,6 @@ extern int drm_lock(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int drm_unlock(struct drm_device *dev, void *data, extern int drm_unlock(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context);
extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context); extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context);
extern void drm_idlelock_take(struct drm_lock_data *lock_data); extern void drm_idlelock_take(struct drm_lock_data *lock_data);
extern void drm_idlelock_release(struct drm_lock_data *lock_data); extern void drm_idlelock_release(struct drm_lock_data *lock_data);