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 AD1C1CD4F5B for ; Fri, 22 May 2026 05:04:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26B6E10F4BB; Fri, 22 May 2026 05:04:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Dk1Lmb5P"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id B74AA10F4BD; Fri, 22 May 2026 05:04:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426258; x=1810962258; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S+TclLj9PBWaAHA95EHjfC15XZrRBQ/zdODYZ/PrcWc=; b=Dk1Lmb5PjfC0nE4u4bWuKYomLr+QzLlDMpnXzXtNHkkqT9KPM/KMamBC Ykfzp7RJg697WmFPBufzl3UVJH3AEU4ufC5k6wAGH5Ds+6Vqr8qrqYZHd dkNN27mdZM0Ka8Qbnayy4ca5VfND+lIYGsrfWLuRVjgc8c1NxVhThNFNZ 5899BxZ61uZgEVYrZIWkNqV/3+vmuBdpBXkI5xbT/2MQHD4msdnMYDM6l JWbvUGt5RTqIrwP20Wom9uKhjHM3Rf9Ly3YLu9F5+1e+K9h3drZ297Eqi nyZsjaaW5i5IYtbp+UNl+FcA11C8y69tabKgcGCW1MajOq+j70CC9thjr Q==; X-CSE-ConnectionGUID: Md1Ym69STFmYZAF0GMr42A== X-CSE-MsgGUID: hynIebXkRsSQP2bfykNTHQ== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651786" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651786" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2026 22:04:18 -0700 X-CSE-ConnectionGUID: sVsGokzNS7+Rbv53AZlpsQ== X-CSE-MsgGUID: SgNhkmiZTnabtJHLFL7azg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946409" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa010.jf.intel.com with ESMTP; 21 May 2026 22:04:11 -0700 From: Suraj Kandpal To: freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: uma.shankar@intel.com, arun.r.murthy@intel.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, sean@poorly.ru, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, kernel-dev@igalia.com, John.Harrison@Igalia.com, Suraj Kandpal , Dmitry Baryshkov Subject: [PATCH v5 7/7] drm: writeback: Modify cleanup_writeback_job helper Date: Fri, 22 May 2026 10:33:13 +0530 Message-Id: <20260522050313.1800378-8-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260522050313.1800378-1-suraj.kandpal@intel.com> References: <20260522050313.1800378-1-suraj.kandpal@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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 | 4 ++-- 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 +- 6 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 aba1287454c5..fe7825fbfc61 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 @@ -142,8 +142,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 ee79dba8cfc8..afd8c7b8708c 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -443,7 +443,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 061e6960c09b..c6396ac1f64c 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 218b6504cacf..e7d7b221c487 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 86e5b92c7965..775abb4677ef 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 4e26568a16fb..9ce5ddd82057 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1134,7 +1134,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