From patchwork Tue Oct 24 13:22:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 10024545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE3A060375 for ; Tue, 24 Oct 2017 13:23:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDA1028687 for ; Tue, 24 Oct 2017 13:23:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C285F289C9; Tue, 24 Oct 2017 13:23:38 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 7865C28687 for ; Tue, 24 Oct 2017 13:23:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D4ED6E50D; Tue, 24 Oct 2017 13:23:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22EDC6E4EA; Tue, 24 Oct 2017 13:23:30 +0000 (UTC) Received: by mail-qk0-x242.google.com with SMTP id l194so26161141qke.13; Tue, 24 Oct 2017 06:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=51hT4qczwguRCRps6ZUtyljo6iNYxnEAA63Nidp7BzE=; b=qhjlcfrlBg6npan2lLfSf1SA5Mcr0j/j7FWEfgeEmzBO3ERu9eMOcV17FNH5rRzl+E ETwMzKZCmQ3wLsSda/pxm9oUk/HLSC3PP5UtU3wCrsZwJhXy7qRBZre8DhXvVFOzrGmM XDSsAtJOnlFgJ/AK+UEI2GmdKdPg5d5nFh5fGoTl5HszS65qTMDWdeGTIEwiYe8AUcId uTNuOKkRhqDpix1aHZWnDIcewun6Bh0aM+pvfNG/cxhiVylEV5mUb5JdK2bYOpfBGyaH WjDyf2zTNnzaMYG6UO2IvkzcjsSncFtp5vGKuAe+AWCsRfWOWySuYoCojufW0wOCpIvp axuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=51hT4qczwguRCRps6ZUtyljo6iNYxnEAA63Nidp7BzE=; b=HrvfxoRlHSW1e9mhw5+7vE8fJYxY8VxLyLjSWDSBUK45NkXEeFQI2K7toaoy0aUfc5 eISJa9EBoN0IPmOVOIQPc2dMOdu5YqLYG1tnHuMf+Kd3TMGOorng/6kh3ogpMkT6o4WD dOlPat1KYy83y+GPtGdmg4fO9mK2z6HiAAn1uvLj1z89+uHChKfpUjd80ASXTjFxBBhu FOnyHXa1oQrWrSGFLNciE05TTWj7Za30OHJeUQYt19qAnKffYtWTp2n1eGd+qnUbFx1Y KPZiYCnNIE5DxhXqDkXu0pwHyeWCm3gdTeNg+N+cpQrt39QtHi0nCCb5ie+uAwGo0rTP IsiQ== X-Gm-Message-State: AMCzsaXofosFrMIUH8DGQimLvkuXGfxpF9i5c0JRN12DXJNs1YNxL8Wr dot6E+aFu5tL5ov5PLd97L60rBBM X-Google-Smtp-Source: ABhQp+RxrdE6DFoTqeIDiVle557vgpdSVLPxSwZJv7waqRsKYTe21qOYLaUr/lVLZOdgthpmS9BuEQ== X-Received: by 10.55.101.4 with SMTP id z4mr23926844qkb.114.1508851409791; Tue, 24 Oct 2017 06:23:29 -0700 (PDT) Received: from localhost ([144.121.20.162]) by smtp.gmail.com with ESMTPSA id q82sm206174qki.34.2017.10.24.06.23.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Oct 2017 06:23:28 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/6] drm/msm: preserve IOVAs in submit's bo table Date: Tue, 24 Oct 2017 09:22:52 -0400 Message-Id: <20171024132256.20286-6-robdclark@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171024132256.20286-1-robdclark@gmail.com> References: <20171024132256.20286-1-robdclark@gmail.com> Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, freedreno@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP We need this if we want to dump the submit after cleanup (ie. from hang or fault). But in the backoff/unpin case we want to clear them. So add a flag so we can skip clearing the IOVAs in at cleanup. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_gem_submit.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 69868682f8f4..b8dc8f96caf2 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -161,7 +161,8 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, return ret; } -static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i) +static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, + int i, bool backoff) { struct msm_gem_object *msm_obj = submit->bos[i].obj; @@ -171,7 +172,7 @@ static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i) if (submit->bos[i].flags & BO_LOCKED) ww_mutex_unlock(&msm_obj->resv->lock); - if (!(submit->bos[i].flags & BO_VALID)) + if (backoff && !(submit->bos[i].flags & BO_VALID)) submit->bos[i].iova = 0; submit->bos[i].flags &= ~(BO_LOCKED | BO_PINNED); @@ -206,10 +207,10 @@ static int submit_lock_objects(struct msm_gem_submit *submit) fail: for (; i >= 0; i--) - submit_unlock_unpin_bo(submit, i); + submit_unlock_unpin_bo(submit, i, true); if (slow_locked > 0) - submit_unlock_unpin_bo(submit, slow_locked); + submit_unlock_unpin_bo(submit, slow_locked, true); if (ret == -EDEADLK) { struct msm_gem_object *msm_obj = submit->bos[contended].obj; @@ -393,7 +394,7 @@ static void submit_cleanup(struct msm_gem_submit *submit) for (i = 0; i < submit->nr_bos; i++) { struct msm_gem_object *msm_obj = submit->bos[i].obj; - submit_unlock_unpin_bo(submit, i); + submit_unlock_unpin_bo(submit, i, false); list_del_init(&msm_obj->submit_entry); drm_gem_object_unreference(&msm_obj->base); }