drm: fix two issues with fb consolidation.