From: Dave Airlie Date: Tue, 1 Mar 2016 02:33:33 +0000 (+1000) Subject: Merge tag 'drm-amdkfd-next-2016-02-27' of git://people.freedesktop.org/~gabbayo/linux... X-Git-Tag: v5.15~13916^2~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d5d6752c720c9dfa27ba7f258a07a6e0a7aa286;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'drm-amdkfd-next-2016-02-27' of git://people.freedesktop.org/~gabbayo/linux into drm-next Here are a few amdkfd patches for 4.6. These patches defer radeon/amdgpu loading in case amdkfd is not yet loaded, by returning -EPROBE_DEFER during their probing stage. * tag 'drm-amdkfd-next-2016-02-27' of git://people.freedesktop.org/~gabbayo/linux: drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded drm/radeon: Return -EPROBE_DEFER when amdkfd not loaded drm/amdkfd: Track when module's init is complete --- 9d5d6752c720c9dfa27ba7f258a07a6e0a7aa286