diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2023-10-23 11:32:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-23 11:32:25 +0200 |
| commit | 4e5b65a22ba0cabe58f895cd797cb10a763d6994 (patch) | |
| tree | 067033eb0d1d284b6ca89c2bfa4034906ff59ad9 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | |
| parent | sched/fair: Remove unused 'curr' argument from pick_next_entity() (diff) | |
| parent | Linux 6.6-rc7 (diff) | |
| download | wireguard-linux-4e5b65a22ba0cabe58f895cd797cb10a763d6994.tar.xz wireguard-linux-4e5b65a22ba0cabe58f895cd797cb10a763d6994.zip | |
Merge tag 'v6.6-rc7' into sched/core, to pick up fixes
Pick up recent sched/urgent fixes merged upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index f3ee83cdf97e..d28e21baef16 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -252,7 +252,7 @@ static inline bool amdgpu_bo_in_cpu_visible_vram(struct amdgpu_bo *bo) struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); struct amdgpu_res_cursor cursor; - if (bo->tbo.resource->mem_type != TTM_PL_VRAM) + if (!bo->tbo.resource || bo->tbo.resource->mem_type != TTM_PL_VRAM) return false; amdgpu_res_first(bo->tbo.resource, 0, amdgpu_bo_size(bo), &cursor); |