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=1794291463; b=csPs8iZ7XKzuHBr0PptIE+txyIGLBoqA7xUs6jaJSrus9w2MpGX+BX8IRBcEsOf3fUJ7 i7rYuZ/D0W9ezLI2wUAwIZOLp9+TJmo76nfy862m9ps1h4+9aQvN2/65y3nMScH4Tz8Dm 1n+u6PZCopt2lagai3Q7aOEdn2yykcjPTF578UqR0sYxkgqOQQtQ5c6cIlpE8rICeEplJ LVrTPG3pnTeiO+5HhkGVUsRQdRIvwdA5NVxDQzktlJAkbOMpFsKjui6Gkdq3E0AzS/8fn Sqfja3Guzu1hesoP5hMTFnSRmSZqNERFRR6OiRYwwBe1x2n2NniBaSuvsqnmuGOfe2A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794291463; 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=Z08kIybGg6d8dSt4Hh6lvthaFtyiRwGhAY50TGGfTaU=; b=AxFd6bQVbbQtk3Qg8TdwgiUPNDaVDnp9R0vXooii1y/U4rIMo1v+GN4F0+XCjtCQGaxr Zsa5iGZP0H8+J2mQ8hXKuoNJhDAdvJz9H+FfXCWtQtIzxtrrAXAmeRSyKbyTDw3TQ8/kV M7HfYNORmDQOh4dLZNv50anqhvq8Hry2zqowNuZGTPMF+mV5b+tK05afTCHdbzloT0xAy QuPmeCiEX2R1fR7kIG01QIfh47zs3r7iBJoTf3cHT/fWzDSpFc81I8WA+g7JXzW+olxS5 wzGhgWErDvIABazI7uFN53im5rBVUwa0iqMS3GjKt0L1lDxUcHy3h1+EkR5pcMzZwhQ== 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=Kql4bMzh; 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 1739260A263C; Tue, 10 Nov 2026 06:17:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1739260A263C 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=Kql4bMzh DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1794291462; x=1825827462; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Hu5reIbbsQCbV/dSXk0KmSqeLvCsc+++Y53Lz3hJdL8=; b=Kql4bMzhfxmEUd5IRJQgXt2FWwS659qA77NnYlp9kIH7d8QPIiZutKgZ EfksPq1lJ/yhKwX+MKoK4BNwYt0oFInROnJH8M2BYJuJJ4NTCVbQqXvyg B5MVqGFMEQ7RtYSHJtzRMSeCNoDQmv1ohAteDxggWmqSMeibiJzBcFJOW Hza4UTWhxhXhe5buvF8qeXFgU6X/HYPwpqnqJn+PbvVeNQWktUJjg/owI SJ6agu8iWIy7OjNrYP3nF5TlO+b1IQ+z2WKt6LwkWNCgDB5ceCS0GKUpX 5vxYFC5CsvN7pIDO2qK1HEpzlL0LzQPFY7go/ZKiQwFvwQbJdRGpm+vHm Q==; X-CSE-ConnectionGUID: 9smLK2a9Qf+SDCt8PRs9Aw== X-CSE-MsgGUID: hIy9XfjvQpelwj765W1a6w== X-IronPort-AV: E=McAfee;i="6800,10657,11961"; a="3021024" X-IronPort-AV: E=Sophos;i="6.27,205,1787036400"; d="scan'208";a="3021024" 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:41 -0800 X-CSE-ConnectionGUID: O/A2EqqDRBCEs+QKjBA1iw== X-CSE-MsgGUID: 9hh5QcIeTnmgOXeolYlqXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,205,1787036400"; d="scan'208";a="7931044" 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:35 -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 7/8] drm: writeback: Modify prepare_writeback_job helper Date: Tue, 10 Nov 2026 11:46:36 +0530 Message-Id: <20261110061637.2500929-8-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 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 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 | 4 ++-- 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 | 2 +- include/drm/drm_modeset_helper_vtables.h | 2 +- 7 files changed, 9 insertions(+), 11 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 e98481d5aa74..afed660762fd 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 @@ -131,8 +131,8 @@ STATIC_IFN_KUNIT int amdgpu_dm_wb_connector_get_modes(struct drm_connector *conn } EXPORT_IF_KUNIT(amdgpu_dm_wb_connector_get_modes); -STATIC_IFN_KUNIT int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connector, - struct drm_writeback_job *job) +STATIC_IFN_KUNIT int amdgpu_dm_wb_prepare_job(struct drm_connector *wb_connector, + struct drm_writeback_job *job) { struct amdgpu_framebuffer *afb; struct drm_gem_object *obj; 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 8d39a37e80f0..ede7ff007ad7 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 @@ -59,7 +59,7 @@ int amdgpu_dm_wb_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state); int amdgpu_dm_wb_connector_get_modes(struct drm_connector *connector); -int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_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, struct drm_writeback_job *job); diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index 33be7a0b9a89..f54ee84c2e8a 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -369,7 +369,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 38c214dea08d..88227aa7ee69 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 02e74048d00f..6c4685147e49 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 8d72946989fe..be67b13e7347 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 60b30cc26940..bff41a1d49a6 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1161,7 +1161,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