Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1da3f87e authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: kill kernel_context_switch callbacks 



Not used by any in-kernel driver. So drop it.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 59506197

drivers/gpu/drm/drm_lock.c

+0 −18
Original line number Diff line number Diff line
@@ -136,12 +136,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
		}

	}



	if (dev->driver->kernel_context_switch &&

	    dev->last_context != lock->context) {

		dev->driver->kernel_context_switch(dev, dev->last_context,

						   lock->context);

	}



	return 0;

}
@@ -159,7 +153,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) 
int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	struct drm_lock *lock = data;

	struct drm_master *master = file_priv->master;



	if (lock->context == DRM_KERNEL_CONTEXT) {

		DRM_ERROR("Process %d using kernel context %d\n",
@@ -169,17 +162,6 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) 


	atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);



	/* kernel_context_switch isn't used by any of the x86 drm

	 * modules but is required by the Sparc driver.

	 */

	if (dev->driver->kernel_context_switch_unlock)

		dev->driver->kernel_context_switch_unlock(dev);

	else {

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

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

		}

	}



	unblock_all_signals();

	return 0;

}

include/drm/drmP.h

+0 −3
Original line number Diff line number Diff line
@@ -703,9 +703,6 @@ struct drm_driver { 
	int (*dma_quiescent) (struct drm_device *);

	int (*context_ctor) (struct drm_device *dev, int context);

	int (*context_dtor) (struct drm_device *dev, int context);

	int (*kernel_context_switch) (struct drm_device *dev, int old,

				      int new);

	void (*kernel_context_switch_unlock) (struct drm_device *dev);



	/**

	 * get_vblank_counter - get raw hardware vblank counter