On Mon, Mar 25, 2013 at 5:56 PM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote: > Thanks to apple gpu mux fail we detect an eDP output, but can't read > anything over dp aux. In the resulting failure path we then hit a > paranoid WARN about potential locking. > > Since the WARN is pretty useful for normal operation just paper over > it in the failure case by grabbing the demanded (but for init/teardown > not really required) lock. > > I've checked our driver unload code and we already don't hold the kms > lock when calling drm_mode_config_cleanup. So this won't lead to a new > deadlock when reloading i915.ko. > > v2: Make it compile. > > Reported-by: Dave Airlie <airlied at gmail.com> > Cc: Dave Airlie <airlied at gmail.com> > Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch> Now also quickly tested on my edp to check whether I really didn't break module reload. Seems to still work. Dave, since I don't have anything else pending for fixes, can you please merge this for drm-fixes directly if it works for you? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
