tree fe7f09ee5d8f5455b81124aadcfac41df7f64030
parent a8c6ecb3be7029881f7c95e5e201a629094a4e1a
author Ville Syrjälä <ville.syrjala@linux.intel.com> 1425928117 +0200
committer Dave Airlie <airlied@redhat.com> 1425940745 +1000

drm/i915: Fix struct_mutex deadlock due to merge fumble

commit a8c6ecb3be7029881f7c95e5e201a629094a4e1a
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>