diff options
| author | Ma Jun <Jun.Ma2@amd.com> | 2024-05-11 16:08:06 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2024-05-17 17:09:47 -0400 |
| commit | d1a6bfff94010ecdda469bd9d6580982491aedca (patch) | |
| tree | 7f9c4a914d25cad304c4ee6d8a803d56e55706e7 /drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | |
| parent | ff422eb7a91ae2ce313e207015c10284eca8e107 (diff) | |
| download | linux-d1a6bfff94010ecdda469bd9d6580982491aedca.tar.gz linux-d1a6bfff94010ecdda469bd9d6580982491aedca.tar.bz2 linux-d1a6bfff94010ecdda469bd9d6580982491aedca.zip | |
drm/amdgpu: Fix null pointer dereference to bo
Check bo before using it
Signed-off-by: Ma Jun <Jun.Ma2@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c index 7d99fcc58baf..34e751b9b700 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c @@ -497,9 +497,8 @@ static void gmc_v12_0_get_vm_pte(struct amdgpu_device *adev, uint64_t *flags) { struct amdgpu_bo *bo = mapping->bo_va->base.bo; - struct amdgpu_device *bo_adev = amdgpu_ttm_adev(bo->tbo.bdev); - bool coherent = bo->flags & AMDGPU_GEM_CREATE_COHERENT; - bool is_system = bo->tbo.resource->mem_type == TTM_PL_SYSTEM; + struct amdgpu_device *bo_adev; + bool coherent, is_system; *flags &= ~AMDGPU_PTE_EXECUTABLE; @@ -515,13 +514,20 @@ static void gmc_v12_0_get_vm_pte(struct amdgpu_device *adev, *flags &= ~AMDGPU_PTE_VALID; } - if (bo && bo->flags & (AMDGPU_GEM_CREATE_COHERENT | + if (!bo) + return; + + if (bo->flags & (AMDGPU_GEM_CREATE_COHERENT | AMDGPU_GEM_CREATE_UNCACHED)) *flags = (*flags & ~AMDGPU_PTE_MTYPE_GFX12_MASK) | AMDGPU_PTE_MTYPE_GFX12(MTYPE_UC); + bo_adev = amdgpu_ttm_adev(bo->tbo.bdev); + coherent = bo->flags & AMDGPU_GEM_CREATE_COHERENT; + is_system = bo->tbo.resource->mem_type == TTM_PL_SYSTEM; + /* WA for HW bug */ - if ((bo && is_system) || ((bo_adev != adev) && coherent)) + if (is_system || ((bo_adev != adev) && coherent)) *flags |= AMDGPU_PTE_MTYPE_GFX12(MTYPE_NC); } |