Commit bb6d822e authored by David Rheinsberg's avatar David Rheinsberg Committed by Dave Airlie
Browse files

drm: move drm-lock API to drm_legacy.h 



Same as the other legacy APIs, most of this is internal, so prefix it with
drm_legacy_* and move into drm_legacy.h.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d4f68a75

drivers/gpu/drm/drm_fops.c

+3 −3
Original line number Diff line number Diff line
@@ -268,10 +268,10 @@ static void drm_master_release(struct drm_device *dev, struct file *filp) 
{

	struct drm_file *file_priv = filp->private_data;



	if (drm_i_have_hw_lock(dev, file_priv)) {

	if (drm_legacy_i_have_hw_lock(dev, file_priv)) {

		DRM_DEBUG("File %p released, freeing lock for context %d\n",

			  filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));

		drm_lock_free(&file_priv->master->lock,

		drm_legacy_lock_free(&file_priv->master->lock,

				     _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));

	}

}

drivers/gpu/drm/drm_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_ADD_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_LOCK, drm_lock, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_UNLOCK, drm_unlock, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_LOCK, drm_legacy_lock, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_UNLOCK, drm_legacy_unlock, DRM_AUTH),



	DRM_IOCTL_DEF(DRM_IOCTL_FINISH, drm_noop, DRM_AUTH),

drivers/gpu/drm/drm_legacy.h

+9 −0
Original line number Diff line number Diff line
@@ -83,4 +83,13 @@ struct drm_agp_mem { 
	struct list_head head;

};



/*

 * Generic Userspace Locking-API

 */



int drm_legacy_i_have_hw_lock(struct drm_device *d, struct drm_file *f);

int drm_legacy_lock(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_lock_free(struct drm_lock_data *lock, unsigned int ctx);



#endif /* __DRM_LEGACY_H__ */

drivers/gpu/drm/drm_lock.c

+11 −9
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context); 
 *

 * Add the current task to the lock wait queue, and attempt to take to lock.

 */

int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)

int drm_legacy_lock(struct drm_device *dev, void *data,

		    struct drm_file *file_priv)

{

	DECLARE_WAITQUEUE(entry, current);

	struct drm_lock *lock = data;
@@ -146,7 +147,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
 *

 * Transfer and free the lock.

 */

int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)

int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	struct drm_lock *lock = data;

	struct drm_master *master = file_priv->master;
@@ -157,7 +158,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
		return -EINVAL;

	}



	if (drm_lock_free(&master->lock, lock->context)) {

	if (drm_legacy_lock_free(&master->lock, lock->context)) {

		/* FIXME: Should really bail out here. */

	}
@@ -250,7 +251,7 @@ static int drm_lock_transfer(struct drm_lock_data *lock_data, 
 * Marks the lock as not held, via the \p cmpxchg instruction. Wakes any task

 * waiting on the lock queue.

 */

int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)

int drm_legacy_lock_free(struct drm_lock_data *lock_data, unsigned int context)

{

	unsigned int old, new, prev;

	volatile unsigned int *lock = &lock_data->hw_lock->lock;
@@ -324,7 +325,7 @@ static int drm_notifier(void *priv) 
 * having to worry about starvation.

 */



void drm_idlelock_take(struct drm_lock_data *lock_data)

void drm_legacy_idlelock_take(struct drm_lock_data *lock_data)

{

	int ret;
@@ -341,9 +342,9 @@ void drm_idlelock_take(struct drm_lock_data *lock_data) 
	}

	spin_unlock_bh(&lock_data->spinlock);

}

EXPORT_SYMBOL(drm_idlelock_take);

EXPORT_SYMBOL(drm_legacy_idlelock_take);



void drm_idlelock_release(struct drm_lock_data *lock_data)

void drm_legacy_idlelock_release(struct drm_lock_data *lock_data)

{

	unsigned int old, prev;

	volatile unsigned int *lock = &lock_data->hw_lock->lock;
@@ -361,9 +362,10 @@ void drm_idlelock_release(struct drm_lock_data *lock_data) 
	}

	spin_unlock_bh(&lock_data->spinlock);

}

EXPORT_SYMBOL(drm_idlelock_release);

EXPORT_SYMBOL(drm_legacy_idlelock_release);



int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv)

int drm_legacy_i_have_hw_lock(struct drm_device *dev,

			      struct drm_file *file_priv)

{

	struct drm_master *master = file_priv->master;

	return (file_priv->lock_count && master->lock.hw_lock &&

drivers/gpu/drm/i810/i810_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -1215,9 +1215,9 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv) 
	}



	if (file_priv->master && file_priv->master->lock.hw_lock) {

		drm_idlelock_take(&file_priv->master->lock);

		drm_legacy_idlelock_take(&file_priv->master->lock);

		i810_driver_reclaim_buffers(dev, file_priv);

		drm_idlelock_release(&file_priv->master->lock);

		drm_legacy_idlelock_release(&file_priv->master->lock);

	} else {

		/* master disappeared, clean up stuff anyway and hope nothing

		 * goes wrong */