From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 A8724358381 for ; Fri, 22 May 2026 05:03:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426225; cv=none; b=bkp0T2DAmjAvO3b4pItNQoUxBdYBcplYZX182g41DheFpHhB3sYq6QUQgFWMfbLEqHASWlUFUgdlRlN2ahWLJi/KY94m0VCoCAzTYUd5HfYmxRcu8kayPjiWeEjjHHCR8KLljMTdp6FLDSl+6KhT/9qY2WgKaquYbrz+xOJzdBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426225; c=relaxed/simple; bh=jupyWpMTvcrf1l0fBOVskyph+hrMfteQly8uob6k2i0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TLLrr3fKnEfdJNtb0VJL2iDz7jcOpFL2t0POVErU3s5aiwIRL4ml5SHicFJQfYKwcxM25B40qT4xXOm/LKdknkOKj1XRZYPLhmg/Mc/eRZStfIIp2/oUfaJ/FKktLUKZndnMpooSCSkXb+ErnmScckHm/MFmOirzns2k6+vTXsw= 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=UoLVDCvc; arc=none smtp.client-ip=198.175.65.11 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="UoLVDCvc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426223; x=1810962223; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jupyWpMTvcrf1l0fBOVskyph+hrMfteQly8uob6k2i0=; b=UoLVDCvcN0r8+fnhUYX73vw+Dd8691e2RWSYRSBnkRI7pHS8VF1wyXcF qnCyCCVLpwoyLgtijN7x7ZzFXYUo5UVDHRIvCms9DIQQSf3AL7JCONmB/ hct8cGEEAARcf1BYEmN8tCbAP02uDzkjqHXjtFr/+WvYCLJDxnMoPVmme lam+UWCwXXWS/NYTfUR7GjHCxNAF6uPn1n25puj/lGkAwHw/8gsLoUSEQ IKSF+3wQC+hlWIDclPim/2VuwaTo1EB6/TOuYv/6mPBDGWgxyrM+TDMRt yLhVU6nqlH9lT4R0qVq6Bg1wEMkf7lw1QER3cEwNE/fx6W/ljDCw5p6+Z A==; X-CSE-ConnectionGUID: STw9hCZKQnCnbXcWPTNYvA== X-CSE-MsgGUID: zbkqzwHdT9iQiYCJHazCSA== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651698" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651698" 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:03:43 -0700 X-CSE-ConnectionGUID: Ys4KQwImSgO3YupVNaIQXA== X-CSE-MsgGUID: K/OTXY2hRzy/wi8M5Wb46Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946246" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa010.jf.intel.com with ESMTP; 21 May 2026 22:03:35 -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 , Liviu Dudau Subject: [PATCH v5 1/7] drm: writeback: Refactor drm_writeback_connector structure Date: Fri, 22 May 2026 10:33:07 +0530 Message-Id: <20260522050313.1800378-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some drivers cannot work with the current design where the connector is embedded within the drm_writeback_connector such as Intel and some drivers that can get it working end up adding a lot of checks all around the code to check if it's a writeback conenctor or not, this is due to the limitation of inheritance in C. To solve this move the drm_writeback_connector within the drm_connector and remove the drm_connector base which was in drm_writeback_connector. Make this drm_writeback_connector a union with hdmi connector to save memory and since a connector can never be both writeback and hdmi it should serve us well. Do all other required modifications that come with these changes along with addition of new function which returns the drm_connector when drm_writeback_connector is present. Modify drivers using the drm_writeback_connector to allow them to use this connector without breaking them. The drivers modified here are amd, komeda, mali, vc4, vkms, rcar_du, msm Signed-off-by: Suraj Kandpal Reviewed-by: Liviu Dudau Reviewed-by: Louis Chauvet Reviewed-by: John Harrison --- v4 -> v5: - Remove more unnecessary wrapping of drm_writeback_to_connector() (John) v3 -> v4: - Use drm_writeback_to_connector() wherever possible (John) - Do not wrap line where not needed (John) .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 8 +-- .../gpu/drm/arm/display/komeda/komeda_crtc.c | 6 +- .../gpu/drm/arm/display/komeda/komeda_kms.h | 6 +- .../arm/display/komeda/komeda_wb_connector.c | 8 +-- drivers/gpu/drm/arm/malidp_crtc.c | 2 +- drivers/gpu/drm/arm/malidp_drv.h | 2 +- drivers/gpu/drm/arm/malidp_hw.c | 6 +- drivers/gpu/drm/arm/malidp_mw.c | 8 +-- drivers/gpu/drm/drm_atomic_uapi.c | 2 +- drivers/gpu/drm/drm_writeback.c | 28 ++++---- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 14 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h | 4 +- .../gpu/drm/renesas/rcar-du/rcar_du_crtc.h | 6 +- .../drm/renesas/rcar-du/rcar_du_writeback.c | 16 +++-- drivers/gpu/drm/vc4/vc4_txp.c | 14 ++-- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- drivers/gpu/drm/vkms/vkms_writeback.c | 13 ++-- include/drm/drm_connector.h | 69 +++++++++++++++++-- include/drm/drm_writeback.h | 66 +----------------- 23 files changed, 151 insertions(+), 142 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 325e81781a5e..d022ebb6600d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7486,11 +7486,9 @@ create_stream_for_sink(struct drm_connector *connect= or, aconnector =3D to_amdgpu_dm_connector(connector); link =3D aconnector->dc_link; } else { - struct drm_writeback_connector *wbcon =3D NULL; struct amdgpu_dm_wb_connector *dm_wbcon =3D NULL; =20 - wbcon =3D drm_connector_to_writeback(connector); - dm_wbcon =3D to_amdgpu_dm_wb_connector(wbcon); + dm_wbcon =3D to_amdgpu_dm_wb_connector(connector); link =3D dm_wbcon->link; } =20 @@ -10916,7 +10914,7 @@ static void dm_set_writeback(struct amdgpu_display_= manager *dm, struct drm_connector *connector, struct drm_connector_state *new_con_state) { - struct drm_writeback_connector *wb_conn =3D drm_connector_to_writeback(co= nnector); + struct drm_writeback_connector *wb_conn =3D &connector->writeback; struct amdgpu_device *adev =3D dm->adev; struct amdgpu_crtc *acrtc; struct dc_writeback_info *wb_info; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 74f700fbeb6f..a394ea2eac1a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -882,7 +882,7 @@ static inline void amdgpu_dm_set_mst_status(uint8_t *st= atus, #define to_amdgpu_dm_connector(x) container_of(x, struct amdgpu_dm_connect= or, base) =20 struct amdgpu_dm_wb_connector { - struct drm_writeback_connector base; + struct drm_connector base; struct dc_link *link; }; =20 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 fdc3da40452f..6fb8cb4d520c 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 @@ -200,9 +200,9 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_m= anager *dm, =20 wbcon->link =3D link; =20 - drm_connector_helper_add(&wbcon->base.base, &amdgpu_dm_wb_conn_helper_fun= cs); + drm_connector_helper_add(&wbcon->base, &amdgpu_dm_wb_conn_helper_funcs); =20 - res =3D drmm_writeback_connector_init(&dm->adev->ddev, &wbcon->base, + res =3D drmm_writeback_connector_init(&dm->adev->ddev, &wbcon->base.write= back, &amdgpu_dm_wb_connector_funcs, encoder, amdgpu_dm_wb_formats, @@ -214,8 +214,8 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_m= anager *dm, * Some of the properties below require access to state, like bpc. * Allocate some default initial connector state with our reset helper. */ - if (wbcon->base.base.funcs->reset) - wbcon->base.base.funcs->reset(&wbcon->base.base); + if (wbcon->base.funcs->reset) + wbcon->base.funcs->reset(&wbcon->base); =20 return 0; } diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index e8cb782a6f8e..6611920c45fb 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -213,7 +213,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcr= tc, struct komeda_wb_connector *wb_conn =3D kcrtc->wb_conn; =20 if (wb_conn) - drm_writeback_signal_completion(&wb_conn->base, 0); + drm_writeback_signal_completion(&wb_conn->base.writeback, 0); else drm_warn(drm, "CRTC[%d]: EOW happen but no wb_connector.\n", drm_crtc_index(&kcrtc->base)); @@ -269,9 +269,9 @@ komeda_crtc_do_flush(struct drm_crtc *crtc, if (slave && has_bit(slave->id, kcrtc_st->affected_pipes)) komeda_pipeline_update(slave, old->state); =20 - conn_st =3D wb_conn ? wb_conn->base.base.state : NULL; + conn_st =3D wb_conn ? wb_conn->base.state : NULL; if (conn_st && conn_st->writeback_job) - drm_writeback_queue_job(&wb_conn->base, conn_st); + drm_writeback_queue_job(&wb_conn->base.writeback, conn_st); =20 /* step 2: notify the HW to kickoff the update */ mdev->funcs->flush(mdev, master->id, kcrtc_st->active_pipes); diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/= drm/arm/display/komeda/komeda_kms.h index 83e61c4080c2..9c34302782c0 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h @@ -53,8 +53,8 @@ struct komeda_plane_state { * struct komeda_wb_connector */ struct komeda_wb_connector { - /** @base: &drm_writeback_connector */ - struct drm_writeback_connector base; + /** @base: &drm_connector */ + struct drm_connector base; =20 /** @wb_layer: represents associated writeback pipeline of komeda */ struct komeda_layer *wb_layer; @@ -139,7 +139,7 @@ struct komeda_kms_dev { static inline bool is_writeback_only(struct drm_crtc_state *st) { struct komeda_wb_connector *wb_conn =3D to_kcrtc(st->crtc)->wb_conn; - struct drm_connector *conn =3D wb_conn ? &wb_conn->base.base : NULL; + struct drm_connector *conn =3D wb_conn ? &wb_conn->base : NULL; =20 return conn && (st->connector_mask =3D=3D BIT(drm_connector_index(conn))); } diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/dri= vers/gpu/drm/arm/display/komeda/komeda_wb_connector.c index bcc53d4015f1..fa2f63c142cd 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c @@ -53,7 +53,7 @@ komeda_wb_encoder_atomic_check(struct drm_encoder *encode= r, return -EINVAL; } =20 - wb_layer =3D to_kconn(to_wb_conn(conn_st->connector))->wb_layer; + wb_layer =3D to_kconn(conn_st->connector)->wb_layer; =20 /* * No need for a full modested when the only connector changed is the @@ -151,7 +151,7 @@ static int komeda_wb_connector_add(struct komeda_kms_de= v *kms, =20 kwb_conn->wb_layer =3D kcrtc->master->wb_layer; =20 - wb_conn =3D &kwb_conn->base; + wb_conn =3D &kwb_conn->base.writeback; =20 formats =3D komeda_get_layer_fourcc_list(&mdev->fmt_tbl, kwb_conn->wb_layer->layer_type, @@ -180,9 +180,9 @@ static int komeda_wb_connector_add(struct komeda_kms_de= v *kms, return err; } =20 - drm_connector_helper_add(&wb_conn->base, &komeda_wb_conn_helper_funcs); + drm_connector_helper_add(&kwb_conn->base, &komeda_wb_conn_helper_funcs); =20 - info =3D &kwb_conn->base.base.display_info; + info =3D &kwb_conn->base.display_info; info->bpc =3D __fls(kcrtc->master->improc->supported_color_depths); info->color_formats =3D kcrtc->master->improc->supported_color_formats; =20 diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp= _crtc.c index ebe8e1078777..4402c1de8c69 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -421,7 +421,7 @@ static int malidp_crtc_atomic_check(struct drm_crtc *cr= tc, u32 new_mask =3D crtc_state->connector_mask; =20 if ((old_mask ^ new_mask) =3D=3D - (1 << drm_connector_index(&malidp->mw_connector.base))) + (1 << drm_connector_index(&malidp->mw_connector))) crtc_state->connectors_changed =3D false; } =20 diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_= drv.h index bc0387876dea..aa5599467d27 100644 --- a/drivers/gpu/drm/arm/malidp_drv.h +++ b/drivers/gpu/drm/arm/malidp_drv.h @@ -32,7 +32,7 @@ struct malidp_drm { struct drm_device base; struct malidp_hw_device *dev; struct drm_crtc crtc; - struct drm_writeback_connector mw_connector; + struct drm_connector mw_connector; wait_queue_head_t wq; struct drm_pending_vblank_event *event; atomic_t config_valid; diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_h= w.c index 9b845d3f34e1..5a7bd27d3718 100644 --- a/drivers/gpu/drm/arm/malidp_hw.c +++ b/drivers/gpu/drm/arm/malidp_hw.c @@ -1315,15 +1315,15 @@ static irqreturn_t malidp_se_irq(int irq, void *arg) if (status & se->vsync_irq) { switch (hwdev->mw_state) { case MW_ONESHOT: - drm_writeback_signal_completion(&malidp->mw_connector, 0); + drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0); break; case MW_STOP: - drm_writeback_signal_completion(&malidp->mw_connector, 0); + drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0); /* disable writeback after stop */ hwdev->mw_state =3D MW_NOT_ENABLED; break; case MW_RESTART: - drm_writeback_signal_completion(&malidp->mw_connector, 0); + drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0); fallthrough; /* to a new start */ case MW_START: /* writeback started, need to emulate one-shot mode */ diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_m= w.c index cfb7300e3e95..6842c73f27b9 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -212,7 +212,7 @@ int malidp_mw_connector_init(struct drm_device *drm) if (!malidp->dev->hw->enable_memwrite) return 0; =20 - drm_connector_helper_add(&malidp->mw_connector.base, + drm_connector_helper_add(&malidp->mw_connector, &malidp_mw_connector_helper_funcs); =20 formats =3D get_writeback_formats(malidp, &n_formats); @@ -228,7 +228,7 @@ int malidp_mw_connector_init(struct drm_device *drm) =20 encoder->possible_crtcs =3D drm_crtc_mask(&malidp->crtc); =20 - ret =3D drmm_writeback_connector_init(drm, &malidp->mw_connector, + ret =3D drmm_writeback_connector_init(drm, &malidp->mw_connector.writebac= k, &malidp_mw_connector_funcs, encoder, formats, n_formats); @@ -243,8 +243,8 @@ void malidp_mw_atomic_commit(struct drm_device *drm, struct drm_atomic_commit *old_state) { struct malidp_drm *malidp =3D drm_to_malidp(drm); - struct drm_writeback_connector *mw_conn =3D &malidp->mw_connector; - struct drm_connector_state *conn_state =3D mw_conn->base.state; + struct drm_writeback_connector *mw_conn =3D &malidp->mw_connector.writeba= ck; + struct drm_connector_state *conn_state =3D malidp->mw_connector.state; struct malidp_hw_device *hwdev =3D malidp->dev; struct malidp_mw_connector_state *mw_state; =20 diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index 6441b55cc274..7add982e3a3f 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1472,7 +1472,7 @@ static int prepare_signaling(struct drm_device *dev, f[*num_fences].out_fence_ptr =3D fence_ptr; *fence_state =3D f; =20 - wb_conn =3D drm_connector_to_writeback(conn); + wb_conn =3D &conn->writeback; fence =3D drm_writeback_get_out_fence(wb_conn); if (!fence) return -ENOMEM; diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index 68fdac745f42..c07308e98066 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -89,8 +89,9 @@ static const char *drm_writeback_fence_get_driver_name(st= ruct dma_fence *fence) { struct drm_writeback_connector *wb_connector =3D fence_to_wb_connector(fence); + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); =20 - return wb_connector->base.dev->driver->name; + return connector->dev->driver->name; } =20 static const char * @@ -187,7 +188,7 @@ static int __drm_writeback_connector_init(struct drm_de= vice *dev, struct drm_encoder *enc, const u32 *formats, int n_formats) { - struct drm_connector *connector =3D &wb_connector->base; + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); struct drm_mode_config *config =3D &dev->mode_config; struct drm_property_blob *blob; int ret =3D create_writeback_properties(dev); @@ -269,7 +270,7 @@ int drm_writeback_connector_init(struct drm_device *dev, struct drm_encoder *enc, const u32 *formats, int n_formats) { - struct drm_connector *connector =3D &wb_connector->base; + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); int ret; =20 ret =3D drm_connector_init(dev, connector, con_funcs, @@ -339,7 +340,7 @@ int drmm_writeback_connector_init(struct drm_device *de= v, struct drm_encoder *enc, const u32 *formats, int n_formats) { - struct drm_connector *connector =3D &wb_connector->base; + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); int ret; =20 ret =3D drmm_connector_init(dev, connector, con_funcs, @@ -372,7 +373,7 @@ int drm_writeback_set_fb(struct drm_connector_state *co= nn_state, return -ENOMEM; =20 conn_state->writeback_job->connector =3D - drm_connector_to_writeback(conn_state->connector); + &conn_state->connector->writeback; } =20 drm_framebuffer_assign(&conn_state->writeback_job->fb, fb); @@ -381,13 +382,14 @@ int drm_writeback_set_fb(struct drm_connector_state *= conn_state, =20 int drm_writeback_prepare_job(struct drm_writeback_job *job) { - struct drm_writeback_connector *connector =3D job->connector; + struct drm_writeback_connector *wb_connector =3D job->connector; + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); const struct drm_connector_helper_funcs *funcs =3D - connector->base.helper_private; + connector->helper_private; int ret; =20 if (funcs->prepare_writeback_job) { - ret =3D funcs->prepare_writeback_job(connector, job); + ret =3D funcs->prepare_writeback_job(wb_connector, job); if (ret < 0) return ret; } @@ -433,12 +435,13 @@ EXPORT_SYMBOL(drm_writeback_queue_job); =20 void drm_writeback_cleanup_job(struct drm_writeback_job *job) { - struct drm_writeback_connector *connector =3D job->connector; + struct drm_writeback_connector *wb_connector =3D job->connector; + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); const struct drm_connector_helper_funcs *funcs =3D - connector->base.helper_private; + connector->helper_private; =20 if (job->prepared && funcs->cleanup_writeback_job) - funcs->cleanup_writeback_job(connector, job); + funcs->cleanup_writeback_job(wb_connector, job); =20 if (job->fb) drm_framebuffer_put(job->fb); @@ -520,8 +523,9 @@ struct dma_fence * drm_writeback_get_out_fence(struct drm_writeback_connector *wb_connector) { struct dma_fence *fence; + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); =20 - if (WARN_ON(wb_connector->base.connector_type !=3D + if (WARN_ON(connector->connector_type !=3D DRM_MODE_CONNECTOR_WRITEBACK)) return NULL; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 22433bfbea1e..e2a328225c9e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -481,7 +481,8 @@ static void dpu_encoder_phys_wb_prepare_for_kickoff( return; } =20 - drm_conn =3D &wb_enc->wb_conn->base; + drm_conn =3D + drm_writeback_to_connector(wb_enc->wb_conn); state =3D drm_conn->state; =20 if (wb_enc->wb_conn && wb_enc->wb_job) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/dr= m/msm/disp/dpu1/dpu_writeback.c index e7b09013ae4c..d1211788625a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -29,8 +29,7 @@ static int dpu_wb_conn_get_modes(struct drm_connector *co= nnector) static int dpu_wb_conn_atomic_check(struct drm_connector *connector, struct drm_atomic_commit *state) { - struct drm_writeback_connector *wb_conn =3D drm_connector_to_writeback(co= nnector); - struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(wb_conn); + struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); struct drm_connector_state *conn_state =3D drm_atomic_get_new_connector_state(state, connector); struct drm_crtc *crtc; @@ -88,10 +87,10 @@ static const struct drm_connector_funcs dpu_wb_conn_fun= cs =3D { .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 -static int dpu_wb_conn_prepare_job(struct drm_writeback_connector *connect= or, +static int dpu_wb_conn_prepare_job(struct drm_writeback_connector *wb_conn, struct drm_writeback_job *job) { - + struct drm_connector *connector =3D drm_writeback_to_connector(wb_conn); struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); =20 if (!job->fb) @@ -102,9 +101,10 @@ static int dpu_wb_conn_prepare_job(struct drm_writebac= k_connector *connector, return 0; } =20 -static void dpu_wb_conn_cleanup_job(struct drm_writeback_connector *connec= tor, +static void dpu_wb_conn_cleanup_job(struct drm_writeback_connector *wb_con= nector, struct drm_writeback_job *job) { + struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); =20 if (!job->fb) @@ -132,9 +132,9 @@ int dpu_writeback_init(struct drm_device *dev, struct d= rm_encoder *enc, =20 dpu_wb_conn->maxlinewidth =3D maxlinewidth; =20 - drm_connector_helper_add(&dpu_wb_conn->base.base, &dpu_wb_conn_helper_fun= cs); + drm_connector_helper_add(&dpu_wb_conn->base, &dpu_wb_conn_helper_funcs); =20 - rc =3D drmm_writeback_connector_init(dev, &dpu_wb_conn->base, + rc =3D drmm_writeback_connector_init(dev, &dpu_wb_conn->base.writeback, &dpu_wb_conn_funcs, enc, format_list, num_formats); =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h b/drivers/gpu/dr= m/msm/disp/dpu1/dpu_writeback.h index 4b11cca8014c..9ebf15392b20 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h @@ -16,12 +16,12 @@ #include "dpu_encoder_phys.h" =20 struct dpu_wb_connector { - struct drm_writeback_connector base; + struct drm_connector base; struct drm_encoder *wb_enc; u32 maxlinewidth; }; =20 -static inline struct dpu_wb_connector *to_dpu_wb_conn(struct drm_writeback= _connector *conn) +static inline struct dpu_wb_connector *to_dpu_wb_conn(struct drm_connector= *conn) { return container_of(conn, struct dpu_wb_connector, base); } diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h b/drivers/gpu/d= rm/renesas/rcar-du/rcar_du_crtc.h index 8857926e109a..11372ccfdd38 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h @@ -43,7 +43,7 @@ struct rcar_du_vsp; * @cmm: CMM associated with this CRTC * @vsp: VSP feeding video to this CRTC * @vsp_pipe: index of the VSP pipeline feeding video to this CRTC - * @writeback: the writeback connector + * @wb_connector: the drm connector which contains the writeback connector */ struct rcar_du_crtc { struct drm_crtc crtc; @@ -73,11 +73,11 @@ struct rcar_du_crtc { const char *const *sources; unsigned int sources_count; =20 - struct drm_writeback_connector writeback; + struct drm_connector wb_connector; }; =20 #define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc) -#define wb_to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, writeback) +#define wb_to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, wb_connect= or) =20 /** * struct rcar_du_crtc_state - Driver-specific CRTC state 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 ecfd4fc1f210..39be854c465a 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -50,7 +50,8 @@ static int rcar_du_wb_conn_get_modes(struct drm_connector= *connector) static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connecto= r, struct drm_writeback_job *job) { - struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(connector); + struct drm_connector *conn =3D drm_writeback_to_connector(connector); + struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(conn); struct rcar_du_wb_job *rjob; int ret; =20 @@ -75,7 +76,8 @@ static int rcar_du_wb_prepare_job(struct drm_writeback_co= nnector *connector, static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *connect= or, struct drm_writeback_job *job) { - struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(connector); + struct drm_connector *conn =3D drm_writeback_to_connector(connector); + struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(conn); struct rcar_du_wb_job *rjob =3D job->priv; =20 if (!job->fb) @@ -199,7 +201,7 @@ static const u32 writeback_formats[] =3D { int rcar_du_writeback_init(struct rcar_du_device *rcdu, struct rcar_du_crtc *rcrtc) { - struct drm_writeback_connector *wb_conn =3D &rcrtc->writeback; + struct drm_writeback_connector *wb_conn =3D &rcrtc->wb_connector.writebac= k; struct drm_encoder *encoder; =20 encoder =3D drmm_plain_encoder_alloc(&rcdu->ddev, NULL, @@ -211,7 +213,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, =20 encoder->possible_crtcs =3D drm_crtc_mask(&rcrtc->crtc); =20 - drm_connector_helper_add(&wb_conn->base, + drm_connector_helper_add(&rcrtc->wb_connector, &rcar_du_wb_conn_helper_funcs); =20 return drmm_writeback_connector_init(&rcdu->ddev, wb_conn, @@ -230,7 +232,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc, struct drm_framebuffer *fb; unsigned int i; =20 - state =3D rcrtc->writeback.base.state; + state =3D rcrtc->wb_connector.state; if (!state || !state->writeback_job) return; =20 @@ -245,10 +247,10 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcr= tc, cfg->mem[i] =3D sg_dma_address(rjob->sg_tables[i].sgl) + fb->offsets[i]; =20 - drm_writeback_queue_job(&rcrtc->writeback, state); + drm_writeback_queue_job(&rcrtc->wb_connector.writeback, state); } =20 void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc) { - drm_writeback_signal_completion(&rcrtc->writeback, 0); + drm_writeback_signal_completion(&rcrtc->wb_connector.writeback, 0); } diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 3fd89fccfa10..8a4afa6a1eec 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -168,7 +168,7 @@ struct vc4_txp { struct platform_device *pdev; =20 struct vc4_encoder encoder; - struct drm_writeback_connector connector; + struct drm_connector connector; =20 void __iomem *regs; }; @@ -177,7 +177,7 @@ struct vc4_txp { container_of_const(_encoder, struct vc4_txp, encoder.base) =20 #define connector_to_vc4_txp(_connector) \ - container_of_const(_connector, struct vc4_txp, connector.base) + container_of_const(_connector, struct vc4_txp, connector) =20 static const struct debugfs_reg32 txp_regs[] =3D { VC4_REG32(TXP_DST_PTR), @@ -357,7 +357,7 @@ static void vc4_txp_connector_atomic_commit(struct drm_= connector *conn, =20 TXP_WRITE(TXP_DST_CTRL, ctrl); =20 - drm_writeback_queue_job(&txp->connector, conn_state); + drm_writeback_queue_job(&txp->connector.writeback, conn_state); =20 drm_dev_exit(idx); } @@ -505,7 +505,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *dat= a) */ TXP_WRITE(TXP_DST_CTRL, TXP_READ(TXP_DST_CTRL) & ~TXP_EI); vc4_crtc_handle_vblank(vc4_crtc); - drm_writeback_signal_completion(&txp->connector, 0); + drm_writeback_signal_completion(&txp->connector.writeback, 0); =20 return IRQ_HANDLED; } @@ -599,9 +599,9 @@ static int vc4_txp_bind(struct device *dev, struct devi= ce *master, void *data) if (ret) return ret; =20 - drm_connector_helper_add(&txp->connector.base, + drm_connector_helper_add(&txp->connector, &vc4_txp_connector_helper_funcs); - ret =3D drmm_writeback_connector_init(drm, &txp->connector, + ret =3D drmm_writeback_connector_init(drm, &txp->connector.writeback, &vc4_txp_connector_funcs, encoder, drm_fmts, ARRAY_SIZE(drm_fmts)); @@ -623,7 +623,7 @@ static void vc4_txp_unbind(struct device *dev, struct d= evice *master, { struct vc4_txp *txp =3D dev_get_drvdata(dev); =20 - drm_connector_cleanup(&txp->connector.base); + drm_connector_cleanup(&txp->connector); } =20 static const struct component_ops vc4_txp_ops =3D { diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 83d217085ad0..27fb6a7b55bb 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -652,7 +652,7 @@ void vkms_composer_worker(struct work_struct *work) return; =20 if (wb_pending) { - drm_writeback_signal_completion(&out->wb_connector, 0); + drm_writeback_signal_completion(&out->wb_connector.writeback, 0); spin_lock_irq(&out->composer_lock); crtc_state->wb_pending =3D false; spin_unlock_irq(&out->composer_lock); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 0933e4ce0ff0..145a7909388b 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -217,7 +217,7 @@ struct vkms_crtc_state { */ struct vkms_output { struct drm_crtc crtc; - struct drm_writeback_connector wb_connector; + struct drm_connector wb_connector; struct drm_encoder wb_encoder; struct workqueue_struct *composer_workq; spinlock_t lock; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index ecf29a2c0c8e..64d524d2168f 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -103,10 +103,13 @@ static int vkms_wb_prepare_job(struct drm_writeback_c= onnector *wb_connector, return ret; } =20 -static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector, +static void vkms_wb_cleanup_job(struct drm_writeback_connector *wb_conn, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob =3D job->priv; + struct drm_connector *connector =3D container_of(wb_conn, + struct drm_connector, + writeback); struct vkms_output *vkms_output =3D container_of(connector, struct vkms_output, wb_connector); @@ -128,8 +131,8 @@ static void vkms_wb_atomic_commit(struct drm_connector = *conn, struct drm_connector_state *connector_state =3D drm_atomic_get_new_connec= tor_state(state, conn); struct vkms_output *output =3D drm_crtc_to_vkms_output(connector_state->c= rtc); - struct drm_writeback_connector *wb_conn =3D &output->wb_connector; - struct drm_connector_state *conn_state =3D wb_conn->base.state; + struct drm_writeback_connector *wb_conn =3D &output->wb_connector.writeba= ck; + struct drm_connector_state *conn_state =3D output->wb_connector.state; struct vkms_crtc_state *crtc_state =3D output->composer_state; struct drm_framebuffer *fb =3D connector_state->writeback_job->fb; u16 crtc_height =3D crtc_state->base.mode.vdisplay; @@ -167,7 +170,7 @@ static const struct drm_connector_helper_funcs vkms_wb_= conn_helper_funcs =3D { int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_output *vkms_output) { - struct drm_writeback_connector *wb =3D &vkms_output->wb_connector; + struct drm_writeback_connector *wb =3D &vkms_output->wb_connector.writeba= ck; int ret; =20 ret =3D drmm_encoder_init(&vkmsdev->drm, &vkms_output->wb_encoder, @@ -178,7 +181,7 @@ int vkms_enable_writeback_connector(struct vkms_device = *vkmsdev, vkms_output->wb_encoder.possible_clones |=3D drm_encoder_mask(&vkms_output->wb_encoder); =20 - drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); + drm_connector_helper_add(&vkms_output->wb_connector, &vkms_wb_conn_helper= _funcs); =20 return drmm_writeback_connector_init(&vkmsdev->drm, wb, &vkms_wb_connector_funcs, diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 5ad62c207d00..d99f6bf7e644 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1987,6 +1987,61 @@ struct drm_connector_cec { void *data; }; =20 +/** + * struct drm_writeback_connector - DRM writeback connector + */ +struct drm_writeback_connector { + /** + * @pixel_formats_blob_ptr: + * + * DRM blob property data for the pixel formats list on writeback + * connectors + * See also drm_writeback_connector_init() + */ + struct drm_property_blob *pixel_formats_blob_ptr; + + /** @job_lock: Protects job_queue */ + spinlock_t job_lock; + + /** + * @job_queue: + * + * Holds a list of a connector's writeback jobs; the last item is the + * most recent. The first item may be either waiting for the hardware + * to begin writing, or currently being written. + * + * See also: drm_writeback_queue_job() and + * drm_writeback_signal_completion() + */ + struct list_head job_queue; + + /** + * @fence_context: + * + * timeline context used for fence operations. + */ + unsigned int fence_context; + /** + * @fence_lock: + * + * spinlock to protect the fences in the fence_context. + */ + spinlock_t fence_lock; + /** + * @fence_seqno: + * + * Seqno variable used as monotonic counter for the fences + * created on the connector's timeline. + */ + unsigned long fence_seqno; + /** + * @timeline_name: + * + * The name of the connector's fence timeline. + */ + char timeline_name[32]; +}; + /** * struct drm_connector - central DRM connector control structure * @@ -2396,10 +2451,16 @@ struct drm_connector { */ struct llist_node free_node; =20 - /** - * @hdmi: HDMI-related variable and properties. - */ - struct drm_connector_hdmi hdmi; + union { + /** + * @hdmi: HDMI-related variable and properties. + */ + struct drm_connector_hdmi hdmi; + /** + * @writeback: Writeback related valriables. + */ + struct drm_writeback_connector writeback; + }; =20 /** * @hdmi_audio: HDMI codec properties and non-DRM state. diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 958466a05e60..702141099520 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -15,66 +15,6 @@ #include #include =20 -/** - * struct drm_writeback_connector - DRM writeback connector - */ -struct drm_writeback_connector { - /** - * @base: base drm_connector object - */ - struct drm_connector base; - - /** - * @pixel_formats_blob_ptr: - * - * DRM blob property data for the pixel formats list on writeback - * connectors - * See also drm_writeback_connector_init() - */ - struct drm_property_blob *pixel_formats_blob_ptr; - - /** @job_lock: Protects job_queue */ - spinlock_t job_lock; - - /** - * @job_queue: - * - * Holds a list of a connector's writeback jobs; the last item is the - * most recent. The first item may be either waiting for the hardware - * to begin writing, or currently being written. - * - * See also: drm_writeback_queue_job() and - * drm_writeback_signal_completion() - */ - struct list_head job_queue; - - /** - * @fence_context: - * - * timeline context used for fence operations. - */ - unsigned int fence_context; - /** - * @fence_lock: - * - * spinlock to protect the fences in the fence_context. - */ - spinlock_t fence_lock; - /** - * @fence_seqno: - * - * Seqno variable used as monotonic counter for the fences - * created on the connector's timeline. - */ - unsigned long fence_seqno; - /** - * @timeline_name: - * - * The name of the connector's fence timeline. - */ - char timeline_name[32]; -}; - /** * struct drm_writeback_job - DRM writeback job */ @@ -131,10 +71,10 @@ struct drm_writeback_job { void *priv; }; =20 -static inline struct drm_writeback_connector * -drm_connector_to_writeback(struct drm_connector *connector) +static inline struct drm_connector * +drm_writeback_to_connector(struct drm_writeback_connector *wb_connector) { - return container_of(connector, struct drm_writeback_connector, base); + return container_of(wb_connector, struct drm_connector, writeback); } =20 int drm_writeback_connector_init(struct drm_device *dev, --=20 2.34.1 From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 C2CA832C957 for ; Fri, 22 May 2026 05:03:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426229; cv=none; b=dv84GXQx4misKNz6M1vTvyqBoOUM+ouCSWxzZve2i3xWdtdYufKbW457IN7uA8ll4loVFGp/RG4SiS8qjkByDtdbwhthj78zdM/E4xTQTFEnEWQSnRE+JXl7liKGo71OkAaMP/E4ZzadxCP5rLHBxYlA1wubGo21AHMClP+TINo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426229; c=relaxed/simple; bh=UvW0XpDPCK6Kr1CBnCd+1TZIum/Fu1ZMLkKUl6SOTss=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TN6wmJaL6OZMoSV8j5YAZu3hxZDESY5bl4xMNlyMOeXylfGZQoA+ONufvE3PeWBITNJrus1ay/hbizyXkmzzKcHdZaaiJsOXw/XY8b3F1SCI7xy3Ze7+vwhOaRk4E1WuJQIINC/Jc4sBvwiMbqKeE0ARl7IAfv2qczRWl8UTzDw= 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=Pj5p7BVk; arc=none smtp.client-ip=198.175.65.11 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="Pj5p7BVk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426228; x=1810962228; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UvW0XpDPCK6Kr1CBnCd+1TZIum/Fu1ZMLkKUl6SOTss=; b=Pj5p7BVk6XnmUusMF+MDHChu9CIA3g2c9V8mtoWB5BOp8Yxo6ARZz16E k0I3rODbcIV8x/hgRMelKQqPHd8x1I9FQxAeJPrN4bbpnhWPNe7wGh0GM m2rCtycRSgRBH4xJ9ut/8ECLqu+kDDXO9xEPEEvm6dSj5Y38fvn3gakDt AcAr3VkXu5+xXtJyphz6gEZ3wr8+SELwj+VWQSd3kjgfz3L37gRFLwKBK bPZzsgc7lDCYhzGW97SnB5/RDhPI1XMgjoADmxR8EW6zj00dAaSvxy4UU NLcwMtaJg5/WyTYwS7jhRI12yFBnWSIIRVti05iFXLAHXO/0zttcL7XSh w==; X-CSE-ConnectionGUID: OcXyKmP5QE6uJ3mlw8MH2w== X-CSE-MsgGUID: jm3+e3qYT4CsvRRqA/FaZQ== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651711" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651711" 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:03:48 -0700 X-CSE-ConnectionGUID: 4hMPcObuSHmmGZIJOBxw1Q== X-CSE-MsgGUID: FvsleNuaSdqrcjBgWUYeoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946288" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa010.jf.intel.com with ESMTP; 21 May 2026 22:03:42 -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 Subject: [PATCH v5 2/7] drm: writeback: Modify writeback init helpers Date: Fri, 22 May 2026 10:33:08 +0530 Message-Id: <20260522050313.1800378-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The writeback connector init helpers (drm_writeback_connector_init, drm_writeback_connector_init_with_encoder, drmm_writeback_connector_init and drmm_writeback_connector_init_with_encoder) require 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. Even where such is not the case, update to use the top level object for consistency across the interface. Signed-off-by: Suraj Kandpal Reviewed-by: John Harrison --- v4 -> v5: - Make @connector kerneldoc wording consistent across the series (John) - Fix Drm -> DRM (John) v3 -> v4: - Update subject line for consitency (John) - Update commit message across commits for consitency (John) - Rename writeback to wb_connector in rcar_du_crtc for clarity (John) drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 2 +- .../gpu/drm/arm/display/komeda/komeda_wb_connector.c | 5 +---- drivers/gpu/drm/arm/malidp_mw.c | 2 +- drivers/gpu/drm/drm_writeback.c | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 3 +-- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- drivers/gpu/drm/vkms/vkms_writeback.c | 4 ++-- include/drm/drm_writeback.h | 4 ++-- 9 files changed, 16 insertions(+), 20 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 6fb8cb4d520c..bb4945f01616 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 @@ -202,7 +202,7 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_m= anager *dm, =20 drm_connector_helper_add(&wbcon->base, &amdgpu_dm_wb_conn_helper_funcs); =20 - res =3D drmm_writeback_connector_init(&dm->adev->ddev, &wbcon->base.write= back, + res =3D drmm_writeback_connector_init(&dm->adev->ddev, &wbcon->base, &amdgpu_dm_wb_connector_funcs, encoder, amdgpu_dm_wb_formats, diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/dri= vers/gpu/drm/arm/display/komeda/komeda_wb_connector.c index fa2f63c142cd..85b34375d275 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c @@ -135,7 +135,6 @@ static int komeda_wb_connector_add(struct komeda_kms_de= v *kms, { struct komeda_dev *mdev =3D kms->base.dev_private; struct komeda_wb_connector *kwb_conn; - struct drm_writeback_connector *wb_conn; struct drm_display_info *info; struct drm_encoder *encoder; =20 @@ -151,8 +150,6 @@ static int komeda_wb_connector_add(struct komeda_kms_de= v *kms, =20 kwb_conn->wb_layer =3D kcrtc->master->wb_layer; =20 - wb_conn =3D &kwb_conn->base.writeback; - formats =3D komeda_get_layer_fourcc_list(&mdev->fmt_tbl, kwb_conn->wb_layer->layer_type, &n_formats); @@ -170,7 +167,7 @@ static int komeda_wb_connector_add(struct komeda_kms_de= v *kms, =20 encoder->possible_crtcs =3D drm_crtc_mask(&kcrtc->base); =20 - err =3D drmm_writeback_connector_init(&kms->base, wb_conn, + err =3D drmm_writeback_connector_init(&kms->base, &kwb_conn->base, &komeda_wb_connector_funcs, encoder, formats, n_formats); diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_m= w.c index 6842c73f27b9..c6d11c7af1e4 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -228,7 +228,7 @@ int malidp_mw_connector_init(struct drm_device *drm) =20 encoder->possible_crtcs =3D drm_crtc_mask(&malidp->crtc); =20 - ret =3D drmm_writeback_connector_init(drm, &malidp->mw_connector.writebac= k, + ret =3D drmm_writeback_connector_init(drm, &malidp->mw_connector, &malidp_mw_connector_funcs, encoder, formats, n_formats); diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index c07308e98066..cfadb40e390b 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -240,7 +240,7 @@ static int __drm_writeback_connector_init(struct drm_de= vice *dev, * a custom encoder * * @dev: DRM device - * @wb_connector: Writeback connector to initialize + * @connector: DRM connector which contains the writeback connector to ini= tialize * @enc: handle to the already initialized drm encoder * @con_funcs: Connector funcs vtable * @formats: Array of supported pixel formats for the writeback engine @@ -265,12 +265,12 @@ static int __drm_writeback_connector_init(struct drm_= device *dev, * Returns: 0 on success, or a negative error code */ int drm_writeback_connector_init(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, + struct drm_connector *connector, const struct drm_connector_funcs *con_funcs, struct drm_encoder *enc, const u32 *formats, int n_formats) { - struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); + struct drm_writeback_connector *wb_connector =3D &connector->writeback; int ret; =20 ret =3D drm_connector_init(dev, connector, con_funcs, @@ -319,7 +319,7 @@ static void drm_writeback_connector_cleanup(struct drm_= device *dev, * a custom encoder * * @dev: DRM device - * @wb_connector: Writeback connector to initialize + * @connector: DRM connector which contains the writeback connector to ini= tialize * @con_funcs: Connector funcs vtable * @enc: Encoder to connect this writeback connector * @formats: Array of supported pixel formats for the writeback engine @@ -335,12 +335,12 @@ static void drm_writeback_connector_cleanup(struct dr= m_device *dev, * Returns: 0 on success, or a negative error code */ int drmm_writeback_connector_init(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, + struct drm_connector *connector, const struct drm_connector_funcs *con_funcs, struct drm_encoder *enc, const u32 *formats, int n_formats) { - struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); + struct drm_writeback_connector *wb_connector =3D &connector->writeback; int ret; =20 ret =3D drmm_connector_init(dev, connector, con_funcs, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/dr= m/msm/disp/dpu1/dpu_writeback.c index d1211788625a..c9f53490c1a7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -134,7 +134,7 @@ int dpu_writeback_init(struct drm_device *dev, struct d= rm_encoder *enc, =20 drm_connector_helper_add(&dpu_wb_conn->base, &dpu_wb_conn_helper_funcs); =20 - rc =3D drmm_writeback_connector_init(dev, &dpu_wb_conn->base.writeback, + rc =3D drmm_writeback_connector_init(dev, &dpu_wb_conn->base, &dpu_wb_conn_funcs, enc, format_list, num_formats); =20 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 39be854c465a..6b27307941a4 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -201,7 +201,6 @@ static const u32 writeback_formats[] =3D { int rcar_du_writeback_init(struct rcar_du_device *rcdu, struct rcar_du_crtc *rcrtc) { - struct drm_writeback_connector *wb_conn =3D &rcrtc->wb_connector.writebac= k; struct drm_encoder *encoder; =20 encoder =3D drmm_plain_encoder_alloc(&rcdu->ddev, NULL, @@ -216,7 +215,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, drm_connector_helper_add(&rcrtc->wb_connector, &rcar_du_wb_conn_helper_funcs); =20 - return drmm_writeback_connector_init(&rcdu->ddev, wb_conn, + return drmm_writeback_connector_init(&rcdu->ddev, &rcrtc->wb_connector, &rcar_du_wb_conn_funcs, encoder, writeback_formats, diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 8a4afa6a1eec..c762b93738d3 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -601,7 +601,7 @@ static int vc4_txp_bind(struct device *dev, struct devi= ce *master, void *data) =20 drm_connector_helper_add(&txp->connector, &vc4_txp_connector_helper_funcs); - ret =3D drmm_writeback_connector_init(drm, &txp->connector.writeback, + ret =3D drmm_writeback_connector_init(drm, &txp->connector, &vc4_txp_connector_funcs, encoder, drm_fmts, ARRAY_SIZE(drm_fmts)); diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index 64d524d2168f..9341533b0325 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -170,7 +170,6 @@ static const struct drm_connector_helper_funcs vkms_wb_= conn_helper_funcs =3D { int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_output *vkms_output) { - struct drm_writeback_connector *wb =3D &vkms_output->wb_connector.writeba= ck; int ret; =20 ret =3D drmm_encoder_init(&vkmsdev->drm, &vkms_output->wb_encoder, @@ -183,7 +182,8 @@ int vkms_enable_writeback_connector(struct vkms_device = *vkmsdev, =20 drm_connector_helper_add(&vkms_output->wb_connector, &vkms_wb_conn_helper= _funcs); =20 - return drmm_writeback_connector_init(&vkmsdev->drm, wb, + return drmm_writeback_connector_init(&vkmsdev->drm, + &vkms_output->wb_connector, &vkms_wb_connector_funcs, &vkms_output->wb_encoder, vkms_wb_formats, diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 702141099520..c6960c7e634e 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -78,13 +78,13 @@ drm_writeback_to_connector(struct drm_writeback_connect= or *wb_connector) } =20 int drm_writeback_connector_init(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, + struct drm_connector *connector, const struct drm_connector_funcs *con_funcs, struct drm_encoder *enc, const u32 *formats, int n_formats); =20 int drmm_writeback_connector_init(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, + struct drm_connector *connector, const struct drm_connector_funcs *con_funcs, struct drm_encoder *enc, const u32 *formats, int n_formats); --=20 2.34.1 From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 C26B8363C6C for ; Fri, 22 May 2026 05:03:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426236; cv=none; b=WJB6SUhPXLeJssDMMgqm5EN7Z982GH+q7s9Cl/ZWO7MGwNhtMPOKh3g6qAQ9NJGtL6KK9Ao5AuhqyUs4QsN6hdvpHM3i1WcBWHpyGadF1ri4nsp3sEn4QXfbnQRbhTNPYOWlYjM+5zzUkT+qugqsoQUCXI+eamreDFj/kV4/uxQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426236; c=relaxed/simple; bh=0J/E5j2XuSySqGQLv6nStulCa3MIKtILbDtoBbzje4Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cRRWAG453gAwfgSY5CR/FYCJkWcncfNnVldZPTUDDPdgZnc1yJcRyVjNvKmNwHFTCIis/btt9f+qjJIcYSZFlVZ8UIQowqJbE4kRqPUK4kL3c37XURzZ5lekGuJXCY3woF3ffjzRH43OJ02oSHmJ70rv6KfW6McwcG+h3zsokTk= 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=YgG46iQ+; arc=none smtp.client-ip=198.175.65.11 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="YgG46iQ+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426234; x=1810962234; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0J/E5j2XuSySqGQLv6nStulCa3MIKtILbDtoBbzje4Y=; b=YgG46iQ+TG1hZoqt/V6P5GnevVVe5P4ubsQMX6J1aJfH3ESkaEXx0/BZ TYxbuNd3+ZelrPiHiKFoe2iL0dyG9QFWLlprQ/mQnO27OT44aZ1j48S39 u288+4G/MXAq8pHu8CNa0lpZa2HDoYMajCVH+cJ/LsKFwLk0urGsI0POu C2OfoeSIPLowQujSuwFqN0PfLcr8KQJB7Ac7ZFawkuTBW2iUA4XS/jdbJ tzL8os/fdsxsT01yVJ4xVGE5pgd2QnxpVPAPhrq/ZJ3+WcWYDg76xnscA 2LaXikF3CL0dtOKPAbZbLY2HoULaX/BItHscWWdw0XtmcGlXQNaRImppH A==; X-CSE-ConnectionGUID: bRLmUCC8TOiC8/g7YZ+MSA== X-CSE-MsgGUID: MT9KDziEQb2veFV//BmxUg== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651730" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651730" 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:03:54 -0700 X-CSE-ConnectionGUID: 0e/Z/FjQQW6XFhsFYwNmjQ== X-CSE-MsgGUID: VCYqhC4eTO6cFbp3mytFTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946312" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa010.jf.intel.com with ESMTP; 21 May 2026 22:03:48 -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 3/7] drm: writeback: Modify drm_writeback_queue_job helper Date: Fri, 22 May 2026 10:33:09 +0530 Message-Id: <20260522050313.1800378-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" drm_writeback_queue_job() 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 is also consistent with the rest of the writeback interface which is being updated to use drm_connector as the top level handle. Signed-off-by: Suraj Kandpal Reviewed-by: Dmitry Baryshkov Reviewed-by: John Harrison --- v4 -> v5: - Make @connector kerneldoc wording consistent across the series (John) 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.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- drivers/gpu/drm/arm/malidp_mw.c | 3 +-- drivers/gpu/drm/drm_writeback.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 2 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 2 +- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- drivers/gpu/drm/vkms/vkms_writeback.c | 3 +-- include/drm/drm_writeback.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index d022ebb6600d..0772e3b01fa5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -11005,7 +11005,7 @@ static void dm_set_writeback(struct amdgpu_display_= manager *dm, =20 acrtc->wb_pending =3D true; acrtc->wb_conn =3D wb_conn; - drm_writeback_queue_job(wb_conn, new_con_state); + drm_writeback_queue_job(connector, new_con_state); } =20 static void amdgpu_dm_update_hdcp(struct drm_atomic_commit *state) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index 6611920c45fb..c64cf5d97e62 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -271,7 +271,7 @@ komeda_crtc_do_flush(struct drm_crtc *crtc, =20 conn_st =3D wb_conn ? wb_conn->base.state : NULL; if (conn_st && conn_st->writeback_job) - drm_writeback_queue_job(&wb_conn->base.writeback, conn_st); + drm_writeback_queue_job(&wb_conn->base, conn_st); =20 /* step 2: notify the HW to kickoff the update */ mdev->funcs->flush(mdev, master->id, kcrtc_st->active_pipes); diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_m= w.c index c6d11c7af1e4..0f419b2b79ab 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -243,7 +243,6 @@ void malidp_mw_atomic_commit(struct drm_device *drm, struct drm_atomic_commit *old_state) { struct malidp_drm *malidp =3D drm_to_malidp(drm); - struct drm_writeback_connector *mw_conn =3D &malidp->mw_connector.writeba= ck; struct drm_connector_state *conn_state =3D malidp->mw_connector.state; struct malidp_hw_device *hwdev =3D malidp->dev; struct malidp_mw_connector_state *mw_state; @@ -263,7 +262,7 @@ void malidp_mw_atomic_commit(struct drm_device *drm, &mw_state->addrs[0], mw_state->format); =20 - drm_writeback_queue_job(mw_conn, conn_state); + drm_writeback_queue_job(&malidp->mw_connector, conn_state); hwdev->hw->enable_memwrite(hwdev, mw_state->addrs, mw_state->pitches, mw_state->n_planes, fb->width, fb->height, mw_state->format, diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index cfadb40e390b..56871bf5e44d 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -401,7 +401,8 @@ EXPORT_SYMBOL(drm_writeback_prepare_job); =20 /** * drm_writeback_queue_job - Queue a writeback job for later signalling - * @wb_connector: The writeback connector to queue a job on + * @connector: DRM connector which contains the writeback connector to + * queue a job on * @conn_state: The connector state containing the job to queue * * This function adds the job contained in @conn_state to the job_queue fo= r a @@ -418,9 +419,10 @@ EXPORT_SYMBOL(drm_writeback_prepare_job); * * See also: drm_writeback_signal_completion() */ -void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector, +void drm_writeback_queue_job(struct drm_connector *connector, struct drm_connector_state *conn_state) { + struct drm_writeback_connector *wb_connector =3D &connector->writeback; struct drm_writeback_job *job; unsigned long flags; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index e2a328225c9e..0a4026f22274 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -486,7 +486,7 @@ static void dpu_encoder_phys_wb_prepare_for_kickoff( state =3D drm_conn->state; =20 if (wb_enc->wb_conn && wb_enc->wb_job) - drm_writeback_queue_job(wb_enc->wb_conn, state); + drm_writeback_queue_job(drm_conn, state); =20 dpu_encoder_phys_wb_setup(phys_enc); =20 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 6b27307941a4..5cd6c81a9710 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -246,7 +246,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc, cfg->mem[i] =3D sg_dma_address(rjob->sg_tables[i].sgl) + fb->offsets[i]; =20 - drm_writeback_queue_job(&rcrtc->wb_connector.writeback, state); + drm_writeback_queue_job(&rcrtc->wb_connector, state); } =20 void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index c762b93738d3..46330b6f9a12 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -357,7 +357,7 @@ static void vc4_txp_connector_atomic_commit(struct drm_= connector *conn, =20 TXP_WRITE(TXP_DST_CTRL, ctrl); =20 - drm_writeback_queue_job(&txp->connector.writeback, conn_state); + drm_writeback_queue_job(&txp->connector, conn_state); =20 drm_dev_exit(idx); } diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index 9341533b0325..2e3df9388dd2 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -131,7 +131,6 @@ static void vkms_wb_atomic_commit(struct drm_connector = *conn, struct drm_connector_state *connector_state =3D drm_atomic_get_new_connec= tor_state(state, conn); struct vkms_output *output =3D drm_crtc_to_vkms_output(connector_state->c= rtc); - struct drm_writeback_connector *wb_conn =3D &output->wb_connector.writeba= ck; struct drm_connector_state *conn_state =3D output->wb_connector.state; struct vkms_crtc_state *crtc_state =3D output->composer_state; struct drm_framebuffer *fb =3D connector_state->writeback_job->fb; @@ -153,7 +152,7 @@ static void vkms_wb_atomic_commit(struct drm_connector = *conn, crtc_state->active_writeback =3D active_wb; crtc_state->wb_pending =3D true; spin_unlock_irq(&output->composer_lock); - drm_writeback_queue_job(wb_conn, connector_state); + drm_writeback_queue_job(&output->wb_connector, connector_state); active_wb->pixel_write =3D get_pixel_write_function(wb_format); drm_rect_init(&wb_frame_info->src, 0, 0, crtc_width, crtc_height); drm_rect_init(&wb_frame_info->dst, 0, 0, crtc_width, crtc_height); diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index c6960c7e634e..b4c11d380df0 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -94,7 +94,7 @@ int drm_writeback_set_fb(struct drm_connector_state *conn= _state, =20 int drm_writeback_prepare_job(struct drm_writeback_job *job); =20 -void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector, +void drm_writeback_queue_job(struct drm_connector *wb_connector, struct drm_connector_state *conn_state); =20 void drm_writeback_cleanup_job(struct drm_writeback_job *job); --=20 2.34.1 From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 AE6573624AB for ; Fri, 22 May 2026 05:03:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426241; cv=none; b=K0LOZSVQHvwbiNom/Fe7Wsc2FsZ1Ysaqce1/uvKmYctiL3gz57IBwXMimVPORzgR8QybuLIS5RTo+8fDGMg1k0Nnx0ihY6QBFFoXBwX/+xbDi8yxCil+P0QfcRljW2fgiIIlOHUpIH8YCzUfWvOOI+apK9SkLOFF6f7LyuISlsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426241; c=relaxed/simple; bh=0RKQI497izkyUpuLirWz7toRkqW7MaZEh3L84pVGeSg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GCEkMJspsBTxugCY0wtqAnAuc2QcHc4NKct3wbGVoEH+n4vFaItWPk7fsvpj7+m2X/nF1eenUFkbRA50VTQ+bg8tU7UE1lgjuhmKMau3W1YVJBlzS9lwpAofD+CeHXbi9k38ylILfs6ZsLNFGfSyWvsms+hJtKf2eNyK7YEHNUA= 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=TyeQNq0b; arc=none smtp.client-ip=198.175.65.11 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="TyeQNq0b" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426240; x=1810962240; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0RKQI497izkyUpuLirWz7toRkqW7MaZEh3L84pVGeSg=; b=TyeQNq0bZxSVj3J/xsvavVaC1mvAdXSOcTdaHuXyON/Wywdn+TJWwRd4 V6VS5g036NrK+E8qbrmlojHyDCkma6+R6cf6s95F0ML2G0aHZG8LTixcg 0+PF26SnkYUBi2Q/ip1BiE7UgDTtLZheMiwg+CJctfpLfoVs/NjdVZO6V Zu+7k0No/UCUhjLR/6VQ1uvie1IdLGO2xNRgxebh6c0Ol8ELgJ12+8o17 ZntQWwkbv0WaZsJ14PkOfjOVSc98CcQ2M0C+19vI9XROBskdDxMlm8dUp sQX+x1F9dJVnghZ9RAklp567uYB81VRm4aH36qKxkCw3Zf0HGr5go/MgU A==; X-CSE-ConnectionGUID: 2wJ5LCYGSL+WeCykdemJQA== X-CSE-MsgGUID: jcNNXXs+Rz6hkwXwTgR93w== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651742" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651742" 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:00 -0700 X-CSE-ConnectionGUID: MQ2LoF5qQ4GtOxcGz9Vguw== X-CSE-MsgGUID: Armi9w3jQh6IzunHbdpahQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946340" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa010.jf.intel.com with ESMTP; 21 May 2026 22:03: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: 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 4/7] drm: writeback: Modify drm_writeback_signal_completion helper Date: Fri, 22 May 2026 10:33:10 +0530 Message-Id: <20260522050313.1800378-5-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" drm_writeback_signal_completion() 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. Update to use the top level object for consistency across the writeback interface. Signed-off-by: Suraj Kandpal Reviewed-by: Dmitry Baryshkov Reviewed-by: John Harrison --- v4 -> v5: - Make @connector kerneldoc wording consistent across the series (John) 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.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- drivers/gpu/drm/arm/malidp_hw.c | 6 +++--- drivers/gpu/drm/drm_writeback.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 4 ++-- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 2 +- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- drivers/gpu/drm/vkms/vkms_composer.c | 2 +- include/drm/drm_writeback.h | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 0772e3b01fa5..c2ec7f4883d4 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -681,7 +681,7 @@ static void dm_crtc_high_irq(void *interrupt_params) 100LL, (v_total * stream->timing.h_total)); mdelay(1000 / refresh_hz); =20 - drm_writeback_signal_completion(acrtc->wb_conn, 0); + drm_writeback_signal_completion(acrtc->connector, 0); dc_stream_fc_disable_writeback(adev->dm.dc, acrtc->dm_irq_params.stream, 0); } diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index c64cf5d97e62..da6bfe2797aa 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -213,7 +213,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcr= tc, struct komeda_wb_connector *wb_conn =3D kcrtc->wb_conn; =20 if (wb_conn) - drm_writeback_signal_completion(&wb_conn->base.writeback, 0); + drm_writeback_signal_completion(&wb_conn->base, 0); else drm_warn(drm, "CRTC[%d]: EOW happen but no wb_connector.\n", drm_crtc_index(&kcrtc->base)); diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_h= w.c index 5a7bd27d3718..9b845d3f34e1 100644 --- a/drivers/gpu/drm/arm/malidp_hw.c +++ b/drivers/gpu/drm/arm/malidp_hw.c @@ -1315,15 +1315,15 @@ static irqreturn_t malidp_se_irq(int irq, void *arg) if (status & se->vsync_irq) { switch (hwdev->mw_state) { case MW_ONESHOT: - drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0); + drm_writeback_signal_completion(&malidp->mw_connector, 0); break; case MW_STOP: - drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0); + drm_writeback_signal_completion(&malidp->mw_connector, 0); /* disable writeback after stop */ hwdev->mw_state =3D MW_NOT_ENABLED; break; case MW_RESTART: - drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0); + drm_writeback_signal_completion(&malidp->mw_connector, 0); fallthrough; /* to a new start */ case MW_START: /* writeback started, need to emulate one-shot mode */ diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index 56871bf5e44d..5423abc825ee 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -473,7 +473,8 @@ static void cleanup_work(struct work_struct *work) =20 /** * drm_writeback_signal_completion - Signal the completion of a writeback = job - * @wb_connector: The writeback connector whose job is complete + * @connector: DRM connector which contains the writeback connector whose + * job is complete * @status: Status code to set in the writeback out_fence (0 for success) * * Drivers should call this to signal the completion of a previously queued @@ -488,10 +489,11 @@ static void cleanup_work(struct work_struct *work) * See also: drm_writeback_queue_job() */ void -drm_writeback_signal_completion(struct drm_writeback_connector *wb_connect= or, +drm_writeback_signal_completion(struct drm_connector *connector, int status) { unsigned long flags; + struct drm_writeback_connector *wb_connector =3D &connector->writeback; struct drm_writeback_job *job; struct dma_fence *out_fence; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 0a4026f22274..977fc0337fbd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -370,7 +370,7 @@ static void dpu_encoder_phys_wb_done_irq(void *arg) spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags); =20 if (wb_enc->wb_conn) - drm_writeback_signal_completion(wb_enc->wb_conn, 0); + drm_writeback_signal_completion(drm_writeback_to_connector(wb_enc->wb_co= nn), 0); =20 /* Signal any waiting atomic commit thread */ wake_up_all(&phys_enc->pending_kickoff_wq); @@ -431,7 +431,7 @@ static void _dpu_encoder_phys_wb_handle_wbdone_timeout( phys_enc->enable_state =3D DPU_ENC_ERR_NEEDS_HW_RESET; =20 if (wb_enc->wb_conn) - drm_writeback_signal_completion(wb_enc->wb_conn, 0); + drm_writeback_signal_completion(drm_writeback_to_connector(wb_enc->wb_co= nn), 0); =20 dpu_encoder_frame_done_callback(phys_enc->parent, phys_enc, frame_event); } 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 5cd6c81a9710..4b0f6cd46acb 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -251,5 +251,5 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc, =20 void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc) { - drm_writeback_signal_completion(&rcrtc->wb_connector.writeback, 0); + drm_writeback_signal_completion(&rcrtc->wb_connector, 0); } diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 46330b6f9a12..0d8579683c57 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -505,7 +505,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *dat= a) */ TXP_WRITE(TXP_DST_CTRL, TXP_READ(TXP_DST_CTRL) & ~TXP_EI); vc4_crtc_handle_vblank(vc4_crtc); - drm_writeback_signal_completion(&txp->connector.writeback, 0); + drm_writeback_signal_completion(&txp->connector, 0); =20 return IRQ_HANDLED; } diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 27fb6a7b55bb..83d217085ad0 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -652,7 +652,7 @@ void vkms_composer_worker(struct work_struct *work) return; =20 if (wb_pending) { - drm_writeback_signal_completion(&out->wb_connector.writeback, 0); + drm_writeback_signal_completion(&out->wb_connector, 0); spin_lock_irq(&out->composer_lock); crtc_state->wb_pending =3D false; spin_unlock_irq(&out->composer_lock); diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index b4c11d380df0..5e8ab51c2da4 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -100,7 +100,7 @@ void drm_writeback_queue_job(struct drm_connector *wb_c= onnector, void drm_writeback_cleanup_job(struct drm_writeback_job *job); =20 void -drm_writeback_signal_completion(struct drm_writeback_connector *wb_connect= or, +drm_writeback_signal_completion(struct drm_connector *connector, int status); =20 struct dma_fence * --=20 2.34.1 From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 8C33135AC33 for ; Fri, 22 May 2026 05:04:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426246; cv=none; b=SYBGDNXh56MRcihlNfSpXooIGpS4tzf95OZ3JdYy9o0W/J8Fd72lz6cy8ue0FfW+0kBSgaPqJrTieCw+t4CWcICFv7FBn4eKr4Bn5UGnkd4FN2WErPT54BzYMVaWCC3Ug53qLQYVouKI0fHm122cwZ9M20j7XvJsrGvlaZWRI40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426246; c=relaxed/simple; bh=qwOf7ZjszM5GyykvZC2rN1Z6vl98EqGIg56vQDgEr2Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RtNLqpIdNgggApCqahUTGoL2OK0HhwRHtH7ZPf5ImOWD2fcC4+1GlVmVfKxfDfNoNck2OGXYu+gtgdpYQteFqLVEP4mxMOCRcVC6oqrTXNxIh5h7WMmvP4X7LiLCY/iUlseg1e5by5/wQAbXl6yVXKnDebpN3cZ+2d15eYre0Ag= 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=M9/zz44s; arc=none smtp.client-ip=198.175.65.11 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="M9/zz44s" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426246; x=1810962246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qwOf7ZjszM5GyykvZC2rN1Z6vl98EqGIg56vQDgEr2Y=; b=M9/zz44sHctNt8AegOKGsJ19+0Vi+48dfYDkkw/+16LFGJzaAzDR9GXW CGCF1MGnYHaw/SF33S9L91nD1kiX4tz8Lrv9zPntFOBG4H4V4EsXPJfc+ jAmUpevmoT7UAtJMLkg3qOs1KK9s43eCSEKRUiqbCafIKAxcXhwD25LGm TvR4ic3g0XkRjQQeuqLEu1aCeE+tFFmGvf9cCypR415IlZIS9HXQY/0M9 BcLFjjIIIHdvJvvBQzvJSNykXR1D0UB3FXmbaKXQn+snOXcqv3BDc077V WzYuM1Pd8KP97NVYQxr5+mg+3yv5wVN0AghfziZ337QF9A0e0hPxFwqgh A==; X-CSE-ConnectionGUID: 9LmW2zoJRkqbzZG3b80a0A== X-CSE-MsgGUID: mC8UOKolQNe4qnmpOiWW6A== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651756" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651756" 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:06 -0700 X-CSE-ConnectionGUID: fMFLdNFlSkKANiMKSD1tmg== X-CSE-MsgGUID: 1pB1XaqcQE2eWKkGcnAdgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946379" 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: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 Subject: [PATCH v5 5/7] drm: writeback: Modify drm_writeback_get_out_fence helper Date: Fri, 22 May 2026 10:33:11 +0530 Message-Id: <20260522050313.1800378-6-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" drm_writeback_get_out_fence() does not itself need the parent drm_connector object, but update it to take drm_connector for consistency across the writeback interface, which is being moved to use the top level drm_connector and traverse down to drm_writeback_connector rather than passing in the lower level object and traversing back up. Signed-off-by: Suraj Kandpal Reviewed-by: John Harrison --- v3 -> v4: - Update subject line for consitency (John) - Update commit message across commits for consitency (John) drivers/gpu/drm/drm_atomic_uapi.c | 4 +--- drivers/gpu/drm/drm_writeback.c | 4 ++-- include/drm/drm_writeback.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index 7add982e3a3f..65845b096b0c 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1450,7 +1450,6 @@ static int prepare_signaling(struct drm_device *dev, } =20 for_each_new_connector_in_state(state, conn, conn_state, i) { - struct drm_writeback_connector *wb_conn; struct drm_out_fence_state *f; struct dma_fence *fence; s32 __user *fence_ptr; @@ -1472,8 +1471,7 @@ static int prepare_signaling(struct drm_device *dev, f[*num_fences].out_fence_ptr =3D fence_ptr; *fence_state =3D f; =20 - wb_conn =3D &conn->writeback; - fence =3D drm_writeback_get_out_fence(wb_conn); + fence =3D drm_writeback_get_out_fence(conn); if (!fence) return -ENOMEM; =20 diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index 5423abc825ee..7d08ffeaabb1 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -524,10 +524,10 @@ drm_writeback_signal_completion(struct drm_connector = *connector, EXPORT_SYMBOL(drm_writeback_signal_completion); =20 struct dma_fence * -drm_writeback_get_out_fence(struct drm_writeback_connector *wb_connector) +drm_writeback_get_out_fence(struct drm_connector *connector) { struct dma_fence *fence; - struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); + struct drm_writeback_connector *wb_connector =3D &connector->writeback; =20 if (WARN_ON(connector->connector_type !=3D DRM_MODE_CONNECTOR_WRITEBACK)) diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 5e8ab51c2da4..2afa48ea7c00 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -104,5 +104,5 @@ drm_writeback_signal_completion(struct drm_connector *c= onnector, int status); =20 struct dma_fence * -drm_writeback_get_out_fence(struct drm_writeback_connector *wb_connector); +drm_writeback_get_out_fence(struct drm_connector *connector); #endif --=20 2.34.1 From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 85A12358381 for ; Fri, 22 May 2026 05:04:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426252; cv=none; b=YsW6QkuCWQVjSq9oXOsEyKtsDmHK1nJFPYpGO6/TcfAuyg3qNTeL/AkWcCYHi81rIdurYD7juudyUEcCoUXCwfxJKkClJh2TGT5xy2VIwH6bQIcLrtGSlIDqtm5yNfXOeFGmSIlsDelQwaXGRWaKlwJpnEQs41STv7NG/MNwCLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426252; c=relaxed/simple; bh=OTIUYCyhHn6ZBsyqyCZH4HOBYLQ0ItQsBW7bYEEAwaU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p9rVKigt3HdeNHdn2/axRB8F+a89s0+5k+Bh61yRtzHFJRQE9ZQx/RVKaRmRx6kmfaMEQw18ahck//HyDTe8BIXJZ+OQFXIH+xIuyOz78AkUegASdcMALQzE2H62tvq3p4p5EMru1KAoZqFRBw+JOwvMKGZi3GqmrVn2xWAG0ME= 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=NnJYRX4h; arc=none smtp.client-ip=198.175.65.11 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="NnJYRX4h" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779426252; x=1810962252; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OTIUYCyhHn6ZBsyqyCZH4HOBYLQ0ItQsBW7bYEEAwaU=; b=NnJYRX4hjKcCO65Xk6b7vIo9rQ+izwdZgKxzrF5A2X+EWNZplr6bJNBm cEMZIOXfsZys1l7SLWI4ccSZVGmaWHIiPJfTvNC2+z3gTJSzraTkC46g7 S8pJzH3j2MsSjxnoxTyH4z6OcoYZAANhTfNLnu6PIxEil9/yq4jY/I7Q8 C8oqI6UN2O0NHBJZpL5Q6fDuePHMuyNWPmcOqicpdaL1WfUHY2C79jZMQ rAyK4rprKTM2QUYnp6GM0+RCv9pYXwxZ4nMXjCK0oHSHqNH36WL4EKVc5 UO3hh1hUNrdUEkLVP7fmgjilHR1L1uIABH0iUr+i2AMOrAgEXUP72Q+kW g==; X-CSE-ConnectionGUID: j6UurC5zT7a7CMAs1sT9Ng== X-CSE-MsgGUID: 7wKbvshMTS2BG1BeIZl0hg== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651771" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651771" 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:12 -0700 X-CSE-ConnectionGUID: QcGzgLDeQ4OpD/CYJXJCsg== X-CSE-MsgGUID: rkYlc4KVQPqCP+OFaSSdpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="239946388" 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:06 -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 6/7] drm: writeback: Modify prepare_writeback_job helper Date: Fri, 22 May 2026 10:33:12 +0530 Message-Id: <20260522050313.1800378-7-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 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_co= nnector *connector) return drm_add_modes_noedid(connector, 3840, 2160); } =20 -static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_con= nector, +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_writebac= k.c index 7d08ffeaabb1..ee79dba8cfc8 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -389,7 +389,7 @@ int drm_writeback_prepare_job(struct drm_writeback_job = *job) int ret; =20 if (funcs->prepare_writeback_job) { - ret =3D funcs->prepare_writeback_job(wb_connector, job); + ret =3D 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/dr= m/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_func= s =3D { .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 -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 =3D drm_writeback_to_connector(wb_conn); struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); =20 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_connect= or *connector) dev->mode_config.max_height); } =20 -static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connecto= r, +static int rcar_du_wb_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *conn =3D drm_writeback_to_connector(connector); - struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(conn); + struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(connector); struct rcar_du_wb_job *rjob; int ret; =20 diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_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_connect= or *connector) dev->mode_config.max_height); } =20 -static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connecto= r, +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_mod= eset_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: --=20 2.34.1 From nobody Sun May 24 19:34:24 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 7B05633F8C4 for ; Fri, 22 May 2026 05:04:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426259; cv=none; b=o1X82llSgLNtmquqOjy15juEitAorHO2bNRlowm2Up2O5T7PwNSTZbA6vhxPnhigWtZInxZmnuSuJ0S5cSMs9UFMua3gT/tevfYdJzFFH6Qut1+ZVncltN1OSjcoDgR13BAGk250BgbditXxq7HulmAYhQbFwBA/q4knIeQ1YrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779426259; c=relaxed/simple; bh=S+TclLj9PBWaAHA95EHjfC15XZrRBQ/zdODYZ/PrcWc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cVSOj7w5Xqh9acvbkIeYygGcEI51hYdRYLW9Q6EY60NgOyrkz0DDnquzQujsPKgL9s0qe4/Yet5Xi8rBy7VfVSjQFfKDmZ60nyyx6/tzb2vXKIRCiwm0NNC+9UmcDejs8H2yucxAar/iapE0Oe7u7GHcvAmZ+zc0hAtbbOhXVz0= 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=Dk1Lmb5P; arc=none smtp.client-ip=198.175.65.11 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="Dk1Lmb5P" 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: 8AouIeVHQ/yDU+MPMhjJ+w== X-CSE-MsgGUID: KJBMhhY+RUqQOnXtHUVN2A== X-IronPort-AV: E=McAfee;i="6800,10657,11793"; a="90651788" X-IronPort-AV: E=Sophos;i="6.24,161,1774335600"; d="scan'208";a="90651788" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_connecto= r *connector, return r; } =20 -static void amdgpu_dm_wb_cleanup_job(struct drm_writeback_connector *conne= ctor, - 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_writebac= k.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; =20 if (job->prepared && funcs->cleanup_writeback_job) - funcs->cleanup_writeback_job(wb_connector, job); + funcs->cleanup_writeback_job(connector, job); =20 if (job->fb) drm_framebuffer_put(job->fb); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/dr= m/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_connecto= r *connector, return 0; } =20 -static void dpu_wb_conn_cleanup_job(struct drm_writeback_connector *wb_con= nector, +static void dpu_wb_conn_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *connector =3D drm_writeback_to_connector(wb_connect= or); struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); =20 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; } =20 -static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *connect= or, +static void rcar_du_wb_cleanup_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *conn =3D drm_writeback_to_connector(connector); - struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(conn); + struct rcar_du_crtc *rcrtc =3D wb_to_rcar_crtc(connector); struct rcar_du_wb_job *rjob =3D job->priv; =20 if (!job->fb) diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_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; } =20 -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 =3D job->priv; - struct drm_connector *connector =3D container_of(wb_conn, - struct drm_connector, - writeback); struct vkms_output *vkms_output =3D container_of(connector, struct vkms_output, wb_connector); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_mod= eset_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); =20 /** --=20 2.34.1