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 5FC73CD343F for ; Thu, 21 May 2026 05:38:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B64C610F20F; Thu, 21 May 2026 05:38:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mKRXg7pY"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id E128010F20D; Thu, 21 May 2026 05:37:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779341880; x=1810877880; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kBU4tcHrzqeSUeYac4CF4EqM88RgX9OWcBmHa03AWUc=; b=mKRXg7pYTBhjwJDsed4CUniV/BpKkP2SJ0/hGjNWqQg5z0YWixL0dYKV Qe8ejxrmLzZNe6Ez1KbcfIjTT+aisaKvUb7KVRFOSUufrR9mZeKwkWanJ CDxNuTQST8hfJkdwTks5QT0wI6H9DXsS49gzee6HxeJmXemMFtoX4Zu44 7LB/rKoSzEhZt2TmeS8o5yw4LCMoIea59jSF7YzbssP9VugbqdYjjerxg JYF6/zk3YBxWuXKENMAbCOxh+J4leAtZ7wnhegRQeury6SHybqKUlShhK hlclfHgKCxKhAiEI94A1ba/FwG6oWBhcQgC9AqxFJeht9j+hjUgjQH+8r g==; X-CSE-ConnectionGUID: 8L4tVHnmS5WTDUAydcGasg== X-CSE-MsgGUID: tKx2T0+FTqGH6Lrw2yHpUg== X-IronPort-AV: E=McAfee;i="6800,10657,11792"; a="80286495" X-IronPort-AV: E=Sophos;i="6.23,245,1770624000"; d="scan'208";a="80286495" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2026 22:37:59 -0700 X-CSE-ConnectionGUID: H8+7DoAST6C8BIp9pJvBWQ== X-CSE-MsgGUID: iTmn1S4LTbCxXGuY9CgWmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,245,1770624000"; d="scan'208";a="245420713" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa005.jf.intel.com with ESMTP; 20 May 2026 22:37:54 -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: 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 , kernel-dev@igalia.com, John.Harrison@Igalia.com, Suraj Kandpal , Dmitry Baryshkov Subject: [PATCH v4 7/7] drm: writeback: Modify cleanup_writeback_job helper Date: Thu, 21 May 2026 11:07:08 +0530 Message-Id: <20260521053708.1475129-8-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260521053708.1475129-1-suraj.kandpal@intel.com> References: <20260521053708.1475129-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 --- 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 | 4 +--- 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(+), 14 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 4f3c257fc327..b1dddc1d2579 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -447,7 +447,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 3fd2eb1b7cb8..c6396ac1f64c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -100,11 +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