Can you try drm-next? A patch fixing bug #60680 should be there (http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-next&id=f87cd8b695d372087685976460fac1ec6ba2fca9) and may resolve your issues as well.