diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-01 12:33:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-01 12:33:33 +1000 |
| commit | 9d5d6752c720c9dfa27ba7f258a07a6e0a7aa286 (patch) | |
| tree | 7df0ba8c47f1ec68a0a5c609b3adc16d7e5763ff /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | 44ab4042178bd596275927ea050980aa4257581b (diff) | |
| parent | efb1c6582e5cd291a6b9e6dde55fd31ce6f606a1 (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
0 files changed, 0 insertions, 0 deletions