From patchwork Fri Nov 24 00:47:00 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: 13466855 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 E53FCC61DF7 for ; Fri, 24 Nov 2023 01:27:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3244210E786; Fri, 24 Nov 2023 01:27:06 +0000 (UTC) Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by gabe.freedesktop.org (Postfix) with ESMTPS id AACE210E785 for ; Fri, 24 Nov 2023 01:27:04 +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=bVGnQwXnZq/pKO3cHRMchaCtJ7/T1s8//h3rCHp/alE=; b=CkVEJ/gsxOp+PpvyU9j/IRyMr6 ePGIHb9+GzMUkUDajfsCKH0GQw+K7rtW+b0Y36OWvrzrhIWrhEjqU7XZDZj5uWn8rzpwBDt8yDGeZ 4R82M/3Jbw4dlu4LKufo+/I7MdHFzhkK7MO0R2Ei7gscKtFipHaMXyFB/1lUsDr15KxZF5qfG4qqa 9QVh4RqZAPlb2TmQl6mvz719zKsHayWV2pOUzBusr1bmvBjsIq2dys/nXAMWL/0/OYS603dpg/H33 4/GW6cnp4A4CWhb8geC2voxS6u2w9vawxIXisg7pGABKbDrvxMmibvUBnjc0bgA3OrqFhDkznfOMr AXittiyA==; Received: from [177.34.168.16] (helo=morissey..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1r6Ky8-006Zga-83; Fri, 24 Nov 2023 02:26:56 +0100 From: =?utf-8?q?Ma=C3=ADra_Canal?= To: Melissa Wen , Iago Toral , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Subject: [PATCH v2 04/17] drm/v3d: Simplify job refcount handling Date: Thu, 23 Nov 2023 21:47:00 -0300 Message-ID: <20231124012548.772095-5-mcanal@igalia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231124012548.772095-1-mcanal@igalia.com> References: <20231124012548.772095-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?= , kernel-dev@igalia.com, 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 f36214002f37..e18e7c963884 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); } @@ -517,11 +520,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; @@ -621,7 +622,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; @@ -725,7 +726,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;