[PULL] topic/drm-fixes for 4.2