| Message ID | 20190507093642.7859-2-david1.zhou@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/ttm: fix busy memory to fail other user v6 | expand |
Am 07.05.19 um 11:36 schrieb Chunming Zhou: > add ticket for display bo, so that it can preempt busy bo. > > Change-Id: I9f031cdcc8267de00e819ae303baa0a52df8ebb9 > Signed-off-by: Chunming Zhou <david1.zhou@amd.com> > --- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index ac22f7351a42..8633d52e3fbe 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -4176,6 +4176,9 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, > struct amdgpu_device *adev; > struct amdgpu_bo *rbo; > struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old; > + struct list_head list, duplicates; > + struct ttm_validate_buffer tv; > + struct ww_acquire_ctx ticket; > uint64_t tiling_flags; > uint32_t domain; > int r; > @@ -4192,9 +4195,18 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, > obj = new_state->fb->obj[0]; > rbo = gem_to_amdgpu_bo(obj); > adev = amdgpu_ttm_adev(rbo->tbo.bdev); > - r = amdgpu_bo_reserve(rbo, false); > - if (unlikely(r != 0)) > + INIT_LIST_HEAD(&list); > + INIT_LIST_HEAD(&duplicates); > + > + tv.bo = &rbo->tbo; > + tv.num_shared = 1; > + list_add(&tv.head, &list); > + > + r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates); duplicates are superfluous and can be NULL in this case. Apart from that the patch is Reviewed-by: Christian König <christian.koenig@amd.com> Regards, Christian. > + if (r) { > + dev_err(adev->dev, "fail to reserve bo (%d)\n", r); > return r; > + } > > if (plane->type != DRM_PLANE_TYPE_CURSOR) > domain = amdgpu_display_supported_domains(adev); > @@ -4205,21 +4217,21 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, > if (unlikely(r != 0)) { > if (r != -ERESTARTSYS) > DRM_ERROR("Failed to pin framebuffer with error %d\n", r); > - amdgpu_bo_unreserve(rbo); > + ttm_eu_backoff_reservation(&ticket, &list); > return r; > } > > r = amdgpu_ttm_alloc_gart(&rbo->tbo); > if (unlikely(r != 0)) { > amdgpu_bo_unpin(rbo); > - amdgpu_bo_unreserve(rbo); > + ttm_eu_backoff_reservation(&ticket, &list); > DRM_ERROR("%p bind failed\n", rbo); > return r; > } > > amdgpu_bo_get_tiling_flags(rbo, &tiling_flags); > > - amdgpu_bo_unreserve(rbo); > + ttm_eu_backoff_reservation(&ticket, &list); > > afb->address = amdgpu_bo_gpu_offset(rbo); >
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index ac22f7351a42..8633d52e3fbe 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4176,6 +4176,9 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, struct amdgpu_device *adev; struct amdgpu_bo *rbo; struct dm_plane_state *dm_plane_state_new, *dm_plane_state_old; + struct list_head list, duplicates; + struct ttm_validate_buffer tv; + struct ww_acquire_ctx ticket; uint64_t tiling_flags; uint32_t domain; int r; @@ -4192,9 +4195,18 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, obj = new_state->fb->obj[0]; rbo = gem_to_amdgpu_bo(obj); adev = amdgpu_ttm_adev(rbo->tbo.bdev); - r = amdgpu_bo_reserve(rbo, false); - if (unlikely(r != 0)) + INIT_LIST_HEAD(&list); + INIT_LIST_HEAD(&duplicates); + + tv.bo = &rbo->tbo; + tv.num_shared = 1; + list_add(&tv.head, &list); + + r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates); + if (r) { + dev_err(adev->dev, "fail to reserve bo (%d)\n", r); return r; + } if (plane->type != DRM_PLANE_TYPE_CURSOR) domain = amdgpu_display_supported_domains(adev); @@ -4205,21 +4217,21 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, if (unlikely(r != 0)) { if (r != -ERESTARTSYS) DRM_ERROR("Failed to pin framebuffer with error %d\n", r); - amdgpu_bo_unreserve(rbo); + ttm_eu_backoff_reservation(&ticket, &list); return r; } r = amdgpu_ttm_alloc_gart(&rbo->tbo); if (unlikely(r != 0)) { amdgpu_bo_unpin(rbo); - amdgpu_bo_unreserve(rbo); + ttm_eu_backoff_reservation(&ticket, &list); DRM_ERROR("%p bind failed\n", rbo); return r; } amdgpu_bo_get_tiling_flags(rbo, &tiling_flags); - amdgpu_bo_unreserve(rbo); + ttm_eu_backoff_reservation(&ticket, &list); afb->address = amdgpu_bo_gpu_offset(rbo);
add ticket for display bo, so that it can preempt busy bo. Change-Id: I9f031cdcc8267de00e819ae303baa0a52df8ebb9 Signed-off-by: Chunming Zhou <david1.zhou@amd.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)