diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:02:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:02:26 +0200 |
| commit | 10c8d1bd786508e996837d5d4b125c69315c5529 (patch) | |
| tree | f6c9556a1952ae1f8c32a912fa71e388bdfd89c8 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | 4a017c0163833fa3b0ebd2419973d30e9bd67e1e (diff) | |
| parent | 47ac09b91befbb6a235ab620c32af719f8208399 (diff) | |
| download | linux-10c8d1bd786508e996837d5d4b125c69315c5529.tar.gz linux-10c8d1bd786508e996837d5d4b125c69315c5529.tar.bz2 linux-10c8d1bd786508e996837d5d4b125c69315c5529.zip | |
Merge 6.11-rc4 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 9aa952f258cf..6dfdff58bffd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1057,6 +1057,9 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p, r = amdgpu_ring_parse_cs(ring, p, job, ib); if (r) return r; + + if (ib->sa_bo) + ib->gpu_addr = amdgpu_sa_bo_gpu_addr(ib->sa_bo); } else { ib->ptr = (uint32_t *)kptr; r = amdgpu_ring_patch_cs_in_place(ring, p, job, ib); |