From nobody Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 462383081BF; Tue, 9 Sep 2025 10:07:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412446; cv=none; b=m58caZe6A0Xf6LeF3dtYDarDkLrBZW6FQEayRWtiNkdgyvufM5RRnHbJDwfp9jzWb7Kqy5I6a6IRw7cZ72cnIl/jsydxyXDfVSbfKl11U9AnNBkWColcT6AT37GMr/8zvws+fKXV4fDf0rCtZqV6R9nxTvkEPHVYJusdXFflP2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412446; c=relaxed/simple; bh=op7tQCPrgW4k6asf3GwUpvEXtqYpcdzVvnUkrP59B1E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BR9zG1EVGKIlvGk3dOQw4DpybFWiCXDAJkSbSlw7Pz7jdaySuK4it38Gu9rb9piRngKIzqvv+dBe3l8eIKLOT6y0dtVEGB6ImES0fVogj3ddYAHj3pi0ikQIv7+izD3AKX5Xn0boDQQ9aMI9ziGwKGjm7RNu+jS3hN8uR58nueE= 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=Zr4T85WQ; arc=none smtp.client-ip=192.198.163.19 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="Zr4T85WQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412444; x=1788948444; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=op7tQCPrgW4k6asf3GwUpvEXtqYpcdzVvnUkrP59B1E=; b=Zr4T85WQRfy3J9X1JSSPigW0D7rN49cxcg0OHJWMKJQ+Nr/H/wFEguXj sZOCh7zLiQfQ4tnTUlMOHE1sQYQZF7xqXw+BMPYc4dahLDkrLvkpklTIE 102vHNoKBJpjaZP5KRkfi55WCzL4KJSwKHI9L1Gg9d8eDjr76mpX2D0JQ a9qNpBobYGdUGTlX0TRO3thHAY77wlEGhSOkjqRnXulhZ0E7YiFgtX72Z eTBfMngAN5Lc73FJY3mnN71kGuKOK1LYux2zcQ1otVf/0y7HPUO9w3GXH 7whWyCFrhkaqJoJ/zsOjXJWu9hpVUMrADfdfzbxuukoq7BzqV4YRNpbiR A==; X-CSE-ConnectionGUID: y38cXRSbTSyeoKGUCT++mA== X-CSE-MsgGUID: 9JrI6GZJQ5+xBHr0WnsVuA== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730122" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730122" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:07:23 -0700 X-CSE-ConnectionGUID: V5MYaawoSq+zHqik+K7qYg== X-CSE-MsgGUID: G8zu8Co9R1mliOP2Uyw2Ug== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915389" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:07:13 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 1/7] drm: writeback: Refactor drm_writeback_connector structure Date: Tue, 9 Sep 2025 15:36:43 +0530 Message-Id: <20250909100649.1509696-2-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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 we move the drm_writeback_connector within the drm_connector and remove the drm_connector base which was in drm_writeback_connector. We also 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. We do all other requireda modifications that come with these changes along with addition of new function which returns the drm_connector when drm_writeback_connector is present. We also 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 --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- .../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_writeback.c | 33 ++++++--- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 16 +++-- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.h | 4 +- .../gpu/drm/renesas/rcar-du/rcar_du_crtc.h | 4 +- .../drm/renesas/rcar-du/rcar_du_writeback.c | 19 ++--- 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 | 70 +++++++++++++++++-- include/drm/drm_writeback.h | 68 ++---------------- 22 files changed, 163 insertions(+), 137 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 5e260b275082..d4628dadf55a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6915,11 +6915,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 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 b937da0a4e4a..dbcdc8595e76 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -809,7 +809,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 80c37487ca77..8fea29720989 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,9 +202,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, @@ -216,8 +216,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 2ad33559a33a..1c2ba6eeb0e5 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -210,7 +210,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("CRTC[%d]: EOW happen but no wb_connector.\n", drm_crtc_index(&kcrtc->base)); @@ -266,9 +266,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 210841b4453a..69822b9be574 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 d72c22dcf685..10e818439637 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -425,7 +425,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 182275c0c29c..ea03cb98bfb4 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 1 << drm_crtc_index(&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_state *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_writeback.c b/drivers/gpu/drm/drm_writebac= k.c index ec2575c4c21b..7d6410b5b48d 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -89,8 +89,10 @@ static const char *drm_writeback_fence_get_driver_name(s= truct 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_connector); =20 - return wb_connector->base.dev->driver->name; + return connector->dev->driver->name; } =20 static const char * @@ -187,7 +189,8 @@ 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_connector); struct drm_mode_config *config =3D &dev->mode_config; struct drm_property_blob *blob; int ret =3D create_writeback_properties(dev); @@ -269,7 +272,8 @@ 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_connector); int ret; =20 ret =3D drm_connector_init(dev, connector, con_funcs, @@ -339,7 +343,8 @@ 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_connector); int ret; =20 ret =3D drmm_connector_init(dev, connector, con_funcs, @@ -382,13 +387,15 @@ 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_connector); 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; } @@ -434,12 +441,14 @@ 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_connector); 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); @@ -521,8 +530,10 @@ 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_connector); =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 56a5b596554d..0e60c1ac07c5 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 @@ -484,7 +484,8 @@ static void dpu_encoder_phys_wb_prepare_for_kickoff( return; } =20 - drm_conn =3D &wb_enc->wb_conn->base; + drm_conn =3D + container_of(wb_enc->wb_conn, struct drm_connector, writeback); 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 cd73468e369a..49412d2ed9aa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -28,8 +28,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_state *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; @@ -84,10 +83,11 @@ 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 + container_of(wb_conn, struct drm_connector, writeback); struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); =20 if (!job->fb) @@ -98,9 +98,11 @@ static int dpu_wb_conn_prepare_job(struct drm_writeback_= 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 + container_of(wb_connector, struct drm_connector, writeback); struct dpu_wb_connector *dpu_wb_conn =3D to_dpu_wb_conn(connector); =20 if (!job->fb) @@ -128,9 +130,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 d0f38a8b3561..11937e70e308 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h @@ -42,7 +42,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 + * @writeback: the drm connector which contains the writeback connector */ struct rcar_du_crtc { struct drm_crtc crtc; @@ -72,7 +72,7 @@ struct rcar_du_crtc { const char *const *sources; unsigned int sources_count; =20 - struct drm_writeback_connector writeback; + struct drm_connector writeback; }; =20 #define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc) 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 9986a10e8114..186efe019891 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,9 @@ 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 +77,9 @@ 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,8 +203,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->writeback.writeback; struct drm_encoder *encoder; =20 encoder =3D drmm_plain_encoder_alloc(&rcdu->ddev, NULL, @@ -212,7 +215,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, =20 encoder->possible_crtcs =3D 1 << drm_crtc_index(&rcrtc->crtc); =20 - drm_connector_helper_add(&wb_conn->base, + drm_connector_helper_add(&rcrtc->writeback, &rcar_du_wb_conn_helper_funcs); =20 return drmm_writeback_connector_init(&rcdu->ddev, wb_conn, @@ -231,7 +234,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->writeback.state; if (!state || !state->writeback_job) return; =20 @@ -246,10 +249,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->writeback.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->writeback.writeback, 0); } diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index fef4e4ee47cf..2428807e9714 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -167,7 +167,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; }; @@ -176,7 +176,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), @@ -356,7 +356,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); } @@ -504,7 +504,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; } @@ -598,9 +598,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)); @@ -622,7 +622,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 fa269d279e25..4d0bafdebcd1 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -543,7 +543,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 8013c31efe3b..cb5b96e8cc49 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -213,7 +213,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 hrtimer vblank_hrtimer; ktime_t period_ns; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index 45d69a3b85f6..6b4d1c4a1830 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -102,10 +102,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); @@ -127,8 +130,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; @@ -166,7 +169,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, @@ -177,7 +180,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 8f34f4b8183d..b46bb4c48ef5 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1882,6 +1882,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 * @@ -2291,10 +2346,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. @@ -2305,6 +2366,7 @@ struct drm_connector { * @cec: CEC-related data. */ struct drm_connector_cec cec; + }; =20 #define obj_to_connector(x) container_of(x, struct drm_connector, base) diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 958466a05e60..2a52b6761797 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,16 @@ struct drm_writeback_job { void *priv; }; =20 +static inline struct drm_connector * +drm_writeback_to_connector(struct drm_writeback_connector *wb_connector) +{ + return container_of(wb_connector, struct drm_connector, writeback); +} + static inline struct drm_writeback_connector * drm_connector_to_writeback(struct drm_connector *connector) { - return container_of(connector, struct drm_writeback_connector, base); + return &connector->writeback; } =20 int drm_writeback_connector_init(struct drm_device *dev, --=20 2.34.1 From nobody Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 6F03C31812C; Tue, 9 Sep 2025 10:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412457; cv=none; b=C0cPEGB+okkhW16PTpU6WgpM61c2NsBlPjuTgu/wTEvkf/CTv2yzhj8Kfr5ykeHW9/zPAhP+SKsl0pDVGY/yDcn27wNYBMsZB5g3LOdBO12FPhX5XcUgTP7bLhlNDQZOXbETZ+6B+r7Jkv0g01juqegklJd9XMw78Uzj7h86yS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412457; c=relaxed/simple; bh=kAHzqBWs57x1zqCtgtn5EIT4rdB2eYLh4+g/CF9id6Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G2SMOZYw/zL9aRx+WUur3P6TlKaGGVapIDX+SWauSrFmx74+y0CS1C8m09yCwhN4U9cX7c1hDywgYzRbPfIsDXs9igsOAqQlsFaaCMEs0eJiPB+rwq21X5O643Zz3MPT32cAl71SgajvTfdTGUBVVqvfkkowND3YaIpE4U6Jw/k= 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=Y/LUUO8n; arc=none smtp.client-ip=192.198.163.19 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="Y/LUUO8n" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412455; x=1788948455; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kAHzqBWs57x1zqCtgtn5EIT4rdB2eYLh4+g/CF9id6Q=; b=Y/LUUO8n+LC+woYbLz61HIvGPxEYNbzKZNzRe4A9MQJUUlgW1FgslItN P9KIHLPho9hvsXBCk9vXjR0/Viyw5ZBucFgILZDMxwW2eo7QYvIgxRa7d izpNcDsZIBFXl6vMF0qZuDFxD8/ZJOV2A/gx/UpZF3H04USgnhn/2AWsr 4i1NS+sqpt4ZtXMJEV2hD0TeA7zVNiXydlKTExOiyzoxPQIXDw30mDWlE SQcBoRtcK9zq//ckIecNFrH8lee/P2GP77pB4Z0w7j4cTYpKdl4aALbq7 GjAqxYnBJLcRuXWWxQtnYGGHhek++fodMjn30dJj/TnIRpA1biP4K1VWm g==; X-CSE-ConnectionGUID: Vdk/G9ExSuy4AQnvNmFLJg== X-CSE-MsgGUID: D2J/pi+mRyi8xfOgFo1JnQ== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730164" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730164" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:07:33 -0700 X-CSE-ConnectionGUID: xHEVuOXiTzSUcbW6ppK6pQ== X-CSE-MsgGUID: jx6YrBl1RYiOaDLXtUbOnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915407" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:07:23 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 2/7] drm: writeback: Modify writeback init helpers Date: Tue, 9 Sep 2025 15:36:44 +0530 Message-Id: <20250909100649.1509696-3-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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" Now with drm_writeback_connector moved to drm_connector it makes more sense use drm_connector as an argument rather than drm_connector. The writeback connector can easily be derived from drm_connector. Signed-off-by: Suraj Kandpal --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 2 +- .../drm/arm/display/komeda/komeda_wb_connector.c | 5 +---- drivers/gpu/drm/arm/malidp_mw.c | 2 +- drivers/gpu/drm/drm_writeback.c | 16 ++++++++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 +- .../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, 18 insertions(+), 22 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 8fea29720989..84a9c1d2bd8e 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 @@ -204,7 +204,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 69822b9be574..d3dd07491630 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 BIT(drm_crtc_index(&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 ea03cb98bfb4..a36a4c86a99e 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 1 << drm_crtc_index(&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 7d6410b5b48d..c7cb4673eedb 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -242,7 +242,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 @@ -267,13 +267,13 @@ 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_connector); + struct drm_writeback_connector *wb_connector =3D + drm_connector_to_writeback(connector); int ret; =20 ret =3D drm_connector_init(dev, connector, con_funcs, @@ -322,7 +322,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 containing the writeback connector to initial= ize * @con_funcs: Connector funcs vtable * @enc: Encoder to connect this writeback connector * @formats: Array of supported pixel formats for the writeback engine @@ -338,13 +338,13 @@ 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_connector); + struct drm_writeback_connector *wb_connector =3D + drm_connector_to_writeback(connector); 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 49412d2ed9aa..8d29e09952c5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -132,7 +132,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 186efe019891..fe6764620739 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -203,7 +203,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->writeback.writeback; struct drm_encoder *encoder; =20 encoder =3D drmm_plain_encoder_alloc(&rcdu->ddev, NULL, @@ -218,7 +217,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, drm_connector_helper_add(&rcrtc->writeback, &rcar_du_wb_conn_helper_funcs); =20 - return drmm_writeback_connector_init(&rcdu->ddev, wb_conn, + return drmm_writeback_connector_init(&rcdu->ddev, &rcrtc->writeback, &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 2428807e9714..a53e3aa41f63 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -600,7 +600,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 6b4d1c4a1830..d897a83e3b36 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -169,7 +169,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, @@ -182,7 +181,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 2a52b6761797..f789aa773616 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -84,13 +84,13 @@ drm_connector_to_writeback(struct drm_connector *connec= tor) } =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 Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 6EB6B2F3C30; Tue, 9 Sep 2025 10:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412465; cv=none; b=IJMDd9IqLeFJy/Lf/jw3kyiyFLW9zDk92ZVEjcWC5f5gOxJVfV6U9zn5ZpKiSbc3ugy6RiPleo1a/uXb/Aor/qT/SbszLfR5cWyUOZFBnQDUJKZxpuaNyJ3nCVM6f6iHSIgxocWpboi94wijUG6M3N5lFw4F9b81wj9RNb3Cfv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412465; c=relaxed/simple; bh=mxwlnKRfsYwmrttvfnUC36y7M5y4JSvpLuDNPSeGJFQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T6hN0zBqxC/t5CwPq9XrNaQFl6P8rW5dTo7rAfRlzpeGM87QqfFYuf1MgyZb+9eIDn+O9zI98yFzRAUfYb4zF/AoSOxm390CtYZ9mlL6cQJKQJ+5elT161IDS4WsWAq4Onqx+5voJlWwseMdXq8ALGmj6rLV6uFiYDGEC5unEas= 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=GfwsI6ZH; arc=none smtp.client-ip=192.198.163.19 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="GfwsI6ZH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412463; x=1788948463; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mxwlnKRfsYwmrttvfnUC36y7M5y4JSvpLuDNPSeGJFQ=; b=GfwsI6ZHUSS4MjIRO0s++bazmE2DlQ63sDoeQXP6zVA5xdn3sfLyxfXM GvL5UuwW5RqdHWkc4JQJgbHdG7+T57CKa/b/6bWg7AG/Lrb0QhVXdwCXX eQTgTCWTWMEw4L0KLHgRMUuHplVLjyD+8euiab/0u42KztrMEnBIAQu8T hsTQHH/gEyUxmOfU2SsEALFoSrhWPHnnVc9tDKfJiv6nYhCEV/aZ1BoYl vJt2ONvj4scC5Sa0t9hiBZVZh8ys7g9LS1kE4dHKE323CAoEm8YpFjdcI JkCDje0aHui1kLoh5jzBjYUQEDxb15l6/ba/qqLahdGzaFQWYNTkFje0z Q==; X-CSE-ConnectionGUID: F74YPLmLSu6dOwS4rsOmxA== X-CSE-MsgGUID: 3aywOnn3Rm2C2F1xJnu9vA== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730181" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730181" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:07:42 -0700 X-CSE-ConnectionGUID: h/qB4lPeSF20iM1EQfQCjg== X-CSE-MsgGUID: JcHth2VqRn6ckRKEmayY5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915431" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:07:33 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 3/7] drm: writeback: Modify drm_writeback_queue_job params Date: Tue, 9 Sep 2025 15:36:45 +0530 Message-Id: <20250909100649.1509696-4-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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" Move to using drm_connector structure instead of drm_writeback_connector since this now writeback resides within drm_connector. This helps make sure drivers change drm_writeback_connector using helpers provided by drm core. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- drivers/gpu/drm/arm/malidp_mw.c | 3 +-- drivers/gpu/drm/drm_writeback.c | 7 +++++-- 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_writeback.c | 3 +-- include/drm/drm_writeback.h | 2 +- 9 files changed, 15 insertions(+), 15 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 d4628dadf55a..4aaa7d233f4a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9990,7 +9990,6 @@ static void dm_set_writeback(struct amdgpu_display_ma= nager *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 amdgpu_device *adev =3D dm->adev; struct amdgpu_crtc *acrtc; struct dc_writeback_info *wb_info; @@ -10080,8 +10079,8 @@ static void dm_set_writeback(struct amdgpu_display_= manager *dm, dc_stream_add_writeback(dm->dc, crtc_state->stream, wb_info); =20 acrtc->wb_pending =3D true; - acrtc->wb_conn =3D wb_conn; - drm_writeback_queue_job(wb_conn, new_con_state); + acrtc->wb_conn =3D drm_connector_to_writeback(connector); + drm_writeback_queue_job(connector, new_con_state); } =20 /** diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index 1c2ba6eeb0e5..b3f1d3ca23aa 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -268,7 +268,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 a36a4c86a99e..5d3eceae4651 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_state *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 c7cb4673eedb..02c8bffcca11 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -407,7 +407,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: The 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 @@ -424,9 +425,11 @@ 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 + drm_connector_to_writeback(connector); 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 0e60c1ac07c5..32db3e248a4d 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 @@ -485,11 +485,11 @@ static void dpu_encoder_phys_wb_prepare_for_kickoff( } =20 drm_conn =3D - container_of(wb_enc->wb_conn, struct drm_connector, writeback); + drm_writeback_to_connector(wb_enc->wb_conn); 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 fe6764620739..4e8fa7a5bc32 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -248,7 +248,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->writeback.writeback, state); + drm_writeback_queue_job(&rcrtc->writeback, 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 a53e3aa41f63..8afd1a50ab98 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -356,7 +356,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 d897a83e3b36..28d361517a55 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -130,7 +130,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; @@ -152,7 +151,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 f789aa773616..a814b33cbb53 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -100,7 +100,7 @@ int drm_writeback_set_fb(struct drm_connector_state *co= nn_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 Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 9C3042DD5F6; Tue, 9 Sep 2025 10:07:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412474; cv=none; b=b4Eil9GUBJBvGV1TAfxpNaKix4eu783zzvwLii7xVusFTEtd+gHeqb6h4JCaR7lND0tlYFKu86kaAWPmRvalr9+CSeWamDMOSAvXpZ6AQEKTqnKzrtvFOG6O6Ly35j+9zAFtUEFg/2VZ1ibFHihFXwa4azt2yJLbk3+0rSgnPYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412474; c=relaxed/simple; bh=wWHKPGUY6mJAMlprz3eycmC1Duo39pyKnCUzcPVZz2I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mZlc/BXjHp5BPW7eqtgsvExSkTy0JUx82QiHfQJE7fNQLgCeepBhK0tnjz0OIPrDI846t2XAnCRV4WsLw0cvXEh3RkssYQFN+LUaqoH2pNMItJcknhQgQCq6t5r82c0+IQfmd72871pXfGkHF/ykG8p2EpXfV8S1wTJoEni7zQc= 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=X8yjYiZ9; arc=none smtp.client-ip=192.198.163.19 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="X8yjYiZ9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412472; x=1788948472; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wWHKPGUY6mJAMlprz3eycmC1Duo39pyKnCUzcPVZz2I=; b=X8yjYiZ9OrDKCsF8v/z2swQyOTyNwOtLIKwllfGllTT1VqTjq9Yu7Wf8 no22Z10kb3Uc/gW6DHx6JyRve7t5T/3BdfYRCXUFtUTrWpvDNkJsm+dJU /LHLqAEvgnJV0kb25y5oeI3WPrPVmF/cphznTTvHlQg/zlFHOhB38qEn9 0vevPNWyMGRYzFSlqtv+dr2kHKhgfWMIhAePXaCRrFvv0dCRciE+alWu4 Ra0wCkhFyfon+Lu1hAd/OyRCaxHkRbE/FM1gklfMOktInPAjY3ES00BTn veNPw5oH3BP9NuDVuQRNjR2ghwfMlhRf39ppvnzeoBFGcppzUE9CLqg2s g==; X-CSE-ConnectionGUID: 4xLny4ZlTeGvlr7NaKJZcg== X-CSE-MsgGUID: lxdCVc2RRwOYJk6orCDFQQ== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730219" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730219" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:07:52 -0700 X-CSE-ConnectionGUID: jnPnyc0QSHeN829CwxuI3A== X-CSE-MsgGUID: 7TLQcKlrScKXJ1OsAKA6rA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915453" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:07:43 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 4/7] drm: writeback: Modify drm_writeback_signal_completion param Date: Tue, 9 Sep 2025 15:36:46 +0530 Message-Id: <20250909100649.1509696-5-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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" Move to using drm_connector instead of drm_writeback_connector since it now resides within drm_connector. This will also help with make sure drivers do not need to access drm_writeback_connector as much. Signed-off-by: Suraj Kandpal --- 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 | 7 +++++-- 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, 16 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 4aaa7d233f4a..cf693aebb43f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -640,7 +640,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 b3f1d3ca23aa..aa5f2776d6c0 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -210,7 +210,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("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 02c8bffcca11..d41eee6688d8 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -481,7 +481,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: The drm connector whicha has the drm_writeback_connector wh= ose + * 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 @@ -496,10 +497,12 @@ 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 + drm_connector_to_writeback(connector); 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 32db3e248a4d..8472b90b522e 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 @@ -373,7 +373,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); @@ -434,7 +434,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 4e8fa7a5bc32..1ec9b4242c39 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -253,5 +253,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->writeback.writeback, 0); + drm_writeback_signal_completion(&rcrtc->writeback, 0); } diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 8afd1a50ab98..ace13bfa1994 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -504,7 +504,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 4d0bafdebcd1..fa269d279e25 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -543,7 +543,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 a814b33cbb53..42b7f635eab6 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -106,7 +106,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 Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 3170930DD2E; Tue, 9 Sep 2025 10:08:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412483; cv=none; b=mDho5eYyPkhYFoAB4xd/2BfhNkNl1kFlfWY//hdkOmhJq7HwBfUbaX8WW2yYc/yaM75IzsKjOSNCLN0SA/7o3OKy04Vd+Wl1Lxx0JOtpTzsUl1CWHvtqlcAQ9BrguNhr/vtQ/DjlDwMuyQHLFEw3QB4Cw9d47k/ADGMWE7GKOjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412483; c=relaxed/simple; bh=dhFQw02tRJaEsBMnLolTEIMr3D0/MqjB0mh3tv9c3s4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uNB2y1nKDwM+k95kvxmkI95N9HBQEcNBVsl+RC+EhqYP2rDLKrqpZ+tPvIfDECYo8Kv7GPB9wYGBVhtEn4nLT+WXspP16DAofLwjLwYKp8BXn8s2appYbIKj5tdPmP7qGK4G7BHMyLnh0nZ6LuSfQjMFBru7n77+6T3TkkJiYNs= 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=VataLMod; arc=none smtp.client-ip=192.198.163.19 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="VataLMod" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412482; x=1788948482; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dhFQw02tRJaEsBMnLolTEIMr3D0/MqjB0mh3tv9c3s4=; b=VataLMody1APW6qWMCIKjh3R3MHAwV+vQLgnxHEynp8855INx2Cd+zN3 fLULWsGJ0qa2zJgfCMs98nKlVPYERDFE2K7cNaM/cLXHUco1tJ8eO3D5V gXrkud0qFtWFzXbfpJVyiU72vYN8Mz6nIBqg4H4erYoX7897ljmpS9RCG iDg/NK6pF2TPyJiexSO3ljB/TNuf02+mLj35NP3w5NJbg/tKvirxM3llP W7eSJi1a324zafMl5uz/Qb7ItDYlwGkvtG2wd4XBZYm++oNairWngLnsq Skkfts1uCOHE69RO5mCS+3rMro1AHfP6Dv+lHQVyKbZWpMsXh8OdRVfIN Q==; X-CSE-ConnectionGUID: fN3nRdH+TrK/2qW56yKh3A== X-CSE-MsgGUID: UWPoKzHvSH2TS58qnaGYbg== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730258" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730258" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:08:01 -0700 X-CSE-ConnectionGUID: K9C9JPCLSmqBD2d+W9KT3g== X-CSE-MsgGUID: w2NRJvdsS6mlDr2byvBu5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915475" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:07:52 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 5/7] drm: writeback: Modify params for drm_writeback_get_out_fence Date: Tue, 9 Sep 2025 15:36:47 +0530 Message-Id: <20250909100649.1509696-6-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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" Use drm_connector instead of drm_writeback_connector since it now resides within drm_connector and also helps make sure drm_wrtieback_connector is being modified mostly by drm core provided helpers. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/drm_atomic_uapi.c | 4 +--- drivers/gpu/drm/drm_writeback.c | 6 +++--- include/drm/drm_writeback.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index ecc73d52bfae..72d0dfd2d501 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1270,7 +1270,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; @@ -1292,8 +1291,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); - 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 d41eee6688d8..569160ed713c 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -533,11 +533,11 @@ 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_connector); + struct drm_writeback_connector *wb_connector =3D + drm_connector_to_writeback(connector); =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 42b7f635eab6..af52640114cf 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -110,5 +110,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 Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 F0EB431AF06; Tue, 9 Sep 2025 10:08:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412493; cv=none; b=gOQHR4BvXuIrxET4c/13EtH1c2VFZXDD+d3WHca9olQVpLFBXplwJaQ497qmXel88lDxubW6C4TZAakBqya84wVGO/JEhh83OyofMuKt5Z2NkClel8uVWaLMH7WMFVTxKDqf4Co4TUg7/deJSi/rF4kzO470QhHMlRccHwETf2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412493; c=relaxed/simple; bh=5UV6m6/MyuA4L7mTMKAcPhVbY0r8n+54Q3q3VPuPHRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SD+geq1rwhtSDt1e5u50v/l3DbjCvlYNxvylyMxWBW7GsHZ8krc+KcHIN7fxUoC3n1IpGNG+D0/tDWzznULWDtd8MxYnIAP/xptpzejKt9deFHvRe5Et7kTiJG05c7xA+GMGccn4Iit8n7t0McuSszFStPZ6TIndFbLCTXa1+tE= 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=oC6ide3j; arc=none smtp.client-ip=192.198.163.19 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="oC6ide3j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412492; x=1788948492; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5UV6m6/MyuA4L7mTMKAcPhVbY0r8n+54Q3q3VPuPHRU=; b=oC6ide3jowQpEj68jXIhTFZK5ZP6N0brENRhgtDsZO+0nG7QmNY2tCY4 tgUgtTP6eNf7vCsySr5h+hPliu/0U87+CeAQehB8Vn3FbXIhN09D6oMba cNW4pJg8YhhMdxyRcJdlcY2ipqSwjoKA0hTdo2TnXKXHVoN1IGyKXH9E8 kCQMcIoc4iBgWvjte3S2GizJPHrQRV4aDPi1Avs92SeF/xUxm62tFK5Km HDTelaBLqwdO74WSfgXnbKT1+5t9wKl+nM7ul8jhdGcpv/DKClLyLeJ4J dYTf4nZNsDdlK3I+DG9MXj7VdbdI7eROc0YzKbDJGfYJT1prfGL7jj1D/ g==; X-CSE-ConnectionGUID: nyLcZgjkSKexq68kf9LjAA== X-CSE-MsgGUID: jBDuTXKBRVWzseGCP6HcxA== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730302" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730302" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:08:11 -0700 X-CSE-ConnectionGUID: 4P6EgBalTz646STQunfpvg== X-CSE-MsgGUID: Lpo2CUh7QJ6wF9QgGOPMeQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915511" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:08:02 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 6/7] drm/connector: Modify prepare_writeback_job helper Date: Tue, 9 Sep 2025 15:36:48 +0530 Message-Id: <20250909100649.1509696-7-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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" Lets now pass drm_connector to prepare_writeback_job since drm_writeback_connector now resides within drm_connector. It also make it uniform with params passed to other drm_connector_helper_funcs. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 2 +- drivers/gpu/drm/drm_writeback.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 4 +--- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 6 ++---- drivers/gpu/drm/vkms/vkms_writeback.c | 2 +- include/drm/drm_modeset_helper_vtables.h | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c b/drivers= /gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c index 84a9c1d2bd8e..d02f5d20f3b1 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 569160ed713c..32a8e6498585 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -395,7 +395,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 8d29e09952c5..26a93c3cc454 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -83,11 +83,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 - container_of(wb_conn, struct drm_connector, writeback); 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 1ec9b4242c39..725981cc1d0c 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -47,12 +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 28d361517a55..032896fb5c5b 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -71,7 +71,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 ce7c7aeac887..f6a14f396c40 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1130,7 +1130,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 Fri Oct 3 00:00:52 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 A705C31B83E; Tue, 9 Sep 2025 10:08:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412503; cv=none; b=amxYwLiMaiCwu1lYmxWEL6E3HnwKt5COqMfULuRGTBV35a1DvAW5b60ktWlhjtx0Uz9ieg51P9KpxgtWzifM4kANR52Q7vdTQ3PjafHNFHfWAYgKRBa+DbkmYggKjyAmLn5ThMlaozglHo3sGej2mdLuQiVOodSAouZ005FH1jY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757412503; c=relaxed/simple; bh=TTPMXjY8qFzobtrZBfLA9XlG3M7qUX9ujzgR0RrUWoA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WPIh7ZvPhOUcazE/XfaZvETJwe2AHyv21MVkmtlsoIAfiJ/A7fKvpXMsV447U02idJHUus66vl7S4sDex/PqWq9LjQB7kkDO4vsd7yZQBwHPozqtdULICjwZx3Jpbxnp1eAvJQq4MZDfjP12L579B044lnAlkoWnAdQhVjvg7D8= 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=P2ghhF4K; arc=none smtp.client-ip=192.198.163.19 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="P2ghhF4K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757412501; x=1788948501; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TTPMXjY8qFzobtrZBfLA9XlG3M7qUX9ujzgR0RrUWoA=; b=P2ghhF4KhnNDBC2kFgTB9aOzuogtckIZnaSC6/4ZjRuXM1MGqOPSFlaG GIbIpab3OhAWIS2oTmrjZaVFynIC4C0aIFvMHAy/w6EP6AgvDz6vXI9UV lJLgdfPy8DLv7mubuiQnqDfKmRPudAvBmD/4YTBCl3xDsvWTm6kYBqptG MFk6KaFB1vl3DbbFLqtZZGlP2N11esMjQZ66akmUFq3oSRMtvZ+M/NEk+ bGSQ1FmShwyc0FBg73F9gV3cU6jyPRno2n2RrU59IAje7dkTv3hNDaDPH 1FoMf1DSTFbcUWK9QHiq7fM6m6DqkEQLyo58LmDLAyQJO5YCAhgh1f/XV Q==; X-CSE-ConnectionGUID: jgQPxthhSFe3GHvQsufhaQ== X-CSE-MsgGUID: uxektMJGTA64KYjAVGS6oA== X-IronPort-AV: E=McAfee;i="6800,10657,11547"; a="58730358" X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="58730358" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 03:08:20 -0700 X-CSE-ConnectionGUID: buH9qxfYSd25Ewe3+SdWfQ== X-CSE-MsgGUID: TlN6UXqfRYeNAAiFbBfcvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,251,1751266800"; d="scan'208";a="172915539" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa007.jf.intel.com with ESMTP; 09 Sep 2025 03:08:11 -0700 From: Suraj Kandpal To: kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.com, dmitry.baryshkov@oss.qualcomm.com, harry.wentland@amd.com, siqueira@igalia.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, robin.clark@oss.qualcomm.com, abhinav.kumar@linux.dev, tzimmermann@suse.de, jessica.zhang@oss.qualcomm.com, sean@poorly.run, marijn.suijten@somainline.org, laurent.pinchart+renesas@ideasonboard.com, mcanal@igalia.com, dave.stevenson@raspberrypi.com, tomi.valkeinen+renesas@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, louis.chauvet@bootlin.com, Suraj Kandpal Subject: [PATCH 7/7] drm/connector: Modify cleanup_writeback_job helper Date: Tue, 9 Sep 2025 15:36:49 +0530 Message-Id: <20250909100649.1509696-8-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250909100649.1509696-1-suraj.kandpal@intel.com> References: <20250909100649.1509696-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" Lets now pass drm_connector to prepare_writeback_job since drm_writeback_connector now resides within drm_connector. It also make it uniform with params passed to other drm_connector_helper_funcs. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 4 ++-- drivers/gpu/drm/drm_writeback.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 4 +--- drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 6 ++---- drivers/gpu/drm/vkms/vkms_writeback.c | 5 +---- include/drm/drm_modeset_helper_vtables.h | 2 +- 6 files changed, 8 insertions(+), 15 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 d02f5d20f3b1..bf1ecf5d3027 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 @@ -144,8 +144,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 32a8e6498585..a2cb66f70ed1 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -451,7 +451,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 26a93c3cc454..03e63b6c5351 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c @@ -96,11 +96,9 @@ static int dpu_wb_conn_prepare_job(struct drm_connector = *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 - container_of(wb_connector, struct drm_connector, writeback); 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 725981cc1d0c..e3aab132ded1 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -72,12 +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 032896fb5c5b..320d553f5f1f 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -102,13 +102,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 f6a14f396c40..483de9978e0c 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1145,7 +1145,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