Hi Xinhui,
you also need to CC dri-devel for TTM patches, but apart from that it is a really good catch.
Am 19.02.21 um 05:25 schrieb xinhui pan:
Free the memory on failure. Also no need to re-alloc memory on retry.
Signed-off-by: xinhui pan xinhui.pan@amd.com
Reviewed-by: Christian König christian.koenig@amd.com CC: stable@vger.kernel.org # 5.11
Going to push that to drm-misc-fixes in a Minute since that is a really important one.
Thanks, Christian.
drivers/gpu/drm/ttm/ttm_bo.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index e38102282fd5..a97d41f4ce3c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -906,8 +906,10 @@ static int ttm_bo_bounce_temp_buffer(struct ttm_buffer_object *bo, return ret; /* move to the bounce domain */ ret = ttm_bo_handle_move_mem(bo, &hop_mem, false, ctx, NULL);
- if (ret)
- if (ret) {
ttm_resource_free(bo, &hop_mem);- } return 0; }
@@ -938,18 +940,19 @@ static int ttm_bo_move_buffer(struct ttm_buffer_object *bo, * stop and the driver will be called to make * the second hop. */ -bounce: ret = ttm_bo_mem_space(bo, placement, &mem, ctx); if (ret) return ret; +bounce: ret = ttm_bo_handle_move_mem(bo, &mem, false, ctx, &hop); if (ret == -EMULTIHOP) { ret = ttm_bo_bounce_temp_buffer(bo, &mem, ctx, &hop); if (ret)
return ret;
goto out;+out: if (ret) ttm_resource_free(bo, &mem); return ret;