Commit 4c373790 authored Oct 26, 2011 by Daniel Vetter Committed by Dave Airlie Jul 19, 2012

drm: ditch strange DRIVER_DMA_QUEUE only error bail-out



Only one driver (i810) even sets that flag. Now the actual locking
code uncoditionally promotes lock->context to an unsigned int.

Closer inspection of the userspace reveals that the drm lock context
is defined as an unsigned int (at least on linux). I suspect we just
have a strange case of signedness confusion going on.

Tested on my i815, doesn't seem to break anything.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent b0071efe

drivers/gpu/drm/drm_lock.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -70,10 +70,6 @@ int drm_lock(struct drm_device dev, void data, struct drm_file *file_priv)
		lock->context, task_pid_nr(current),
		master->lock.hw_lock->lock, lock->flags);

		if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE))
		if (lock->context < 0)
		return -EINVAL;

		add_wait_queue(&master->lock.lock_queue, &entry);
		spin_lock_bh(&master->lock.spinlock);
		master->lock.user_waiters++;