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 E062DCD5BAB for ; Thu, 21 May 2026 05:37:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21E8F10F209; Thu, 21 May 2026 05:37:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Xr+4uEbE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 65D6410F1E9; Thu, 21 May 2026 05:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779341874; x=1810877874; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x+QbWSYrsyTvmuPmQJRB3P8cDrIJAOE+MnvLcPTKuXw=; b=Xr+4uEbELSF8drHShCelzennDC7zUcee5d+jqxxh0rDdlc2iR/hbdQvM JmxMAb8qEJPJpLHBiOw7DtKm1L8SbfT4dxGbVZmbtffc3Xa8uK7VkPC/9 y3K2RHdGgbBUZoFCQOouz+Tnop3dqjyfr7P41W06n1hNY0aS0JXFCnXyh ESTUgr/I+t8U9UI8XOUKs+HuYEcy56/uC5pggIPKZw2+YGw+JtHasXjhO Bf79q1qpxSpT5lyiITmAiTv2x17oiUdmSCcRLyGGCOjy879xgAdkaZLDo tTXWJg74XkeqEk8xxswQ3r1on+0XEsBtMVfxhZLBKlIDbXc+bwLjaBgUC w==; X-CSE-ConnectionGUID: 6kaPd/JRQTC8wu/WI0Kx1A== X-CSE-MsgGUID: R0lcDpwOT6yNdz8JP9i/6w== X-IronPort-AV: E=McAfee;i="6800,10657,11792"; a="80286479" X-IronPort-AV: E=Sophos;i="6.23,245,1770624000"; d="scan'208";a="80286479" 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:54 -0700 X-CSE-ConnectionGUID: bpUYMXkJRtqjMWfQOPCYqg== X-CSE-MsgGUID: m2vEJ8bbRLKfJTlZ0RYFBA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,245,1770624000"; d="scan'208";a="245420706" 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:49 -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 6/7] drm: writeback: Modify prepare_writeback_job helper Date: Thu, 21 May 2026 11:07:07 +0530 Message-Id: <20260521053708.1475129-7-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 prepare_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 | 2 +- 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 | 2 +- include/drm/drm_modeset_helper_vtables.h | 2 +- 6 files changed, 7 insertions(+), 10 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 bb4945f01616..aba1287454c5 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 @@ -80,7 +80,7 @@ static int amdgpu_dm_wb_connector_get_modes(struct drm_connector *connector) return drm_add_modes_noedid(connector, 3840, 2160); } -static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connector, +static int amdgpu_dm_wb_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { struct amdgpu_framebuffer *afb; diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index 72e437f4394b..4f3c257fc327 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -392,7 +392,7 @@ int drm_writeback_prepare_job(struct drm_writeback_job *job) int ret; if (funcs->prepare_writeback_job) { - ret = funcs->prepare_writeback_job(wb_connector, job); + ret = funcs->prepare_writeback_job(connector, job); if (ret < 0) return ret; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c index 4dee524d1270..3fd2eb1b7cb8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -87,11 +87,9 @@ static const struct drm_connector_funcs dpu_wb_conn_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static int dpu_wb_conn_prepare_job(struct drm_writeback_connector *wb_conn, +static int dpu_wb_conn_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *connector = - drm_writeback_to_connector(wb_conn); 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 4b0f6cd46acb..218b6504cacf 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -47,11 +47,10 @@ static int rcar_du_wb_conn_get_modes(struct drm_connector *connector) dev->mode_config.max_height); } -static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector, +static int rcar_du_wb_prepare_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; int ret; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 2e3df9388dd2..86e5b92c7965 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -72,7 +72,7 @@ static int vkms_wb_connector_get_modes(struct drm_connector *connector) dev->mode_config.max_height); } -static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector, +static int vkms_wb_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob; diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index ca6268945c28..4e26568a16fb 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1119,7 +1119,7 @@ struct drm_connector_helper_funcs { * * This callback is used by the atomic modeset helpers. */ - int (*prepare_writeback_job)(struct drm_writeback_connector *connector, + int (*prepare_writeback_job)(struct drm_connector *connector, struct drm_writeback_job *job); /** * @cleanup_writeback_job: -- 2.34.1