drm: Changes to 'wip/fix-wrap'

[<db...@ke...>]

New branch 'wip/fix-wrap' available with the following commits: