diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-02-04 13:18:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-04 13:18:55 +1000 |
| commit | 7eb3848cc8c17a822f4cced5da0aa437e0063097 (patch) | |
| tree | e98c7976b768348747379d10153ba35c85e1e698 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
| parent | 26291c54e111ff6ba87a164d85d4a4e134b7315c (diff) | |
| parent | e8ae38720e1a685fd98cfa5ae118c9d07b45ca79 (diff) | |
| download | linux-7eb3848cc8c17a822f4cced5da0aa437e0063097.tar.gz linux-7eb3848cc8c17a822f4cced5da0aa437e0063097.tar.bz2 linux-7eb3848cc8c17a822f4cced5da0aa437e0063097.zip | |
Merge tag 'amd-drm-fixes-5.17-2022-02-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.17-2022-02-02:
amdgpu:
- mGPU fan boost fix for beige goby
- S0ix fixes
- Cyan skillfish hang fix
- DCN fixes for DCN 3.1
- DCN fixes for DCN 3.01
- Apple retina panel fix
- ttm logic inversion fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220203035224.5801-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 5c3f24069f2a..4655702a5e00 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1904,7 +1904,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, unsigned i; int r; - if (direct_submit && !ring->sched.ready) { + if (!direct_submit && !ring->sched.ready) { DRM_ERROR("Trying to move memory with ring turned off.\n"); return -EINVAL; } |