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

Commit 0c4dd906 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: make kernel context switch same as for drm git tree. 



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 94bb598e

drivers/char/drm/drmP.h

+1 −2
Original line number Diff line number Diff line
@@ -561,8 +561,7 @@ struct drm_driver { 
	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,

					      drm_lock_t *lock);

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

	int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);

	int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence);

	int (*dri_library_name) (struct drm_device *dev, char *buf);

drivers/char/drm/drm_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp, 
	 * modules but is required by the Sparc driver.

	 */

	if (dev->driver->kernel_context_switch_unlock)

		dev->driver->kernel_context_switch_unlock(dev, &lock);

		dev->driver->kernel_context_switch_unlock(dev);

	else {

		drm_lock_transfer(dev, &dev->lock.hw_lock->lock,

				  DRM_KERNEL_CONTEXT);