Daniel Vetter 4d02e2de0e drm: Per-plane locking ... Turned out to be much simpler on top of my latest atomic stuff than what I've feared. Some details: - Drop the modeset_lock_all snakeoil in drm_plane_init. Same justification as for the equivalent change in drm_crtc_init done in commit d0fa1af40e Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Mon Sep 8 09:02:49 2014 +0200 drm: Drop modeset locking from crtc init function Without these the drm_modeset_lock_init would fall over the exact same way. - Since the atomic core code wraps the locking switching it to per-plane locks was a one-line change. - For the legacy ioctls add a plane argument to the locking helper so that we can grab the right plane lock (cursor or primary). Since the universal cursor plane might not be there, or someone really crazy might forgoe the primary plane even accept NULL. - Add some locking WARN_ON to the atomic helpers for good paranoid measure and to check that it all works out. Tested on my exynos atomic hackfest with full lockdep checks and ww backoff injection. v2: I've forgotten about the load-detect code in i915. v3: Thierry reported that in latest 3.18-rc vmwgfx doesn't compile any more due to commit 21e88620aa Author: Rob Clark <robdclark@gmail.com> Date: Thu Oct 30 13:39:04 2014 -0400 drm/vmwgfx: fix lock breakage Rebased and fix this up. Cc: Thierry Reding <thierry.reding@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Dave Airlie <airlied@redhat.com>		2014-11-12 17:56:12 +10:00
..
acpi	ACPI and power management updates for 3.18-rc2	2014-10-24 11:29:31 -07:00
asm-generic	Merge git://git.infradead.org/users/eparis/audit	2014-10-19 16:25:56 -07:00
clocksource
crypto	crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code	2014-10-14 10:51:22 +02:00
drm	drm: Per-plane locking	2014-11-12 17:56:12 +10:00
dt-bindings	ARM: imx: clk-vf610: define PLL's clock tree	2014-11-04 13:40:14 +08:00
keys
kvm	arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs	2014-10-16 10:57:41 +02:00
linux	Merge branch 'devicetree/merge' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux	2014-11-09 14:33:49 -08:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2014-10-09 14:00:54 -03:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2014-10-31 12:29:42 -04:00
pcmcia
ras
rdma	IB/mlx5, iser, isert: Add Signature API additions	2014-10-09 00:10:53 -07:00
rxrpc
scsi	scsi: set REQ_QUEUE for the blk-mq case	2014-10-28 09:53:43 +01:00
soc/tegra
sound	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
target
trace	Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent	2014-10-30 07:37:37 +01:00
uapi	Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-31 14:05:35 -07:00
video	fbdev changes for 3.18	2014-10-18 18:03:02 -07:00
xen
Kbuild