Ville Syrjälä 3a656b54c8 drm/i915: Fix struct_mutex deadlock due to merge fumble ...

commit a8c6ecb3be
Merge: 8dd0eb35 9eccca0
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Mar 9 19:58:30 2015 +1000

    Merge tag 'v4.0-rc3' into drm-next

managed to pick the wrong code to resolve the conflict and left us with
a mutex_lock(struct_mutex) without the mutex_unlock(struct_mutex) leading
to a deadlock. Fix the problem by recovering the correct code which doesn't
need the lock.

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2015-03-10 08:39:05 +10:00

..

amd

drm/amdkfd: don't set get_pipes_num() as inline

2015-02-23 10:48:02 +02:00

armada

Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-01-09 09:13:41 +10:00

ast

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

atmel-hlcdc

Merge tag 'v4.0-rc3' into drm-next

2015-03-09 19:58:30 +10:00

bochs

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

bridge

drm/bridge: dw-hdmi: Adapt to bridge API change

2015-01-28 10:01:30 +01:00

cirrus

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-02-16 15:48:00 -08:00

exynos

Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

2015-02-13 13:02:49 +10:00

gma500

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

i2c

Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next

2015-03-05 09:37:19 +10:00

i810

…

i915

drm/i915: Fix struct_mutex deadlock due to merge fumble

2015-03-10 08:39:05 +10:00

imx

DRM: i.MX: parallel display: Support probe deferral for finding DRM panel

2015-02-23 17:19:25 +01:00

mga

…

mgag200

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

msm

Merge tag 'v4.0-rc3' into drm-next

2015-03-09 19:58:30 +10:00

nouveau

drm/ttm: device address space != CPU address space

2015-03-05 09:04:39 +10:00

omapdrm

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

panel

drm: panel/simple: add backlight dependency

2015-01-31 10:11:45 +10:00

qxl

drm/fb-helper: Propagate errors from initial config failure

2015-01-21 14:57:03 +01:00

r128

…

radeon

drm/radeon: fix interlaced modes on DCE8

2015-03-03 17:28:31 -05:00

rcar-du

drm: rcar-du: Fix race condition in hardware plane allocator

2015-03-03 16:16:30 +02:00

rockchip

Revert "drm/rockchip: Flip select/depends in Kconfig"

2015-03-03 21:11:34 +10:00

savage

…

shmobile

drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS

2015-02-03 11:12:37 +10:00

sis

…

sti

drm: sti: HDMI add audio infoframe

2015-02-05 16:21:19 +01:00

tdfx

…

tegra

Merge tag 'v4.0-rc3' into drm-next

2015-03-09 19:58:30 +10:00

tilcdc

drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS

2015-02-03 11:12:37 +10:00

ttm

drm/ttm: device address space != CPU address space

2015-03-05 09:04:39 +10:00

udl

drm/udl: properly set active_16 flag in udl_crtc_page_flip(). (v2)

2015-01-31 10:12:23 +10:00

via

…

vmwgfx

drm/vmwgfx: Replace the hw mutex with a hw spinlock

2015-01-19 03:02:13 -08:00

ati_pcigart.c

…

drm_agpsupport.c

…

drm_atomic_helper.c

drm: Pass in new and old plane state to prepare_fb and cleanup_fb

2015-03-05 09:49:02 +10:00

drm_atomic.c

drm: Add DRM_DEBUG_ATOMIC

2015-02-23 11:19:49 +01:00

drm_auth.c

…

drm_bridge.c

drm/bridge: make bridge registration independent of drm flow

2015-01-28 08:45:40 +01:00

drm_bufs.c

…

drm_cache.c

…

drm_context.c

…

drm_crtc_helper.c

drm: add support for tiled/compressed/etc modifier in addfb2

2015-02-13 23:28:12 +01:00

drm_crtc_internal.h

drm/atomic: Hide drm.ko internal interfaces

2015-01-05 13:55:30 +01:00

drm_crtc.c

Merge tag 'v4.0-rc3' into drm-next

2015-03-09 19:58:30 +10:00

drm_debugfs.c

…

drm_dma.c

…

drm_dp_helper.c

drm/dp: add drm_dp_link_power_down() helper

2015-02-01 15:06:42 -05:00

drm_dp_mst_topology.c

…

drm_drv.c

drm: add atomic properties

2015-01-05 13:54:38 +01:00

drm_edid_load.c

…

drm_edid.c

…

drm_encoder_slave.c

…

drm_fb_cma_helper.c

…

drm_fb_helper.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-02-16 15:48:00 -08:00

drm_flip_work.c

…

drm_fops.c

drm: Make drm_read() more robust against multithreaded races

2015-01-21 14:57:03 +01:00

drm_gem_cma_helper.c

…

drm_gem.c

…

drm_global.c

…

drm_hashtab.c

…

drm_info.c

…

drm_internal.h

…

drm_ioc32.c

…

drm_ioctl.c

drm: add support for tiled/compressed/etc modifier in addfb2

2015-02-13 23:28:12 +01:00

drm_irq.c

Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-03-09 19:41:15 +10:00

drm_legacy.h

…

drm_lock.c

…

drm_memory.c

…

drm_mipi_dsi.c

drm/mipi-dsi: Avoid potential NULL pointer dereference

2015-01-28 08:45:37 +01:00

drm_mm.c

drm/mm: Support 4 GiB and larger ranges

2015-03-05 09:01:37 +10:00

drm_modes.c

drm/modes: Print the mode status in human readable form

2015-02-03 09:09:22 +01:00

drm_modeset_lock.c

…

drm_of.c

…

drm_panel.c

…

drm_pci.c

…

drm_plane_helper.c

drm: Pass in new and old plane state to prepare_fb and cleanup_fb

2015-03-05 09:49:02 +10:00

drm_platform.c

…

drm_prime.c

…

drm_probe_helper.c

drm/probe-helper: clamp unknown connector status in the poll work

2015-01-22 06:11:39 +01:00

drm_rect.c

…

drm_scatter.c

…

drm_sysfs.c

drm: Use static attribute groups for managing connector sysfs entries

2015-02-04 15:02:00 +01:00

drm_trace_points.c

…

drm_trace.h

…

drm_vm.c

…

drm_vma_manager.c

mm: remove rest usage of VM_NONLINEAR and pte_file()

2015-02-10 14:30:31 -08:00

Kconfig

drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS

2015-02-03 11:12:37 +10:00

Makefile

drm/bridge: make bridge registration independent of drm flow

2015-01-28 08:45:40 +01:00