From patchwork Fri Jun 7 12:50:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10981631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 13571924 for ; Fri, 7 Jun 2019 12:50:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03026286BC for ; Fri, 7 Jun 2019 12:50:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB33228932; Fri, 7 Jun 2019 12:50:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9BD4C286BC for ; Fri, 7 Jun 2019 12:50:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DEF989D5E; Fri, 7 Jun 2019 12:50:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4E8689CDB; Fri, 7 Jun 2019 12:50:43 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id s3so1955717wms.2; Fri, 07 Jun 2019 05:50:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IzBPvhGZcJmx5dEGrlRuvBNu9tCjfK/2yEOzhyQmbNE=; b=UScp47VNQkT8ZmitpLHpXyK2HrFxbi5LZ8WPV9nOHkO7UjmdCTDlJtUl4WnjJiyZK+ xASXrHe3xof2+As0DXql8lL1zouO8emqSx/bbZ1G0fEoTXurBEXDaJTemKiL1oB3GomX VKYwJKeyuXnPF0VjGPDgQ3qypS0bS93DWANRrCq3D3afNeZI4jtF4V/9t0DCUHWCxRxF O31kceVOSOfR+FZyZscC91YSBoLMmpbbgv7FEfo1Mrc0k6L/ZthpRcvIoQL6L+KpcnaV dg+O1R+QxIlx5JvcvA03678YHNR5MBpNffc7ic47t+U0g/GEfb88o8S4KTK/D95P9W6d sVEQ== X-Gm-Message-State: APjAAAUKY+m54i5w8z/lIDffk5SXdKuVeN/EWKCQtlyZZ+K6u4p/+c73 nKLtVBa4o5EKEs68WVTSV7WfYGek X-Google-Smtp-Source: APXvYqxzLOEiUlb1gVQZBu2MzXTRoVfq8pbJ/R6XDVyrOTun9IZHQl/Nge/GF5P01vWsy1gNzImf0A== X-Received: by 2002:a7b:c317:: with SMTP id k23mr3522702wmj.124.1559911842445; Fri, 07 Jun 2019 05:50:42 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:c5a0:21d3:d7e7:98b7]) by smtp.gmail.com with ESMTPSA id 32sm3923249wra.35.2019.06.07.05.50.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 05:50:42 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch Date: Fri, 7 Jun 2019 14:50:36 +0200 Message-Id: <20190607125039.2240-3-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190607125039.2240-1-christian.koenig@amd.com> References: <20190607125039.2240-1-christian.koenig@amd.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IzBPvhGZcJmx5dEGrlRuvBNu9tCjfK/2yEOzhyQmbNE=; b=OMo3V1pIoI5lJu0XGH+0IrlWH4/tzPOq8C7qdMs4MNQTrdxki7Vgn/wjMB4Td4w/Nd 0mfFvwgEe/vZ93dePpSwg9skHK0iOmnQoHNczF1GiL7mwVZuD8+zgcWbUfKjZNwsPI4h CVbdcGCU32GSD/MWAngd0TgonqS1wDw+lG2/OEJB1YFKOzvcNepGDNRhC2nvnzUoN9yx JZa242FhIzTuzNMgW5WeSRs1hXHyRgaez1TL7dxvqb6oLW9P4F/GzpWDgEnicXCciqxJ WUXpwX3ogOj6Ot7yhDP0Xe4RRHP9aH5AzHLoZf1HiTbGsL7HcG3km+98NvtVdHRXQq75 MIAA== Subject: [Intel-gfx] [PATCH 3/6] drm/ttm: use the parent resv for ghost objects v2 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This way we can even pipeline imported BO evictions. v2: Limit this to only cases when the parent object uses a separate reservation object as well. This fixes another OOM problem. Signed-off-by: Christian König --- drivers/gpu/drm/ttm/ttm_bo_util.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 895d77d799e4..95f47d685921 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -517,9 +517,11 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, kref_init(&fbo->base.kref); fbo->base.destroy = &ttm_transfered_destroy; fbo->base.acc_size = 0; - fbo->base.resv = &fbo->base.ttm_resv; - reservation_object_init(fbo->base.resv); - ret = reservation_object_trylock(fbo->base.resv); + if (bo->resv == &bo->ttm_resv) + fbo->base.resv = &fbo->base.ttm_resv; + + reservation_object_init(&fbo->base.ttm_resv); + ret = reservation_object_trylock(&fbo->base.ttm_resv); WARN_ON(!ret); *new_obj = &fbo->base; @@ -716,7 +718,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, if (ret) return ret; - reservation_object_add_excl_fence(ghost_obj->resv, fence); + reservation_object_add_excl_fence(&ghost_obj->ttm_resv, fence); /** * If we're not moving to fixed memory, the TTM object @@ -729,7 +731,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, else bo->ttm = NULL; - ttm_bo_unreserve(ghost_obj); + reservation_object_unlock(&ghost_obj->ttm_resv); ttm_bo_put(ghost_obj); } @@ -772,7 +774,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, if (ret) return ret; - reservation_object_add_excl_fence(ghost_obj->resv, fence); + reservation_object_add_excl_fence(&ghost_obj->ttm_resv, fence); /** * If we're not moving to fixed memory, the TTM object @@ -785,7 +787,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, else bo->ttm = NULL; - ttm_bo_unreserve(ghost_obj); + reservation_object_unlock(&ghost_obj->ttm_resv); ttm_bo_put(ghost_obj); } else if (from->flags & TTM_MEMTYPE_FLAG_FIXED) { @@ -841,7 +843,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) if (ret) return ret; - ret = reservation_object_copy_fences(ghost->resv, bo->resv); + ret = reservation_object_copy_fences(&ghost->ttm_resv, bo->resv); /* Last resort, wait for the BO to be idle when we are OOM */ if (ret) ttm_bo_wait(bo, false, false); @@ -850,7 +852,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) bo->mem.mem_type = TTM_PL_SYSTEM; bo->ttm = NULL; - ttm_bo_unreserve(ghost); + reservation_object_unlock(&ghost->ttm_resv); ttm_bo_put(ghost); return 0;