From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=192.198.163.13 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794291468; b=3Ve4lI9cUWqEqvgq5iZNvCmXFuCzkLf/kSNr3JdRuNKPLDHeLROk3y8XDsGohuIEZzAc 9gKgVjHPQllboVA2+wMcQ8fLtvF71ghnITw/Juz6mIgRssdXMN5wUFs4mnbgpZB13rt5k uzedxgqfjxg+i6MRlqFfDUlpoAnBS3doH8iMzvFXhA6h9xeXXttqX9jrxN1Z3VCBlxPUG eBDNZAAMCQf9pcLqzEYm8/fDaBeiZGPbCBEh9fSIg6JWJlbhg5PxjNfw7yg9vPkMH3/hv 9CwGjJI+PWBjWxaYhs2McMuhlEpsdGN+LsAreLYhF3ulhkmsPhrktHtNoAt0JIrd4HA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794291468; h=DMARC-Filter:DKIM-Signature:X-CSE-ConnectionGUID:X-CSE-MsgGUID: X-IronPort-AV:X-IronPort-AV:Received:X-CSE-ConnectionGUID: X-CSE-MsgGUID:X-ExtLoop1:X-IronPort-AV:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=YPIP+5wbF+CqAWxLY/bgW2gnkfktnCnNJSmU43IX4go=; b=M8JQ2m62Sdvw0QW0JTBnvDABp6HD0T19oDo0vQctQFOxlyksOsYRkJIIhMQn9ziHO3Ha KkBA9nZ3yOxrr3Q6y1ZmbjmyETZ2GtEBwGXdetfFQOhOyR7jt5AjaaBiVSgVUqBf7ZVHa 4DEj1vk/7WlidIUcJ0q6NrzNuwgtejZmSQKLn6pNPQ6HwKa/4PaqkG8H9UtAxPtZfcJFk 5coo1jiRz4RtRonVnxGSR0uxImBifLfNOSp9BrOG+DH+SrRCuc5sgAsDdIYQtJTu3NVZK Vj6/IvXvrkdZhQ9BraFdbwVuUYyR/QY3zmJxXV2rLOles/FeuRH3EOnTau7rUpSYs8A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=cUChSNbw; arc=none smtp.remote-ip=192.198.163.13 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C3C960A382F; Tue, 10 Nov 2026 06:17:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2C3C960A382F Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=cUChSNbw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1794291468; x=1825827468; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QedGAz6xqU07cdwi37X7wfVwdw1FT28mPhTh+sQwCYs=; b=cUChSNbw7C6jQqXtoOUwxhcDe1QNSNlaDNA/+Z6NLVi2R6o57jxHn9pZ /C9rlNCxMRqVUuJwiqLBx8l+VC9yADA3vrpqzq1hBpXn4D68ORxz2nMij GWliDTGZdj8dwxEFAW/NdXLNwnaKfVC2ictzm4t3ggheygV9Hb/Gvu4Qd Hjy4lr5kgWc+XiBIN8X9CT/eRBVDAHV5lGFG7d32jdlIn75NLSbmKjxLW FPD571zMS3C4ahvL8tzW6+MViFTuU+Zzj8QY56z+NdChx/3vYJ04AkdOO v8ALy3JMXrJ/rsQvkOVBLejcMRyVRSGgwqhUMYTY7CFaegqz62rRChc3L w==; X-CSE-ConnectionGUID: icpwaSlgQo6pbKZbZwKysg== X-CSE-MsgGUID: 6oCsUIP0RXW+hWzN3Dvq3A== X-IronPort-AV: E=McAfee;i="6800,10657,11961"; a="3021032" X-IronPort-AV: E=Sophos;i="6.27,205,1787036400"; d="scan'208";a="3021032" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2026 22:17:47 -0800 X-CSE-ConnectionGUID: iPZLlZKGRyiHKDv8Krj3PQ== X-CSE-MsgGUID: zQbwIy0RSyKDryRwgJxZ3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,205,1787036400"; d="scan'208";a="7931050" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa004.jf.intel.com with ESMTP; 09 Nov 2026 22:17:42 -0800 From: Suraj Kandpal To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: dmitry.baryshkov@oss.qualcomm.com, John.Harrison@Igalia.com, kernel-dev@igalia.com, alex.hung@amd.com, liviu.dudau@arm.com, louis.chauvet@bootlin.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, laurent.pinchart+renesas@ideasonboard.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, dave.stevenson@raspberrypi.com, mcanal@igalia.com, kernel-list@raspberrypi.com, uma.shankar@intel.com, arun.r.murthy@intel.com, Suraj Kandpal Subject: [PATCH v7 8/8] drm: writeback: Modify cleanup_writeback_job helper Date: Tue, 10 Nov 2026 11:46:37 +0530 Message-Id: <20261110061637.2500929-9-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261110061637.2500929-1-suraj.kandpal@intel.com> References: <20261110061637.2500929-1-suraj.kandpal@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The cleanup_writeback_job() connector helper hook needs access to the parent drm_connector object as well as the drm_writeback_connector object itself. So, pass in the top level drm_connector and traverse down to drm_writeback_connector rather than passing in the lower level object and traversing back up. This also makes it uniform with the params passed to other drm_connector_helper_funcs hooks. Signed-off-by: Suraj Kandpal Reviewed-by: Dmitry Baryshkov Reviewed-by: John Harrison Reviewed-by: Alex Hung --- v6 -> v7: - Rebase over latest kernel - Rebase over latest writeback series by Dmitry v5 -> v6: - Rebase over latest kernel v3 -> v4: - Update subject line for consitency (John) - Update commit message across commits for consitency (John) drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 2 +- drivers/gpu/drm/drm_writeback.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 3 +-- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 5 ++--- drivers/gpu/drm/vkms/vkms_writeback.c | 5 +---- include/drm/drm_modeset_helper_vtables.h | 2 +- 7 files changed, 8 insertions(+), 13 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 afed660762fd..90ffa9e83957 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 @@ -196,7 +196,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_wb_prepare_job(struct drm_connector *wb_connector } EXPORT_IF_KUNIT(amdgpu_dm_wb_prepare_job); -STATIC_IFN_KUNIT void amdgpu_dm_wb_cleanup_job(struct drm_writeback_connector *connector, +STATIC_IFN_KUNIT void amdgpu_dm_wb_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job) { struct amdgpu_bo *rbo; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h index ede7ff007ad7..4050d83a2a95 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h @@ -61,7 +61,7 @@ int amdgpu_dm_wb_encoder_atomic_check(struct drm_encoder *encoder, int amdgpu_dm_wb_connector_get_modes(struct drm_connector *connector); int amdgpu_dm_wb_prepare_job(struct drm_connector *wb_connector, struct drm_writeback_job *job); -void amdgpu_dm_wb_cleanup_job(struct drm_writeback_connector *connector, +void amdgpu_dm_wb_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job); void amdgpu_dm_wb_kunit_set_ops(const struct amdgpu_dm_wb_kunit_ops *ops); #endif diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index f54ee84c2e8a..815eb63c2d56 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -423,7 +423,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 88227aa7ee69..44797c9443ac 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -100,10 +100,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 = drm_writeback_to_connector(wb_connector); 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 6c4685147e49..d6171fb5eb9a 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -72,11 +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 be67b13e7347..c805fcf78163 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -103,13 +103,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 bff41a1d49a6..0fdba3eded28 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1176,7 +1176,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