Does cherry-picking this patch over help? https://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-fixes&id=a951ed85abd4615e98e36b536e3b3b07b22a88ac