Skip to contentSkip to conversation

drm/amdgpu: validate bo before restoring from shadow

PATCH NAK Roger.He 2 participants 2 messages Apr 21, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Roger.He

author
#0 lore raw

PATCH 2/3 drm/amdgpu: validate bo before restoring from shadow

Change-Id Id925f4e241c4192127880d2017fbf2979aa09fc7
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +46 -0
index 3d8f227..f882496 100644
@@ -2468,6 +2468,40 @@ bool amdgpu_need_backup(struct amdgpu_device *adev)
 	return amdgpu_lockup_timeout > 0 ? true : false;
 }
 
+static int amdgpu_bo_validate_helper(struct amdgpu_bo *bo)
+{
+	uint32_t domain;
+	int r;
+
+	if (bo->pin_count)
+		return 0;
+
+	domain = bo->prefered_domains;
+
+retry:
+	amdgpu_ttm_placement_from_domain(bo, domain);
+	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
+	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {
+		domain = bo->allowed_domains;
+		goto retry;
+	}
+
+	return r;
+}
+
+static int amdgpu_bo_validate(struct amdgpu_bo *bo)
+{
+	int r = amdgpu_bo_validate_helper(bo);
+
+	if (r)
+		return r;
+
+	if (bo->shadow)
+		r = amdgpu_bo_validate_helper(bo->shadow);
+
+	return r;
+}
+
 static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
 					   struct amdgpu_ring *ring,
 					   struct amdgpu_bo *bo,
@@ -2485,6 +2519,18 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
 	domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
 	/* if bo has been evicted, then no need to recover */
 	if (domain == AMDGPU_GEM_DOMAIN_VRAM) {
+		r = amdgpu_bo_validate(bo);
+		if (r) {
+			DRM_ERROR("bo validate failed!\n");
+			goto err;
+		}
+
+		r = amdgpu_ttm_bind(&bo->shadow->tbo, &bo->shadow->tbo.mem);
+		if (r) {
+			DRM_ERROR("%p bind failed\n", bo->shadow);
+			goto err;
+		}
+
 		r = amdgpu_bo_restore_from_shadow(adev, ring, bo,
 						 NULL, fence, true);
 		if (r) {
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1492758472-12585-1-git-send-email-Hongbo.He-5C7GfCeVMHo@public.gmane.org

#2 lore raw
Quoted 52 lines · Roger.He
Change-Id Id925f4e241c4192127880d2017fbf2979aa09fc7
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 46 ++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +34 -0
index 3d8f227..f882496 100644
@@ -2468,6 +2468,40 @@ bool amdgpu_need_backup(struct amdgpu_device *adev)
  	return amdgpu_lockup_timeout > 0 ? true : false;
  }
 
+static int amdgpu_bo_validate_helper(struct amdgpu_bo *bo)
+{
+	uint32_t domain;
+	int r;
+
+	if (bo->pin_count)
+		return 0;
+
+	domain = bo->prefered_domains;
+
+retry:
+	amdgpu_ttm_placement_from_domain(bo, domain);
+	r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
+	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {
+		domain = bo->allowed_domains;
+		goto retry;
+	}
+
+	return r;
+}
+
+static int amdgpu_bo_validate(struct amdgpu_bo *bo)
+{
+	int r = amdgpu_bo_validate_helper(bo);
+
+	if (r)
+		return r;
+
+	if (bo->shadow)
+		r = amdgpu_bo_validate_helper(bo->shadow);
+
+	return r;
+}
+
  static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
  					   struct amdgpu_ring *ring,
  					   struct amdgpu_bo *bo,

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev, · line 2522

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -2485,6 +2519,18 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
  	domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
  	/* if bo has been evicted, then no need to recover */
  	if (domain == AMDGPU_GEM_DOMAIN_VRAM) {
+		r = amdgpu_bo_validate(bo);

you only need to validate shadow, parent already is checked.

Regards,
David Zhou

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -0
+		if (r) {
+			DRM_ERROR("bo validate failed!\n");
+			goto err;
+		}

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev, · line 2536

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
+
+		r = amdgpu_ttm_bind(&bo->shadow->tbo, &bo->shadow->tbo.mem);
+		if (r) {
+			DRM_ERROR("%p bind failed\n", bo->shadow);
+			goto err;
+		}
+
  		r = amdgpu_bo_restore_from_shadow(adev, ring, bo,
  						 NULL, fence, true);
  		if (r) {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx