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

Commit 79fa9eb7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'korg/drm-core-next' into drm-next-stage 

* korg/drm-core-next:
  drm/ttm: handle OOM in ttm_tt_swapout
  drm/radeon/kms/atom: fix shr/shl ops
  drm/kms: fix spelling of "CLOCK"
  drm/kms: fix fb_changed = true else statement
  drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()
  drm: switch all GEM/KMS ioctls to unlocked ioctl status.
  Use drm_gem_object_[handle_]unreference_unlocked where possible
  drm: introduce drm_gem_object_[handle_]unreference_unlocked
parents 60b341b7 290e5505

drivers/gpu/drm/drm_crtc_helper.c

+1 −5
Original line number Diff line number Diff line
@@ -836,11 +836,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
			mode_changed = true;

		} else if (set->fb == NULL) {

			mode_changed = true;

		} else if ((set->fb->bits_per_pixel !=

			 set->crtc->fb->bits_per_pixel) ||

			 set->fb->depth != set->crtc->fb->depth)

			fb_changed = true;

		else

		} else

			fb_changed = true;

	}

drivers/gpu/drm/drm_drv.c

+22 −22
Original line number Diff line number Diff line
@@ -125,28 +125,28 @@ static struct drm_ioctl_desc drm_ioctls[] = { 


	DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH),



	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl, DRM_MASTER),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl, DRM_MASTER),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCONNECTOR, drm_mode_getconnector, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_mode_attachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_mode_detachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_MASTER | DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW)

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH|DRM_UNLOCKED),



	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl, DRM_MASTER|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl, DRM_MASTER|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCONNECTOR, drm_mode_getconnector, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_mode_attachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_mode_detachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_MASTER | DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED)

};



#define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )

drivers/gpu/drm/drm_fb_helper.c

+6 −20
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
 *      Dave Airlie <airlied@linux.ie>

 *      Jesse Barnes <jesse.barnes@intel.com>

 */

#include <linux/kernel.h>

#include <linux/sysrq.h>

#include <linux/fb.h>

#include "drmP.h"
@@ -50,21 +51,6 @@ int drm_fb_helper_add_connector(struct drm_connector *connector) 
}

EXPORT_SYMBOL(drm_fb_helper_add_connector);



static int my_atoi(const char *name)

{

	int val = 0;



	for (;; name++) {

		switch (*name) {

		case '0' ... '9':

			val = 10*val+(*name-'0');

			break;

		default:

			return val;

		}

	}

}



/**

 * drm_fb_helper_connector_parse_command_line - parse command line for connector

 * @connector - connector to parse line for
@@ -111,7 +97,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con 
			namelen = i;

			if (!refresh_specified && !bpp_specified &&

			    !yres_specified) {

				refresh = my_atoi(&name[i+1]);

				refresh = simple_strtol(&name[i+1], NULL, 10);

				refresh_specified = 1;

				if (cvt || rb)

					cvt = 0;
@@ -121,7 +107,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con 
		case '-':

			namelen = i;

			if (!bpp_specified && !yres_specified) {

				bpp = my_atoi(&name[i+1]);

				bpp = simple_strtol(&name[i+1], NULL, 10);

				bpp_specified = 1;

				if (cvt || rb)

					cvt = 0;
@@ -130,7 +116,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con 
			break;

		case 'x':

			if (!yres_specified) {

				yres = my_atoi(&name[i+1]);

				yres = simple_strtol(&name[i+1], NULL, 10);

				yres_specified = 1;

			} else

				goto done;
@@ -170,7 +156,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con 
		}

	}

	if (i < 0 && yres_specified) {

		xres = my_atoi(name);

		xres = simple_strtol(name, NULL, 10);

		res_specified = 1;

	}

done:
@@ -694,7 +680,7 @@ int drm_fb_helper_set_par(struct fb_info *info) 
	int i;



	if (var->pixclock != 0) {

		DRM_ERROR("PIXEL CLCOK SET\n");

		DRM_ERROR("PIXEL CLOCK SET\n");

		return -EINVAL;

	}

drivers/gpu/drm/drm_gem.c

+49 −21
Original line number Diff line number Diff line
@@ -192,9 +192,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) 
	idr_remove(&filp->object_idr, handle);

	spin_unlock(&filp->table_lock);



	mutex_lock(&dev->struct_mutex);

	drm_gem_object_handle_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_handle_unreference_unlocked(obj);



	return 0;

}
@@ -325,9 +323,7 @@ again: 
	}



err:

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

	return ret;

}
@@ -358,9 +354,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data, 
		return -ENOENT;



	ret = drm_gem_handle_create(file_priv, obj, &handle);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

	if (ret)

		return ret;
@@ -390,7 +384,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
{

	struct drm_gem_object *obj = ptr;



	drm_gem_object_handle_unreference(obj);

	drm_gem_object_handle_unreference_unlocked(obj);



	return 0;

}
@@ -403,16 +397,25 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
void

drm_gem_release(struct drm_device *dev, struct drm_file *file_private)

{

	mutex_lock(&dev->struct_mutex);

	idr_for_each(&file_private->object_idr,

		     &drm_gem_object_release_handle, NULL);



	idr_destroy(&file_private->object_idr);

	mutex_unlock(&dev->struct_mutex);

}



static void

drm_gem_object_free_common(struct drm_gem_object *obj)

{

	struct drm_device *dev = obj->dev;

	fput(obj->filp);

	atomic_dec(&dev->object_count);

	atomic_sub(obj->size, &dev->object_memory);

	kfree(obj);

}



/**

 * Called after the last reference to the object has been lost.

 * Must be called holding struct_ mutex

 *

 * Frees the object

 */
