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 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 C926ECCD184 for ; Tue, 7 Oct 2025 05:46:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 248AB10E567; Tue, 7 Oct 2025 05:46:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="W9zHb1Zc"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B70110E555; Tue, 7 Oct 2025 05:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759816016; x=1791352016; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VydNOjyseS0AAg3IdgPtqcN1byO42D8hOB5Ca8L/H5Q=; b=W9zHb1Zcaopifkdm6aeHOAyMwQmt9I/UqZ3PRELrnRw0HouMFZSK6Amq CX4+HiIT9C4v7+cZ0vMd+jl9RmYNrEJ4eSCtImz737RwI/nTyRjOd8q0w dNSHTZlXqOWumqc/h8FOdlLWt4fZdsSwg8wLQitoR76DJA5Zci7spd31G r/lmqiyvJGlHOWmEDeVUeR1nLdwQg2A5c+8LajMJZpFuCMCRkFUbkjguS SY+jXtRvZhYyNA31daVIzEHNpAX01hrQ+2wUoBOWqQCPEF9iEwweX021r VRBG7FXNaxSyIu9In27GVVI3/tpe2pGZMLwtnYvTyzbVF4hb9soU5Lcqv A==; X-CSE-ConnectionGUID: 6FUaWkC0TfW4PlqKbCpfQQ== X-CSE-MsgGUID: BA/KrhEmRXuE32VxLam7XQ== X-IronPort-AV: E=McAfee;i="6800,10657,11574"; a="61028030" X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="61028030" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2025 22:46:55 -0700 X-CSE-ConnectionGUID: 2HAavQysRB6s6oKX2u5jbw== X-CSE-MsgGUID: Pw5eqCkfQdKS7LkRUA+Fpg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="180479548" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by fmviesa008.fm.intel.com with ESMTP; 06 Oct 2025 22:46:46 -0700 From: Suraj Kandpal To: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: dmitry.baryshkov@oss.qualcomm.com, ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH v2 7/7] drm/connector: Modify cleanup_writeback_job helper Date: Tue, 7 Oct 2025 11:15:29 +0530 Message-Id: <20251007054528.2900905-8-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251007054528.2900905-1-suraj.kandpal@intel.com> References: <20251007054528.2900905-1-suraj.kandpal@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" Pass drm_connector to prepare_writeback_job since drm_writeback_connector now resides within drm_connector. It also makes it uniform with params passed to other drm_connector_helper_funcs. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 4 ++-- drivers/gpu/drm/drm_writeback.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 4 +--- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 6 ++---- drivers/gpu/drm/vkms/vkms_writeback.c | 5 +---- include/drm/drm_modeset_helper_vtables.h | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c index d02f5d20f3b1..bf1ecf5d3027 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c @@ -144,8 +144,8 @@ static int amdgpu_dm_wb_prepare_job(struct drm_connector *connector, return r; } -static void amdgpu_dm_wb_cleanup_job(struct drm_writeback_connector *connector, - struct drm_writeback_job *job) +static void amdgpu_dm_wb_cleanup_job(struct drm_connector *connector, + struct drm_writeback_job *job) { struct amdgpu_bo *rbo; int r; diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index 62a11252b05f..e071ae71973c 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -448,7 +448,7 @@ void drm_writeback_cleanup_job(struct drm_writeback_job *job) connector->helper_private; if (job->prepared && funcs->cleanup_writeback_job) - funcs->cleanup_writeback_job(wb_connector, job); + funcs->cleanup_writeback_job(connector, job); if (job->fb) drm_framebuffer_put(job->fb); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c index 26a93c3cc454..03e63b6c5351 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -96,11 +96,9 @@ static int dpu_wb_conn_prepare_job(struct drm_connector *connector, return 0; } -static void dpu_wb_conn_cleanup_job(struct drm_writeback_connector *wb_connector, +static void dpu_wb_conn_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *connector = - container_of(wb_connector, struct drm_connector, writeback); struct dpu_wb_connector *dpu_wb_conn = to_dpu_wb_conn(connector); if (!job->fb) diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c index 725981cc1d0c..e3aab132ded1 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -72,12 +72,10 @@ static int rcar_du_wb_prepare_job(struct drm_connector *connector, return 0; } -static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *connector, +static void rcar_du_wb_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *conn = - drm_writeback_to_connector(connector); - struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(conn); + struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector); struct rcar_du_wb_job *rjob = job->priv; if (!job->fb) diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 032896fb5c5b..320d553f5f1f 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -102,13 +102,10 @@ static int vkms_wb_prepare_job(struct drm_connector *connector, return ret; } -static void vkms_wb_cleanup_job(struct drm_writeback_connector *wb_conn, +static void vkms_wb_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob = job->priv; - struct drm_connector *connector = container_of(wb_conn, - struct drm_connector, - writeback); struct vkms_output *vkms_output = container_of(connector, struct vkms_output, wb_connector); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index 806230129ad9..4ac568bac083 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1157,7 +1157,7 @@ struct drm_connector_helper_funcs { * * This callback is used by the atomic modeset helpers. */ - void (*cleanup_writeback_job)(struct drm_writeback_connector *connector, + void (*cleanup_writeback_job)(struct drm_connector *connector, struct drm_writeback_job *job); /** -- 2.34.1