From nobody Tue Dec 16 21:27:05 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 9F2CA3A1D2; Tue, 7 Oct 2025 05:46:19 +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=1759815981; cv=none; b=QZ3lFuj8q0dqwGPk6thtHZqS1yN0pe4qEM9w5WZuWhsqKuwyA46Wmox4FKT/RTLVgWC15mPatup2ES7B+HsnaUPqXwc5d+oOTaKHA3JEMaI1OLdqJfvPGqu/mzuxe8n/nS6m45D6L6t5gvdgCEEvKf103FJhvEe+RlgrNH1w0es= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759815981; c=relaxed/simple; bh=zIbXJC2siBbwLIQd2E+N7oBkjCeijXHD04b2KZxo2Fo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aq9AAKGqVPtuFPSP/PG1bIct2+ovpXNAQGwOsz/1o9bdYm2j0P0hNyrGp+syv84RkAGSbxm1rOt5eIZoY5wzgtkdJfObwZGKcPMc0iV9kA5/r46cZ/x+FayzYnczcd1WTS9t4rdvzk9wagc5nxWxvImhqev2ven+KHqxNoDE5ZE= 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=kRJ6Ib3K; 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="kRJ6Ib3K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759815980; x=1791351980; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zIbXJC2siBbwLIQd2E+N7oBkjCeijXHD04b2KZxo2Fo=; b=kRJ6Ib3KtgJqTk7KNiOjpfikcnM+GNlf1tYh/ESQOc42QTeHS/ieH6wx jqiCEN3Q04JHm11T80j6JRlDfU32o/GPNJIyD9B6tUaugPUVokFN0unoi 2TDGDPWxoIG6em/YyHN9iIESzyl8DyfwCRuM7ttfZRGev0Zsb9yP31Vdk GsALnXaZTCv7YtC+daK4sS4JQvT4cZm7gxXMzwVNB1fYxei4HI1NJHzWF Kbsb198tR76Z5RN2Ywi9xcio1S7Wvz90gZPhmaGAXZIGjN+t4NDAQlKad lSUzITKdlcRdudGdJULrY4NIyCiG4IJazkInyEXChBdzr8pqYtp2Q5Sp8 A==; X-CSE-ConnectionGUID: QVINfAEvRYqxgliDiDjk5Q== X-CSE-MsgGUID: /O8du6ZBQceFptMsTNVc0Q== X-IronPort-AV: E=McAfee;i="6800,10657,11574"; a="61027950" X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="61027950" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2025 22:46:19 -0700 X-CSE-ConnectionGUID: F3sHKI20RGeyATIo5e5Quw== X-CSE-MsgGUID: DEjolaS0StC8AC3TZXHn/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="180479425" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by fmviesa008.fm.intel.com with ESMTP; 06 Oct 2025 22:46:09 -0700 From: Suraj Kandpal To: 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, kernel-list@raspberrypi.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: dmitry.baryshkov@oss.qualcomm.com, ankit.k.nautiyal@intel.com, arun.r.murthy@intel.com, uma.shankar@intel.com, jani.nikula@intel.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 v2 3/7] drm: writeback: Modify drm_writeback_queue_job params Date: Tue, 7 Oct 2025 11:15:25 +0530 Message-Id: <20251007054528.2900905-4-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251007054528.2900905-1-suraj.kandpal@intel.com> References: <20251007054528.2900905-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 --- V1 -> V2: Use &connector->writeback (Dmitry) --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- drivers/gpu/drm/arm/malidp_mw.c | 3 +-- drivers/gpu/drm/drm_writeback.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 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, 13 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 28447fcf5498..f9e7f8ab4e0b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -10247,7 +10247,7 @@ static void dm_set_writeback(struct amdgpu_display_= manager *dm, =20 acrtc->wb_pending =3D true; acrtc->wb_conn =3D wb_conn; - drm_writeback_queue_job(wb_conn, new_con_state); + drm_writeback_queue_job(connector, new_con_state); } =20 static void amdgpu_dm_update_hdcp(struct drm_atomic_state *state) 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 3436a742d403..b1ba859c36d1 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -405,7 +405,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 @@ -422,9 +423,10 @@ EXPORT_SYMBOL(drm_writeback_prepare_job); * * See also: drm_writeback_signal_completion() */ -void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector, +void drm_writeback_queue_job(struct drm_connector *connector, struct drm_connector_state *conn_state) { + struct drm_writeback_connector *wb_connector =3D &connector->writeback; struct drm_writeback_job *job; unsigned long flags; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 8b35ba0023d7..e7216afa6bac 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 c6960c7e634e..b4c11d380df0 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -94,7 +94,7 @@ int drm_writeback_set_fb(struct drm_connector_state *conn= _state, =20 int drm_writeback_prepare_job(struct drm_writeback_job *job); =20 -void drm_writeback_queue_job(struct drm_writeback_connector *wb_connector, +void drm_writeback_queue_job(struct drm_connector *wb_connector, struct drm_connector_state *conn_state); =20 void drm_writeback_cleanup_job(struct drm_writeback_job *job); --=20 2.34.1