]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Fix struct_mutex deadlock due to merge fumble
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 9 Mar 2015 19:08:37 +0000 (21:08 +0200)
committerDave Airlie <airlied@redhat.com>
Mon, 9 Mar 2015 22:39:05 +0000 (08:39 +1000)
commit33136035f643daf5e7fab26d95ff13d6b086d0f5
treefe7f09ee5d8f5455b81124aadcfac41df7f64030
parent08e19ba8c1d8f6c67b234b10dbc50925529272b6
drm/i915: Fix struct_mutex deadlock due to merge fumble

commit 08e19ba8c1d8f6c67b234b10dbc50925529272b6
Merge: f2887ee4 048509a
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>
drivers/gpu/drm/i915/intel_display.c