diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-12-31 11:40:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-12-31 11:40:29 +1000 |
| commit | ce9b333c73a5a8707f2f446a837a6ca743ddcffd (patch) | |
| tree | 34658a5bc4ee0f676149a031d9b7e083650c97b7 /drivers/gpu/drm/amd | |
| parent | aeeb82fd6147b65689f0f1e5aaa389d34212a3c7 (diff) | |
| parent | 67f74302f45d5d862f22ced3297624e50ac352f0 (diff) | |
Merge branch 'drm-misc-fixes' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes
This merges two fixes that haven't been sent to me yet, but I wanted to get in.
One amdgpu fix, but one nouveau regression fixer.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c index ae6ab93c868b..7444484a12bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c @@ -384,7 +384,7 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) struct amdgpu_vm_bo_base *bo_base; int r; - if (bo->tbo.resource->mem_type == TTM_PL_SYSTEM) + if (!bo->tbo.resource || bo->tbo.resource->mem_type == TTM_PL_SYSTEM) return; r = ttm_bo_validate(&bo->tbo, &placement, &ctx); |