From patchwork Mon Sep 4 17:38:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 13374237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B279C83F3F for ; Mon, 4 Sep 2023 17:51:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F276610E3C0; Mon, 4 Sep 2023 17:51:22 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 198D810E3C0 for ; Mon, 4 Sep 2023 17:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=cXsrpJcfgn8WqALuyrPzgsWgpeIMLJDt3E/KYtPzpMg=; b=TJfXBxJ3tCnMO0GniYlD6ksfRU aItptzeU/7cbUA6Fd6hjtdEQNwbj4GwWHGbwd9L1HkJZKMupK7Jk7WHlFRi19zpeG1npuxG/T4p/L oD23oJvwojiR+jyuq9SN8xdJDfxbIFTU16u1waf9lNyVLVlnvCS78Jh7PN45GlJRPoB9qy0BWn1rh EuF8zP1IruARdBTcFXHRD//sEVNJsxhzjpiaaykIamo8RWIj0T8MM/D1qh1pq29zlAN9zswjOB48e AbFkYGfVX97rwmo2UUdHxvD5rxIytdufvHQdk/v33a/+WocfTCriPyvBVeUPxm2PdafizAzXPTxLV jUClJaGg==; Received: from [187.36.235.191] (helo=morissey..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qdDjE-0028nB-4O; Mon, 04 Sep 2023 19:51:12 +0200 From: =?utf-8?q?Ma=C3=ADra_Canal?= To: Emma Anholt , Melissa Wen , Iago Toral , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Subject: [PATCH 04/17] drm/v3d: Simplify job refcount handling Date: Mon, 4 Sep 2023 14:38:52 -0300 Message-ID: <20230904175019.1172713-5-mcanal@igalia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230904175019.1172713-1-mcanal@igalia.com> References: <20230904175019.1172713-1-mcanal@igalia.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Ma=C3=ADra_Canal?= , Boris Brezillon , dri-devel@lists.freedesktop.org, Faith Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Melissa Wen Instead of checking if the job is NULL every time we call the function, check it inside the function. Signed-off-by: Melissa Wen Signed-off-by: Maíra Canal --- drivers/gpu/drm/v3d/v3d_submit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c index 0886b3ec9aef..b6be34060d4f 100644 --- a/drivers/gpu/drm/v3d/v3d_submit.c +++ b/drivers/gpu/drm/v3d/v3d_submit.c @@ -129,6 +129,9 @@ void v3d_job_cleanup(struct v3d_job *job) void v3d_job_put(struct v3d_job *job) { + if (!job) + return; + kref_put(&job->refcount, job->free); } @@ -516,11 +519,9 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, &se, last_job->done_fence); - if (bin) - v3d_job_put(&bin->base); - v3d_job_put(&render->base); - if (clean_job) - v3d_job_put(clean_job); + v3d_job_put((void *)bin); + v3d_job_put((void *)render); + v3d_job_put((void *)clean_job); return 0; @@ -620,7 +621,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data, &se, job->base.done_fence); - v3d_job_put(&job->base); + v3d_job_put((void *)job); return 0; @@ -724,7 +725,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, &se, clean_job->done_fence); - v3d_job_put(&job->base); + v3d_job_put((void *)job); v3d_job_put(clean_job); return 0;