linux-stable.git/drivers/gpu/drm/drm_lock.c, branch linux-3.17.y

Revert "drm: drop redundant drm_file->is_master"

2014-08-07T21:30:53+00:00

This reverts commit 48ba813701eb14b3008edefef4a0789b328e278c.

Thanks to Chris:
"drm_file->is_master is not synomous with having drm_file->master ==
drm_file->minor->master. This is because drm_file->master is the same
for all drm_files of the same generation and so when there is a master,
every drm_file believes itself to be the master. Confusion ensues and
things go pear shaped when one file is closed and there is no master
anymore."

Conflicts:
	drivers/gpu/drm/drm_drv.c
	drivers/gpu/drm/drm_stub.c

drm: mark drm_context support as legacy

2014-08-05T17:38:12+00:00

This renames all drm-context helpers to drm_legacy_*() and moves the
internal definitions into the new drm_legacy.h header. This header is
local to DRM-core and drivers shouldn't access it.

Reviewed-by: Daniel Vetter 
Signed-off-by: David Herrmann

drm: drop redundant drm_file->is_master

2014-08-05T14:07:50+00:00

The drm_file->is_master field is redundant as it's equivalent to:
    drm_file->master && drm_file->master == drm_file->minor->master

1) "=>"
  Whenever we set drm_file->is_master, we also set:
      drm_file->minor->master = drm_file->master;

  Whenever we clear drm_file->is_master, we also call:
      drm_master_put(&drm_file->minor->master);
  which implicitly clears it to NULL.

2) "<="
  minor->master cannot be set if it is non-NULL. Therefore, it stays as
  is unless a file drops it.

  If minor->master is NULL, it is only set by places that also adjust
  drm_file->is_master.

Therefore, we can safely drop is_master and replace it by an inline helper
that matches:
    drm_file->master && drm_file->master == drm_file->minor->master

Reviewed-by: Alex Deucher 
Reviewed-by: Daniel Vetter 
Signed-off-by: David Herrmann

drm: Kill drm perf counter leftovers

2013-10-09T05:55:33+00:00

The user of these counters was killed in

 commit d79cdc8312689b39c6d83718c1c196af4b3cd18c
 Author: Daniel Vetter 
 Date:   Thu Aug 8 15:41:32 2013 +0200

    drm: no-op out GET_STATS ioctl

so clean up the leftovers as well.

Signed-off-by: Ville Syrjälä 
Reviewed-by: Daniel Vetter 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

UAPI: (Scripted) Convert #include "..." to #include in drivers/gpu/

2012-10-02T17:01:07+00:00

Convert #include "..." to #include  in drivers/gpu/.

Signed-off-by: David Howells 
Acked-by: Dave Airlie 
Acked-by: Arnd Bergmann 
Acked-by: Thomas Gleixner 
Acked-by: Paul E. McKenney 
Acked-by: Dave Jones

drm: ditch strange DRIVER_DMA_QUEUE only error bail-out

2012-07-20T02:50:47+00:00

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 
Signed-off-by: Dave Airlie

drm: Don't initialize local ret variable when not needed

2012-05-22T09:32:58+00:00

Signed-off-by: Laurent Pinchart 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm: add missing exports for i810 driver.

2011-12-22T19:09:01+00:00

Brown paper bag of danvet.

Acked-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm: readd drm_lock_free in drm_unlock

2010-09-26T03:35:49+00:00

I've accidently killed a little bit too much in

commit 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f
Author: Daniel Vetter 
Date:   Mon Aug 23 22:53:24 2010 +0200

    drm: kill kernel_context_switch callbacks

Note to self: Next time also test with AIGLX disabled.

Reported-and-Tested-by: Andy Furniss 
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30374
Signed-off-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm: don't export dri1 locking functions

2010-08-29T23:39:00+00:00

Only used by ioctl, not by any in-tree drivers.

Signed-off-by: Daniel Vetter 
Signed-off-by: Dave Airlie