diff options
author | Roger.He <Hongbo.He@amd.com> | 2017-04-21 01:08:43 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-04-28 17:33:08 -0400 |
commit | 82521316395a37a2ec1d7e396c055f3c7de9d93b (patch) | |
tree | 45fa90db68afefba7d11671ee969e13eea354cc8 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
parent | 4a9ed1009b8b01409bdda899c0ff0d7fd2c6d094 (diff) |
drm/amdgpu: validate shadow before restoring from it
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Roger.He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 60de77b153b7..365883d7948d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |||
@@ -543,6 +543,27 @@ err: | |||
543 | return r; | 543 | return r; |
544 | } | 544 | } |
545 | 545 | ||
546 | int amdgpu_bo_validate(struct amdgpu_bo *bo) | ||
547 | { | ||
548 | uint32_t domain; | ||
549 | int r; | ||
550 | |||
551 | if (bo->pin_count) | ||
552 | return 0; | ||
553 | |||
554 | domain = bo->prefered_domains; | ||
555 | |||
556 | retry: | ||
557 | amdgpu_ttm_placement_from_domain(bo, domain); | ||
558 | r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false); | ||
559 | if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) { | ||
560 | domain = bo->allowed_domains; | ||
561 | goto retry; | ||
562 | } | ||
563 | |||
564 | return r; | ||
565 | } | ||
566 | |||
546 | int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev, | 567 | int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev, |
547 | struct amdgpu_ring *ring, | 568 | struct amdgpu_ring *ring, |
548 | struct amdgpu_bo *bo, | 569 | struct amdgpu_bo *bo, |