@@ -427,13 +430,39 @@ drm_gem_object_free(struct kref *kref) 
	if (dev->driver->gem_free_object != NULL)

		dev->driver->gem_free_object(obj);



	fput(obj->filp);

	atomic_dec(&dev->object_count);

	atomic_sub(obj->size, &dev->object_memory);

	kfree(obj);

	drm_gem_object_free_common(obj);

}

EXPORT_SYMBOL(drm_gem_object_free);



/**

 * Called after the last reference to the object has been lost.

 * Must be called without holding struct_mutex

 *

 * Frees the object

 */

void

drm_gem_object_free_unlocked(struct kref *kref)

{

	struct drm_gem_object *obj = (struct drm_gem_object *) kref;

	struct drm_device *dev = obj->dev;



	if (dev->driver->gem_free_object_unlocked != NULL)

		dev->driver->gem_free_object_unlocked(obj);

	else if (dev->driver->gem_free_object != NULL) {

		mutex_lock(&dev->struct_mutex);

		dev->driver->gem_free_object(obj);

		mutex_unlock(&dev->struct_mutex);

	}



	drm_gem_object_free_common(obj);

}

EXPORT_SYMBOL(drm_gem_object_free_unlocked);



static void drm_gem_object_ref_bug(struct kref *list_kref)

{

	BUG();

}



/**

 * Called after the last handle to the object has been closed

 *
@@ -458,8 +487,10 @@ drm_gem_object_handle_free(struct kref *kref) 
		/*

		 * The object name held a reference to this object, drop

		 * that now.

		*

		* This cannot be the last reference, since the handle holds one too.

		 */

		drm_gem_object_unreference(obj);

		kref_put(&obj->refcount, drm_gem_object_ref_bug);

	} else

		spin_unlock(&dev->object_name_lock);
@@ -477,11 +508,8 @@ EXPORT_SYMBOL(drm_gem_vm_open); 
void drm_gem_vm_close(struct vm_area_struct *vma)

{

	struct drm_gem_object *obj = vma->vm_private_data;

	struct drm_device *dev = obj->dev;



	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

}

EXPORT_SYMBOL(drm_gem_vm_close);

drivers/gpu/drm/i915/i915_gem.c

+6 −10
Original line number Diff line number Diff line
@@ -128,9 +128,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, 
		return -ENOMEM;



	ret = drm_gem_handle_create(file_priv, obj, &handle);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_handle_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_handle_unreference_unlocked(obj);



	if (ret)

		return ret;
@@ -488,7 +486,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
	 */

	if (args->offset > obj->size || args->size > obj->size ||

	    args->offset + args->size > obj->size) {

		drm_gem_object_unreference(obj);

		drm_gem_object_unreference_unlocked(obj);

		return -EINVAL;

	}
@@ -501,7 +499,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
							file_priv);

	}



	drm_gem_object_unreference(obj);

	drm_gem_object_unreference_unlocked(obj);



	return ret;

}
@@ -961,7 +959,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
	 */

	if (args->offset > obj->size || args->size > obj->size ||

	    args->offset + args->size > obj->size) {

		drm_gem_object_unreference(obj);

		drm_gem_object_unreference_unlocked(obj);

		return -EINVAL;

	}
@@ -995,7 +993,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
		DRM_INFO("pwrite failed %d\n", ret);

#endif



	drm_gem_object_unreference(obj);

	drm_gem_object_unreference_unlocked(obj);



	return ret;

}
@@ -1138,9 +1136,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
		       PROT_READ | PROT_WRITE, MAP_SHARED,

		       args->offset);

	up_write(&current->mm->mmap_sem);

	mutex_lock(&dev->struct_mutex);

	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(obj);

	if (IS_ERR((void *)addr))

		return addr;