From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3931CCA470 for ; Tue, 7 Oct 2025 05:46:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D1A610E55A; Tue, 7 Oct 2025 05:46:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ibE8T+0s"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59F9A10E543; Tue, 7 Oct 2025 05:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1759816007; x=1791352007; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pIg9gO318VHGZSYism9NGX5zyvq9qlJ+WfJsQBSeYUk=; b=ibE8T+0ssG+3fezezOxp0XggW3isu5akW582qeviNuvWUCd1//XJ/Dm6 6Qhcm/+/pdx6BBidow9cMVjCo31rzkUtExVA7GUtJXGawcyVHc1KME7i4 eWWdzcSpshxqBBN9cpmilDg8sxSfyZ0aSUA4wCrPKMJD6IgHSJFbaQ5b/ Y2Fa2Nv+GP6X5U3UscFKm1KfPKbGz3MD4BzsZv9YDUo/fzdMYe35yxOno yGbG3UxqIi1k9qtsumcS38YXo5jbQkOpw8nG57QGUGNsGeaoGQLE3eFIC nZQaz70gWWt5KjNqrDIGvAoxm1k1ijjvdKtSDnGCP28jSJHCMef7h+mvP Q==; X-CSE-ConnectionGUID: adnJ0Jk4Qle2bz4rbp9xkw== X-CSE-MsgGUID: EEXA2CppRqSYvNezo3qMSA== X-IronPort-AV: E=McAfee;i="6800,10657,11574"; a="61028008" X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="61028008" 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:46 -0700 X-CSE-ConnectionGUID: JJl31TPrQruodIwx/Zh3ww== X-CSE-MsgGUID: yWvYGTaATa6xZXJGqUjs6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,321,1751266800"; d="scan'208";a="180479529" 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:37 -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 6/7] drm/connector: Modify prepare_writeback_job helper Date: Tue, 7 Oct 2025 11:15:28 +0530 Message-Id: <20251007054528.2900905-7-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Pass drm_connector to prepare_writeback_job since drm_writeback_connector now resides within drm_connector. It also makes 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_connector *connector) return drm_add_modes_noedid(connector, 3840, 2160); } -static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connector, +static int amdgpu_dm_wb_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { struct amdgpu_framebuffer *afb; diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index da2acb932ac0..62a11252b05f 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -393,7 +393,7 @@ int drm_writeback_prepare_job(struct drm_writeback_job *job) int ret; if (funcs->prepare_writeback_job) { - ret = funcs->prepare_writeback_job(wb_connector, job); + ret = funcs->prepare_writeback_job(connector, job); if (ret < 0) return ret; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c index 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_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static int dpu_wb_conn_prepare_job(struct drm_writeback_connector *wb_conn, +static int dpu_wb_conn_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *connector = - container_of(wb_conn, struct drm_connector, writeback); struct dpu_wb_connector *dpu_wb_conn = to_dpu_wb_conn(connector); if (!job->fb) diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c index 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_connector *connector) dev->mode_config.max_height); } -static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector, +static int rcar_du_wb_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { - struct drm_connector *conn = - drm_writeback_to_connector(connector); - struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(conn); + struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector); struct rcar_du_wb_job *rjob; int ret; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 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_connector *connector) dev->mode_config.max_height); } -static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector, +static int vkms_wb_prepare_job(struct drm_connector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob; diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index fe32854b7ffe..806230129ad9 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -1142,7 +1142,7 @@ struct drm_connector_helper_funcs { * * This callback is used by the atomic modeset helpers. */ - int (*prepare_writeback_job)(struct drm_writeback_connector *connector, + int (*prepare_writeback_job)(struct drm_connector *connector, struct drm_writeback_job *job); /** * @cleanup_writeback_job: -- 2.34.1