From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.3 03/68] drm: Clear the fence pointer when writeback job signaled Date: Wed, 9 Oct 2019 13:04:42 -0400 Message-ID: <20191009170547.32204-3-sashal@kernel.org> References: <20191009170547.32204-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CA246EA1F for ; Wed, 9 Oct 2019 17:23:54 +0000 (UTC) In-Reply-To: <20191009170547.32204-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Lowry Li , James Qian Wang , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogIkxvd3J5IExpIChBcm0gVGVjaG5vbG9neSBDaGluYSkiIDxMb3dyeS5MaUBhcm0uY29t PgoKWyBVcHN0cmVhbSBjb21taXQgYjEwNjZhMTIzNTM4MDQ0MTE3ZjBhNzhiYThjNmE1MGNmNWEw NGM4NiBdCgpEdXJpbmcgaXQgc2lnbmFscyB0aGUgY29tcGxldGlvbiBvZiBhIHdyaXRlYmFjayBq b2IsIGFmdGVyIHJlbGVhc2luZwp0aGUgb3V0X2ZlbmNlLCB3ZSdkIGNsZWFyIHRoZSBwb2ludGVy LgoKQ2hlY2sgaWYgZmVuY2UgbGVmdCBvdmVyIGluIGRybV93cml0ZWJhY2tfY2xlYW51cF9qb2Io KSwgcmVsZWFzZSBpdC4KClNpZ25lZC1vZmYtYnk6IExvd3J5IExpIChBcm0gVGVjaG5vbG9neSBD aGluYSkgPGxvd3J5LmxpQGFybS5jb20+ClJldmlld2VkLWJ5OiBCcmlhbiBTdGFya2V5IDxicmlh bi5zdGFya2V5QGFybS5jb20+ClJldmlld2VkLWJ5OiBKYW1lcyBRaWFuIFdhbmcgKEFybSBUZWNo bm9sb2d5IENoaW5hKSA8amFtZXMucWlhbi53YW5nQGFybS5jb20+ClNpZ25lZC1vZmYtYnk6IGph bWVzIHFpYW4gd2FuZyAoQXJtIFRlY2hub2xvZ3kgQ2hpbmEpIDxqYW1lcy5xaWFuLndhbmdAYXJt LmNvbT4KTGluazogaHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lk LzE1NjQ1NzEwNDgtMTUwMjktMy1naXQtc2VuZC1lbWFpbC1sb3dyeS5saUBhcm0uY29tClNpZ25l ZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vZHJtX3dyaXRlYmFjay5jIHwgMjMgKysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fd3JpdGViYWNrLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3dy aXRlYmFjay5jCmluZGV4IGZmMTM4YjZlYzQ4YmEuLjQzZDllM2JiM2E5NDMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fd3JpdGViYWNrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV93cml0ZWJhY2suYwpAQCAtMzI0LDYgKzMyNCw5IEBAIHZvaWQgZHJtX3dyaXRlYmFja19jbGVh bnVwX2pvYihzdHJ1Y3QgZHJtX3dyaXRlYmFja19qb2IgKmpvYikKIAlpZiAoam9iLT5mYikKIAkJ ZHJtX2ZyYW1lYnVmZmVyX3B1dChqb2ItPmZiKTsKIAorCWlmIChqb2ItPm91dF9mZW5jZSkKKwkJ ZG1hX2ZlbmNlX3B1dChqb2ItPm91dF9mZW5jZSk7CisKIAlrZnJlZShqb2IpOwogfQogRVhQT1JU X1NZTUJPTChkcm1fd3JpdGViYWNrX2NsZWFudXBfam9iKTsKQEAgLTM2NiwyNSArMzY5LDI5IEBA IGRybV93cml0ZWJhY2tfc2lnbmFsX2NvbXBsZXRpb24oc3RydWN0IGRybV93cml0ZWJhY2tfY29u bmVjdG9yICp3Yl9jb25uZWN0b3IsCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAlzdHJ1Y3Qg ZHJtX3dyaXRlYmFja19qb2IgKmpvYjsKKwlzdHJ1Y3QgZG1hX2ZlbmNlICpvdXRfZmVuY2U7CiAK IAlzcGluX2xvY2tfaXJxc2F2ZSgmd2JfY29ubmVjdG9yLT5qb2JfbG9jaywgZmxhZ3MpOwogCWpv YiA9IGxpc3RfZmlyc3RfZW50cnlfb3JfbnVsbCgmd2JfY29ubmVjdG9yLT5qb2JfcXVldWUsCiAJ CQkJICAgICAgIHN0cnVjdCBkcm1fd3JpdGViYWNrX2pvYiwKIAkJCQkgICAgICAgbGlzdF9lbnRy eSk7Ci0JaWYgKGpvYikgeworCWlmIChqb2IpCiAJCWxpc3RfZGVsKCZqb2ItPmxpc3RfZW50cnkp OwotCQlpZiAoam9iLT5vdXRfZmVuY2UpIHsKLQkJCWlmIChzdGF0dXMpCi0JCQkJZG1hX2ZlbmNl X3NldF9lcnJvcihqb2ItPm91dF9mZW5jZSwgc3RhdHVzKTsKLQkJCWRtYV9mZW5jZV9zaWduYWwo am9iLT5vdXRfZmVuY2UpOwotCQkJZG1hX2ZlbmNlX3B1dChqb2ItPm91dF9mZW5jZSk7Ci0JCX0K LQl9CisKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZ3Yl9jb25uZWN0b3ItPmpvYl9sb2NrLCBm bGFncyk7CiAKIAlpZiAoV0FSTl9PTigham9iKSkKIAkJcmV0dXJuOwogCisJb3V0X2ZlbmNlID0g am9iLT5vdXRfZmVuY2U7CisJaWYgKG91dF9mZW5jZSkgeworCQlpZiAoc3RhdHVzKQorCQkJZG1h X2ZlbmNlX3NldF9lcnJvcihvdXRfZmVuY2UsIHN0YXR1cyk7CisJCWRtYV9mZW5jZV9zaWduYWwo b3V0X2ZlbmNlKTsKKwkJZG1hX2ZlbmNlX3B1dChvdXRfZmVuY2UpOworCQlqb2ItPm91dF9mZW5j ZSA9IE5VTEw7CisJfQorCiAJSU5JVF9XT1JLKCZqb2ItPmNsZWFudXBfd29yaywgY2xlYW51cF93 b3JrKTsKIAlxdWV1ZV93b3JrKHN5c3RlbV9sb25nX3dxLCAmam9iLT5jbGVhbnVwX3dvcmspOwog fQotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABBD4ECE58C for ; Wed, 9 Oct 2019 17:23:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84A4B21924 for ; Wed, 9 Oct 2019 17:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570641837; bh=/4mMuhJyPwKfQfkFTTqyLam8OguJfnlyat4cAdt/7VI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PiUUdZ2/npGxpDpPsRUrz72B2gxa8bqzfInoEcqpiAliJYXfb+ihZRu9NaM3y86uU enBngV4l2dBbdJbFK0ThsCx8lNObmjdlzDHunMkRDjNGT2fG4i4koGs7eZSo3VcIAq naJMY3pWmfKyqVg2KMikuIy9IZLIMcRP7Nl8X8F0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731997AbfJIRX4 (ORCPT ); Wed, 9 Oct 2019 13:23:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730490AbfJIRXy (ORCPT ); Wed, 9 Oct 2019 13:23:54 -0400 Received: from sasha-vm.mshome.net (unknown [167.220.2.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 119A121920; Wed, 9 Oct 2019 17:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570641834; bh=/4mMuhJyPwKfQfkFTTqyLam8OguJfnlyat4cAdt/7VI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A6GS984hK9CM5ZnARTBXIjvK6o0cJl8roJSSmMXGxyPdViHpTRvz4T82OrdPDfOhL cr+hLkjOHi8RyQFbbrFg5583BmCCDUZ08U7j40MZY/BGD2nphT4vXN9zD76Oru/vS/ owwuI5j8DQRv1Gtdx6VllZzfqo8jHOTd33YRCXFI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Lowry Li (Arm Technology China)" , Lowry Li , Brian Starkey , James Qian Wang , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.3 03/68] drm: Clear the fence pointer when writeback job signaled Date: Wed, 9 Oct 2019 13:04:42 -0400 Message-Id: <20191009170547.32204-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009170547.32204-1-sashal@kernel.org> References: <20191009170547.32204-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Lowry Li (Arm Technology China)" [ Upstream commit b1066a123538044117f0a78ba8c6a50cf5a04c86 ] During it signals the completion of a writeback job, after releasing the out_fence, we'd clear the pointer. Check if fence left over in drm_writeback_cleanup_job(), release it. Signed-off-by: Lowry Li (Arm Technology China) Reviewed-by: Brian Starkey Reviewed-by: James Qian Wang (Arm Technology China) Signed-off-by: james qian wang (Arm Technology China) Link: https://patchwork.freedesktop.org/patch/msgid/1564571048-15029-3-git-send-email-lowry.li@arm.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_writeback.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index ff138b6ec48ba..43d9e3bb3a943 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -324,6 +324,9 @@ void drm_writeback_cleanup_job(struct drm_writeback_job *job) if (job->fb) drm_framebuffer_put(job->fb); + if (job->out_fence) + dma_fence_put(job->out_fence); + kfree(job); } EXPORT_SYMBOL(drm_writeback_cleanup_job); @@ -366,25 +369,29 @@ drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector, { unsigned long flags; struct drm_writeback_job *job; + struct dma_fence *out_fence; spin_lock_irqsave(&wb_connector->job_lock, flags); job = list_first_entry_or_null(&wb_connector->job_queue, struct drm_writeback_job, list_entry); - if (job) { + if (job) list_del(&job->list_entry); - if (job->out_fence) { - if (status) - dma_fence_set_error(job->out_fence, status); - dma_fence_signal(job->out_fence); - dma_fence_put(job->out_fence); - } - } + spin_unlock_irqrestore(&wb_connector->job_lock, flags); if (WARN_ON(!job)) return; + out_fence = job->out_fence; + if (out_fence) { + if (status) + dma_fence_set_error(out_fence, status); + dma_fence_signal(out_fence); + dma_fence_put(out_fence); + job->out_fence = NULL; + } + INIT_WORK(&job->cleanup_work, cleanup_work); queue_work(system_long_wq, &job->cleanup_work); } -- 2.20.1