diff options
| author |   Tony Lindgren <tony@atomide.com> | 2022-09-06 09:45:27 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2022-09-06 09:45:27 +0300 |
| commit | 2a906db2824b75444982f5e9df870106982afca8 (patch) | |
| tree | 8cda7a970356f63f2a9d3246ca69ef16220041d3 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | ARM: dts: am33xx: Fix MMCHS0 dma properties (diff) | |
| parent | ARM: dts: am5748: keep usb4_tm disabled (diff) | |
| download | wireguard-linux-2a906db2824b75444982f5e9df870106982afca8.tar.xz wireguard-linux-2a906db2824b75444982f5e9df870106982afca8.zip | |
Merge branch 'am5748-fix' into fixes
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 2c82b1d5a0d7..4570ad449390 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -882,6 +882,10 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, if (WARN_ON_ONCE(min_offset > max_offset)) return -EINVAL; + /* Check domain to be pinned to against preferred domains */ + if (bo->preferred_domains & domain) + domain = bo->preferred_domains & domain; + /* A shared bo cannot be migrated to VRAM */ if (bo->tbo.base.import_attach) { if (domain & AMDGPU_GEM_DOMAIN_GTT) |