Commit 3f4b5c5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (37 commits)
  drm/i915: fix modeset devname allocation + agp init return check.
  drm/i915: Remove redundant test in error path.
  drm: Add a debug node for vblank state.
  drm: Avoid use-before-null-test on dev in drm_cleanup().
  drm/i915: Don't print to dmesg when taking signal during object_pin.
  drm: pin new and unpin old buffer when setting a mode.
  drm/i915: un-EXPORT and make 'intelfb_panic' static
  drm/i915: Delete unused, pointless i915_driver_firstopen.
  drm/i915: fix sparse warnings: returning void-valued expression
  drm/i915: fix sparse warnings: move 'extern' decls to header file
  drm/i915: fix sparse warnings: make symbols static
  drm/i915: fix sparse warnings: declare one-bit bitfield as unsigned
  drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().
  drm/i915: Fix fbcon setup to align display pitch to 64b.
  drm/i915: Add missing userland definitions for gem init/execbuffer.
  i915/drm: provide compat defines for userspace for certain struct members.
  drm: drop DRM_IOCTL_MODE_REPLACEFB, add+remove works just as well.
  drm: sanitise drm modesetting API + remove unused hotplug
  drm: fix allowing master ioctls on non-master fds.
  drm/radeon: use locked rmmap to remove sarea mapping.
  ...
parents a4ba2e9e aa596629

drivers/gpu/drm/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
menuconfig DRM

	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"

	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU

	select I2C

	select I2C_ALGOBIT

	help

	  Kernel-level support for the Direct Rendering Infrastructure (DRI)

	  introduced in XFree86 4.0. If you say Y here, you need to select
@@ -65,6 +67,10 @@ config DRM_I830 
	  will load the correct one.



config DRM_I915

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	depends on FB

	tristate "i915 driver"

	help

	  Choose this option if you have a system that has Intel 830M, 845G,
@@ -76,6 +82,17 @@ config DRM_I915 


endchoice



config DRM_I915_KMS

	bool "Enable modesetting on intel by default"

	depends on DRM_I915

	help

	Choose this option if you want kernel modesetting enabled by default,

	and you have a new enough userspace to support this. Running old

	userspaces with this enabled will cause pain.  Note that this causes

	the driver to bind to PCI devices, which precludes loading things

	like intelfb.





config DRM_MGA

	tristate "Matrox g200/g400"

	depends on DRM

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \

		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \

		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \

		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o

		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \

		drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drivers/gpu/drm/drm_auth.c

+15 −14
Original line number Diff line number Diff line
@@ -45,14 +45,15 @@ 
 * the one with matching magic number, while holding the drm_device::struct_mutex

 * lock.

 */

static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic)

static struct drm_file *drm_find_file(struct drm_master *master, drm_magic_t magic)

{

	struct drm_file *retval = NULL;

	struct drm_magic_entry *pt;

	struct drm_hash_item *hash;

	struct drm_device *dev = master->minor->dev;



	mutex_lock(&dev->struct_mutex);

