Merge branch 'drm-platform' into drm-testing