Merge "drm: fix error atom plumbing"