Backmerge drm-next and fix up conflicts due to drmP.h removal.
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>