diff options
| author | Linus Torvalds | 2020-12-14 16:17:38 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-12-14 16:17:38 -0800 |
| commit | 2c075f38a708c578a752b738a45e8c26923eac2e (patch) | |
| tree | 353f0cb9772f703dbe3d1ade83a16264662e3a11 /sound/sh | |
| parent | 84292fffc2468125632a21c09533a89426ea212e (diff) | |
| parent | 68b111bf74a0d69a905d6be4b91277d79f9bcafb (diff) | |
Merge branch 'radeon-fixes' (Radeon and amdgpu fixes)
Merge radeon and amdgpu fixes for boot problems.
The drm merge ended up causing my AMD workstation to not boot. When
reporting this, Alex Deucher correctly blamed commit 28a68f828266
("drm/radeon/ttm: use multihop") and pointed to these two fixes that
were already in the drm-misc tree:
95e3d610d35c ("drm/radeon: fix check order in radeon_bo_move")
aefec40938e4 ("drm/amdgpu: fix check order in amdgpu_bo_move")
Since I hate doing merges with a known-bad base, I've cherry-picked
these fixes into a branch of their own, just to be able to continue my
merge window. The original commits will eventually come in as
duplicates through the normal channels, but in the meantime we have a
tree that isn't broken with basically every AMD GPU out there.
Acked-by: Alex Deucher <alexdeucher@gmail.com>
* cherry-picked from the drm-misc tree:
drm/radeon: fix check order in radeon_bo_move
drm/amdgpu: fix check order in amdgpu_bo_move
Diffstat (limited to 'sound/sh')
0 files changed, 0 insertions, 0 deletions