From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A87922D5C68 for ; Tue, 14 Jul 2026 04:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784003349; cv=none; b=BkgZywLXjnXosw+aKbri0rGZ6g2K7HV0WMO136/LcWRA8+5hksHpSe0G7XipuIsFCxk7HlgJAqQJ1PUTGi0m/sgbCXpLh0EbPjchVguzkWuPS/7nCHFHpS306Zeih8mqx6dNYd8RI6Jt544hJIU35i8Gd0MDSIC1Zd8xp9jwsoY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784003349; c=relaxed/simple; bh=Iz13OkrzowM1z18jUf4GwG9PO2H1LnktR4XWdsbq37o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uzqwSKRvm7oiADyv+8+k0oW7EOOmrG5k9S+7+xoMk2pDfXaiX3g9ZOkNWkmhFO2ORDvrNjqer+NuDK3ir+lyXrdbi9lX1fa3QqAWZaYbSOvRuu1u/a7i4yHFgEyJ+e/I308h7K8d9J4KGdiioA32RTRMJVEH1eGfZ2ZH3EQ6NBk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=X1TUISv1; arc=none smtp.client-ip=198.175.65.15 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.b="X1TUISv1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784003347; x=1815539347; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Iz13OkrzowM1z18jUf4GwG9PO2H1LnktR4XWdsbq37o=; b=X1TUISv1ukxnx5JmtNj3pQDcB16mn1ApGMaHZ/p+lKoSEg9Dy67WWvne 5KIsFR/h0vMFSQBZ3m6TzP8F0RSU2+76/pU8cDXnrzX/nYMBoXBJPCfrW NeqwPRxFZydRrt4mMjRWwCE6DAwVPHaT6CHGngGB9EBD5xduzR8mw5/no 2EV+vgeQw/OjCZRttJwiV5NlYWKijKBh+n/xcbrWU0DuB7Nw0mOo6T/+g e9rrFyw8TkRGDYvB9sMuhBUv6nJHv7PDHMfiopb5Ms3lxROt8zYM9PdKq n9ST+Ykt46Hgztmug5+B5nFeG6An7Lj2K29WN4i0lEvn+Bl0W5gEYLu26 g==; X-CSE-ConnectionGUID: 5GFB41npSUKcFYpV/O6vCA== X-CSE-MsgGUID: loc5wPVpTNK9mRUtCgwu+w== X-IronPort-AV: E=McAfee;i="6800,10657,11841"; a="88297134" X-IronPort-AV: E=Sophos;i="6.25,163,1779174000"; d="scan'208";a="88297134" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2026 21:29:07 -0700 X-CSE-ConnectionGUID: PWX2X3suQlWUfyxY8sRdcA== X-CSE-MsgGUID: lhIef2pPQvaVodz47Xo5wQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,163,1779174000"; d="scan'208";a="255243218" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa008.jf.intel.com with ESMTP; 13 Jul 2026 21:29:00 -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 v6 6/7] drm: writeback: Modify prepare_writeback_job helper Date: Tue, 14 Jul 2026 09:58:04 +0530 Message-Id: <20260714042805.77934-7-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260714042805.77934-1-suraj.kandpal@intel.com> References: <20260714042805.77934-1-suraj.kandpal@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Reviewed-by: John Harrison --- 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/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 | 2 +- include/drm/drm_modeset_helper_vtables.h | 2 +- 6 files changed, 7 insertions(+), 9 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 92039d93f9e4..e0425eda0bb6 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 @@ -85,7 +85,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_wb_connector_get_modes(struct drm_connector *conn } EXPORT_IF_KUNIT(amdgpu_dm_wb_connector_get_modes); -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 d2ccb4dcba0a..e6b52de69ad6 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -396,7 +396,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 c9f53490c1a7..061e6960c09b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -87,10 +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