	if (!drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) {

	if (!drm_ht_find_item(&master->magiclist, (unsigned long)magic, &hash)) {

		pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);

		retval = pt->priv;

	}
@@ -71,11 +72,11 @@ static struct drm_file *drm_find_file(struct drm_device * dev, drm_magic_t magic 
 * associated the magic number hash key in drm_device::magiclist, while holding

 * the drm_device::struct_mutex lock.

 */

static int drm_add_magic(struct drm_device * dev, struct drm_file * priv,

static int drm_add_magic(struct drm_master *master, struct drm_file *priv,

			 drm_magic_t magic)

{

	struct drm_magic_entry *entry;



	struct drm_device *dev = master->minor->dev;

	DRM_DEBUG("%d\n", magic);



	entry = drm_alloc(sizeof(*entry), DRM_MEM_MAGIC);
@@ -83,11 +84,10 @@ static int drm_add_magic(struct drm_device * dev, struct drm_file * priv, 
		return -ENOMEM;

	memset(entry, 0, sizeof(*entry));

	entry->priv = priv;



	entry->hash_item.key = (unsigned long)magic;

	mutex_lock(&dev->struct_mutex);

	drm_ht_insert_item(&dev->magiclist, &entry->hash_item);

	list_add_tail(&entry->head, &dev->magicfree);

	drm_ht_insert_item(&master->magiclist, &entry->hash_item);

	list_add_tail(&entry->head, &master->magicfree);

	mutex_unlock(&dev->struct_mutex);



	return 0;
@@ -102,20 +102,21 @@ static int drm_add_magic(struct drm_device * dev, struct drm_file * priv, 
 * Searches and unlinks the entry in drm_device::magiclist with the magic

 * number hash key, while holding the drm_device::struct_mutex lock.

 */

static int drm_remove_magic(struct drm_device * dev, drm_magic_t magic)

static int drm_remove_magic(struct drm_master *master, drm_magic_t magic)

{

	struct drm_magic_entry *pt;

	struct drm_hash_item *hash;

	struct drm_device *dev = master->minor->dev;



	DRM_DEBUG("%d\n", magic);



	mutex_lock(&dev->struct_mutex);

	if (drm_ht_find_item(&dev->magiclist, (unsigned long)magic, &hash)) {

	if (drm_ht_find_item(&master->magiclist, (unsigned long)magic, &hash)) {

		mutex_unlock(&dev->struct_mutex);

		return -EINVAL;

	}

	pt = drm_hash_entry(hash, struct drm_magic_entry, hash_item);

	drm_ht_remove_item(&dev->magiclist, hash);

	drm_ht_remove_item(&master->magiclist, hash);

	list_del(&pt->head);

	mutex_unlock(&dev->struct_mutex);
@@ -153,9 +154,9 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv) 
				++sequence;	/* reserve 0 */

			auth->magic = sequence++;

			spin_unlock(&lock);

		} while (drm_find_file(dev, auth->magic));

		} while (drm_find_file(file_priv->master, auth->magic));

		file_priv->magic = auth->magic;

		drm_add_magic(dev, file_priv, auth->magic);

		drm_add_magic(file_priv->master, file_priv, auth->magic);

	}



	DRM_DEBUG("%u\n", auth->magic);
@@ -181,9 +182,9 @@ int drm_authmagic(struct drm_device *dev, void *data, 
	struct drm_file *file;



	DRM_DEBUG("%u\n", auth->magic);

	if ((file = drm_find_file(dev, auth->magic))) {

	if ((file = drm_find_file(file_priv->master, auth->magic))) {

		file->authenticated = 1;

		drm_remove_magic(dev, auth->magic);

		drm_remove_magic(file_priv->master, auth->magic);

		return 0;

	}

	return -EINVAL;

drivers/gpu/drm/drm_bufs.c

+22 −5
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, 
{

	struct drm_map_list *entry;

	list_for_each_entry(entry, &dev->maplist, head) {

		if (entry->map && map->type == entry->map->type &&

		if (entry->map && (entry->master == dev->primary->master) && (map->type == entry->map->type) &&

		    ((entry->map->offset == map->offset) ||

		     (map->type == _DRM_SHM && map->flags==_DRM_CONTAINS_LOCK))) {

		     ((map->type == _DRM_SHM) && (map->flags&_DRM_CONTAINS_LOCK)))) {

			return entry;

		}

	}
@@ -210,12 +210,12 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset, 
		map->offset = (unsigned long)map->handle;

		if (map->flags & _DRM_CONTAINS_LOCK) {

			/* Prevent a 2nd X Server from creating a 2nd lock */

			if (dev->lock.hw_lock != NULL) {

			if (dev->primary->master->lock.hw_lock != NULL) {

				vfree(map->handle);

				drm_free(map, sizeof(*map), DRM_MEM_MAPS);

				return -EBUSY;

			}

			dev->sigdata.lock = dev->lock.hw_lock = map->handle;	/* Pointer to lock */

			dev->sigdata.lock = dev->primary->master->lock.hw_lock = map->handle;	/* Pointer to lock */

		}

		break;

	case _DRM_AGP: {
@@ -261,6 +261,9 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset, 
		}

		DRM_DEBUG("AGP offset = 0x%08lx, size = 0x%08lx\n", map->offset, map->size);



		break;

	case _DRM_GEM:

		DRM_ERROR("tried to rmmap GEM object\n");

		break;

	}

	case _DRM_SCATTER_GATHER:
@@ -319,6 +322,7 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset, 
	list->user_token = list->hash.key << PAGE_SHIFT;

	mutex_unlock(&dev->struct_mutex);



	list->master = dev->primary->master;

	*maplist = list;

	return 0;

	}
@@ -345,7 +349,7 @@ int drm_addmap_ioctl(struct drm_device *dev, void *data, 
	struct drm_map_list *maplist;

	int err;



	if (!(capable(CAP_SYS_ADMIN) || map->type == _DRM_AGP))

	if (!(capable(CAP_SYS_ADMIN) || map->type == _DRM_AGP || map->type == _DRM_SHM))

		return -EPERM;



	err = drm_addmap_core(dev, map->offset, map->size, map->type,
@@ -380,10 +384,12 @@ int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map) 
	struct drm_map_list *r_list = NULL, *list_t;

	drm_dma_handle_t dmah;

	int found = 0;

	struct drm_master *master;



	/* Find the list entry for the map and remove it */

	list_for_each_entry_safe(r_list, list_t, &dev->maplist, head) {

		if (r_list->map == map) {

			master = r_list->master;

			list_del(&r_list->head);

			drm_ht_remove_key(&dev->map_hash,

					  r_list->user_token >> PAGE_SHIFT);
@@ -409,6 +415,13 @@ int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map) 
		break;

	case _DRM_SHM:

		vfree(map->handle);

		if (master) {

			if (dev->sigdata.lock == master->lock.hw_lock)

				dev->sigdata.lock = NULL;

			master->lock.hw_lock = NULL;   /* SHM removed */

			master->lock.file_priv = NULL;

			wake_up_interruptible(&master->lock.lock_queue);

		}

		break;

	case _DRM_AGP:

	case _DRM_SCATTER_GATHER:
@@ -419,11 +432,15 @@ int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t *map) 
		dmah.size = map->size;

		__drm_pci_free(dev, &dmah);

		break;

	case _DRM_GEM:

		DRM_ERROR("tried to rmmap GEM object\n");

		break;

	}

	drm_free(map, sizeof(*map), DRM_MEM_MAPS);



	return 0;

}

EXPORT_SYMBOL(drm_rmmap_locked);



int drm_rmmap(struct drm_device *dev, drm_local_map_t *map)

{

drivers/gpu/drm/drm_context.c

+4 −6
Original line number Diff line number Diff line
@@ -256,12 +256,13 @@ static int drm_context_switch(struct drm_device * dev, int old, int new) 
 * hardware lock is held, clears the drm_device::context_flag and wakes up

 * drm_device::context_wait.

 */

static int drm_context_switch_complete(struct drm_device * dev, int new)

static int drm_context_switch_complete(struct drm_device *dev,

				       struct drm_file *file_priv, int new)

{

	dev->last_context = new;	/* PRE/POST: This is the _only_ writer. */

	dev->last_switch = jiffies;



	if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {

	if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {

		DRM_ERROR("Lock isn't held after context switch\n");

	}
@@ -420,7 +421,7 @@ int drm_newctx(struct drm_device *dev, void *data, 
	struct drm_ctx *ctx = data;



	DRM_DEBUG("%d\n", ctx->handle);

	drm_context_switch_complete(dev, ctx->handle);

	drm_context_switch_complete(dev, file_priv, ctx->handle);



	return 0;

}
@@ -442,9 +443,6 @@ int drm_rmctx(struct drm_device *dev, void *data, 
	struct drm_ctx *ctx = data;



	DRM_DEBUG("%d\n", ctx->handle);

	if (ctx->handle == DRM_KERNEL_CONTEXT + 1) {

		file_priv->remove_auth_on_close = 1;

	}

	if (ctx->handle != DRM_KERNEL_CONTEXT) {

		if (dev->driver->context_dtor)

			dev->driver->context_dtor(dev, ctx->handle);

CRA Git | Maintained and supported by SUSTech CRA and CCSE