drm: Fix deadlock due to getconnector locking changes
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 22 Feb 2015 10:38:36 +0000 (11:38 +0100)
committerDave Airlie <airlied@redhat.com>
Tue, 24 Feb 2015 01:05:20 +0000 (11:05 +1000)
commit2caa80e72b57c6216aec6f6a11fcfb4fec46daa0
treef794336439343e60ef1879223840174fe1706c77
parentc517d838eb7d07bbe9507871fab3931deccff539
drm: Fix deadlock due to getconnector locking changes

In commit ccfc08655d5fd5076828f45fb09194c070f2f63a
Author: Rob Clark <robdclark@gmail.com>
Date:   Thu Dec 18 16:01:48 2014 -0500

    drm: tweak getconnector locking

We need to extend the locking to cover connector->state reading for
atomic drivers, but the above commit was a bit too eager and also
included the fill_modes callback. Which on i915 on old platforms using
load detection needs to acquire modeset locks, resulting in a deadlock
on output probing.

Reported-by: Marc Finet <m.dreadlock@gmail.com>
Cc: Marc Finet <m.dreadlock@gmail.com>
Cc: robdclark@gmail.com
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_crtc.c