From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 770894FDA78 for ; Mon, 19 Oct 2026 13:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792415582; cv=none; b=QK1yxROTRfv4J8Pr8G8H7FS79O6fNmbQT1DRodwRKgDt7jgNaUpVDoNyrrlXmvCILoFidUzhZHSks5KHnXyjXdPcBWzidAuYGk+0C0/dzvepSM91uCWvO4whHNEC9cg9wrORth4bYKLr7xK/Yl0mhwbT9/zgDrXF/DbtV1oSjiA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792415582; c=relaxed/simple; bh=MXiUgqFb28XZ0uD8+NV8QVzUD8kgz790YiWbaz0Q+SY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hTHwawAJCaqcM9vcOjjWfQNIzp4TznWyVs5nHi3hnkrxIf9osb1SM3BmgwDK63wPef5IPFos3KHzUodhfbBSEqY6LZKDA/nbqRjh9xxRLnXx3R/s85fA7H4xPFcVKQlJ6HSnn4U2SMcIUgrLHgjxfsypR9A+7aPtSxv8CfeLqCk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=G54f4czi; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cDoj9Dhb; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="G54f4czi"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cDoj9Dhb" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69J8Osnx1168037 for ; Mon, 19 Oct 2026 13:12:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= kFaI/Jkc6f4Kq/MuB+nr4917gGjbH7lnxAEvCbOlf7c=; b=G54f4cziwK6Njg8J IjOWS6X9HSSyrOE0R8cQTPXUuDi4BwX5wnm5g73w6JpxpSGDDtIm9Y+dKAO8OLOy 5kdHyEj+h1AjnyRRnpFisYCBMdVMy00hY+7kp0Z2nfzCxVHPyIbb5j3DLsWpKmK4 Y1pRQnydVzNubkdBnXq/b+TUEalKm0xTikc0keMXBFbOBn2wYok9MKuVXQRZffyk BvULSy78wEioi3riPRarJZCtn0a9RmM8nKfesM0KhFKm9zQVof3t5pF1fl43lPug UFzUQYXYXJcB6Eaz9RH4CkJdDke5Q5txkIg1rrIp6/INDomyYp+bwtHgk7iRZIIM 0fcBIA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4hdf5c976j-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 19 Oct 2026 13:12:59 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-93cbf2fd504so362034385a.2 for ; Mon, 19 Oct 2026 06:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1792415579; x=1793020379; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kFaI/Jkc6f4Kq/MuB+nr4917gGjbH7lnxAEvCbOlf7c=; b=cDoj9DhbWBNe6eh3lb7JqcaqBWoZHRl4CfYiY9dorZDL4B9/7L1doJh/xVsrb22BrK sY/0vNM2IarUDKvfbn9yYIben0TXaynRbhXT+KjFKONiF7x3fE/oE61pLtlyPKh2IdZf Qz6Vkx4uVS0nimIZtwdPGSMJzLQdji2PcqXjg0S2Y2qK47HgzSgpRdDMHlvJ/MLXFTjn DjQ8vGUZTksEqepE5HptIkpMN8vLjM/D177cwhpV1wsgFTVejSPbdNwyNHRg1/hepL3K X7w3k6wMwAGDJAugcVTnzZ3wRjMmhwi4xGmal2gazYUyOryuROakZVMOVF5wZErzJZO2 6hyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792415579; x=1793020379; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kFaI/Jkc6f4Kq/MuB+nr4917gGjbH7lnxAEvCbOlf7c=; b=Y78X1FnhDOjWUu/Ydecc/LM6adnxcWU+DK2pjXarxZLQ/4I9jC7CvOBCi2jeJbK62Z 1VYknIWhQuEbwniBWGm1SkysSbYTP/YbPdPPrPHsZpS8G5uZNt54aTfWjgwduSGlAre2 PHzeZwTKUbc1PLGMSS95CAeIsKkqCbcd1llXGtpOzgiQ/CAi0q07uk2rk24OkycFVcJV dWiN7HCU49TuB/B1JrbjBB4lj/i98lGiO/bEX0NU0tRDgoAZ4XrDZ84NewjtdLYYVHsD wIdde/6ajxuQlBtJIiVciLJtiqqfxZIHJOBWoGsnrEOZ66Yiy4CzWW0lURK5D4GfpM4C J4uA== X-Forwarded-Encrypted: i=1; AKwUvBwDi3Peo0RSZ/2GafJZrbcll2FeiRGzaJTjzLMMFJLBuKGZ22MKQg5qG5UyzV0G8bATXMppPgmH6GyIVl8=@vger.kernel.org X-Gm-Message-State: AFq9FYKbVgDRIKh+RwLNDSZMnHzOiBVc5MtcmvXFFSGvLVauwAh7hmTX 1kF8Xio1WZ8nC1ieqZ6A6stHV+eUhEBdheRZH9XZyIJwrRst0MHDKTZ7qQQHD0IUh4p/+PbLAv2 3TVUq/ojj2Jpqy9Q1ICe568plAu1FvetJe4DApRIWZkw+2JBqKEx8UdNN6zzMK5qW8sM= X-Gm-Gg: AYBFou1yDdAH7ZEdqF1cYqOIQtCCT02EqU7SDnM/5FjDNnuucLyawm2q70Nk7wKweVK oscRbRUY9Bzo2gmE9ScRJPnzeAcmywE6sqxMiuXAc0nWxGh1w4QKu43oUs2ODDAwJ0SY5Ues3KD iKmCLQmFoxb4gKhNOhqTDb0ZWxQIX3EFqeHfItHjXknyIIsGntO4w4MFvvPtUeuokVBd1wU8vLF 3NEnJQL/+dibVImZQ7REiftXi6LERO0byqsxTz0A4JsaL1wwWSRDxdpSu0OKrWd2AXsNsDRvhwj VZ1N71tMRzfzaubQhgl1fKfckpxi4En6WEHFZobIu2MeBNrI4x+OiCSBJ/6XPj8VmGfzbdvUGvW 72/mjiADiqs0talSz/FIhq75GKeGDW822gZsyQipOdKjdwKzXEVY9XIXnCsqwTBC7UU7appQWic PxPn+gyFXkHtZV X-Received: by 2002:a05:620a:2609:b0:93e:4d74:68fd with SMTP id af79cd13be357-93f29d8e1c2mr1205208785a.65.1792415578476; Mon, 19 Oct 2026 06:12:58 -0700 (PDT) X-Received: by 2002:a05:620a:2609:b0:93e:4d74:68fd with SMTP id af79cd13be357-93f29d8e1c2mr1205200985a.65.1792415577911; Mon, 19 Oct 2026 06:12:57 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3ab24f5dd5esm23432581fa.6.2026.10.19.06.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2026 06:12:56 -0700 (PDT) From: Dmitry Baryshkov Date: Mon, 19 Oct 2026 16:12:32 +0300 Subject: [PATCH v7 6/9] drm: writeback: rename drm_writeback_connector_init_with_encoder() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261019-wb-drop-encoder-v7-6-d4288a26eb54@oss.qualcomm.com> References: <20261019-wb-drop-encoder-v7-0-d4288a26eb54@oss.qualcomm.com> In-Reply-To: <20261019-wb-drop-encoder-v7-0-d4288a26eb54@oss.qualcomm.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , John Harrison , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Liviu Dudau , Laurent Pinchart , Tomi Valkeinen , Kieran Bingham , Geert Uytterhoeven , Magnus Damm , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Louis Chauvet , Mihail Atanassov , Eric Anholt , Rob Clark , Brian Starkey Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8295; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=MXiUgqFb28XZ0uD8+NV8QVzUD8kgz790YiWbaz0Q+SY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBq1hdFDtgtFCpX8pSrsYjEJBgBhNTr66M4hywK1 J0EIgFup36JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCatYXRQAKCRCLPIo+Aiko 1ccyB/91WtfAKSG7oAIcANu9YZJIQqQ3uZFxMWZEOOleVroXsEQTqIpN8rP4CEeaf1mzAJWb10Y VxXKdxOiOllbWBOP97bjLukuSYDlqgc/P87HkTCTVY5WvTAYReEQEGdaXZU1VVBJgOKrl6u6Nf6 5gYu+C4QU0HObuYv1ImaWFkngOluMokJfVyOhk9b/7vUhDW0bB2X/NwAuPrt5lNg68qvVcIbJkk iEPmH3kCQxQuU/THoUD037Eo4znFy/dDOeWM03kRuF/uw94o2xQBqvswdxXjMjW8ivhEI6X8xXX UGcAq16ZbPXKZuhJm3eJ2JvEqDOm51kw6Sjx1PIO+ReHfXDF X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Info: AW1haW4tMjYxMDE5MDA1MiBTYWx0ZWRfX40+r6LKQApyD jyWSwmdPb4uDo2HbLs5UrgIi8zAR220XY4oYxGw/DTIPBtrgO4IStaxxrwUr7l00qIYc5QK/yGj /3G4t0//YviUSOhg+mKH+gozYfLX9wk= X-Proofpoint-ORIG-GUID: aN2x5L5P85ROl5uY5fhI0XUy1vbHVOAd X-Proofpoint-GUID: aN2x5L5P85ROl5uY5fhI0XUy1vbHVOAd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDE5MDA1MiBTYWx0ZWRfX7o+oiF9D6TPb QZEVRnUYna0tgql0zu/41pdwcvMeA3U+heRHxmjpBaQp0d4PBND03eo93ZvJ4WmYsQg9EeIZFqm Tv7lkx7XdkhQjijdfNgSvqCSty95uKcw4zTPjjmjb8D5NQ3GTCd111mEe9UiSgQ6ktyRkUWCL7s fXpfiYxPd4lGTv2jkpywMDD6vnirq7ft987QJkP1JDAlg4hS1FoKOGdOToav4ZzYEYyvE3h4QSU TnHH42jK4COGhwdgLAQNJe8403Ew2HTwEXe0iGf3/B1YWdBo+6HYx39PB2Mrv1obaEV0BqEuAlR crNTVb58wwAGq5WVAHAGZND87qW3kJ8f4NwRq4/BAfpZqMDMgK8u38qmj1J6rupAIHXqKzzv1+C sWbHIzo/vpd01uFKTlHPquzmPmmWsVGzuA+XF3ZSj9UISQ2Syv33/Yt1fWVPIclS/olXS71wTUF cGSRjFn83+bmYzu21+A== X-Authority-Analysis: v=2.4 cv=K6O3jCWI c=1 sm=1 tr=0 ts=6ad6175b cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=KeTiLIfg1DN4_MrrFvcA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-19_03,2026-10-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 malwarescore=0 adultscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610080000 definitions=main-2610190052 Rename drm_writeback_connector_init_with_encoder() to drm_writeback_connector_init() and adapt its interface to follow drmm_writeback_connector_init(). Drop references to the "custom encoder" from the documentation since it's now the only way to specify the encoder to the writeback connector. Signed-off-by: Dmitry Baryshkov --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 10 +++++----- .../drm/arm/display/komeda/komeda_wb_connector.c | 8 ++++---- drivers/gpu/drm/arm/malidp_mw.c | 8 ++++---- drivers/gpu/drm/drm_writeback.c | 21 +++++++++------------ drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 10 +++++----- drivers/gpu/drm/vc4/vc4_txp.c | 8 ++++---- include/drm/drm_writeback.h | 10 +++++----- 7 files changed, 36 insertions(+), 39 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 b5b186e4f81c..18bee44794ce 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 @@ -261,11 +261,11 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_manager *dm, drm_connector_helper_add(&wbcon->base.base, &amdgpu_dm_wb_conn_helper_funcs); - res = drm_writeback_connector_init_with_encoder(&dm->adev->ddev, &wbcon->base, - &wbcon->encoder, - &amdgpu_dm_wb_connector_funcs, - amdgpu_dm_wb_formats, - ARRAY_SIZE(amdgpu_dm_wb_formats)); + res = drm_writeback_connector_init(&dm->adev->ddev, &wbcon->base, + &amdgpu_dm_wb_connector_funcs, + &wbcon->encoder, + amdgpu_dm_wb_formats, + ARRAY_SIZE(amdgpu_dm_wb_formats)); if (res) { drm_encoder_cleanup(&wbcon->encoder); return res; diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c index 77aecf4d3f09..7c64facfd799 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c @@ -186,10 +186,10 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms, return err; } - err = drm_writeback_connector_init_with_encoder(&kms->base, wb_conn, - wb_encoder, - &komeda_wb_connector_funcs, - formats, n_formats); + err = drm_writeback_connector_init(&kms->base, wb_conn, + &komeda_wb_connector_funcs, + wb_encoder, + formats, n_formats); komeda_put_fourcc_list(formats); if (err) { drm_encoder_cleanup(wb_encoder); diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c index 7f5e25adf999..7e1d1c0988ae 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -240,10 +240,10 @@ int malidp_mw_connector_init(struct drm_device *drm) return ret; } - ret = drm_writeback_connector_init_with_encoder(drm, &malidp->mw_connector, - &malidp->mw_encoder, - &malidp_mw_connector_funcs, - formats, n_formats); + ret = drm_writeback_connector_init(drm, &malidp->mw_connector, + &malidp_mw_connector_funcs, + &malidp->mw_encoder, + formats, n_formats); kfree(formats); if (ret) { drm_encoder_cleanup(&malidp->mw_encoder); diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c index 683da368e339..89c36f1414ce 100644 --- a/drivers/gpu/drm/drm_writeback.c +++ b/drivers/gpu/drm/drm_writeback.c @@ -165,8 +165,7 @@ static void delete_writeback_properties(struct drm_device *dev) } /** - * __drm_writeback_connector_init - Initialize a writeback connector with - * a custom encoder + * __drm_writeback_connector_init - Initialize a writeback connector * * @dev: DRM device * @wb_connector: Writeback connector to initialize @@ -241,8 +240,7 @@ static int __drm_writeback_connector_init(struct drm_device *dev, } /** - * drm_writeback_connector_init_with_encoder - Initialize a writeback connector with - * a custom encoder + * drm_writeback_connector_init - Initialize a writeback connector * * @dev: DRM device * @wb_connector: Writeback connector to initialize @@ -269,11 +267,11 @@ static int __drm_writeback_connector_init(struct drm_device *dev, * * Returns: 0 on success, or a negative error code */ -int drm_writeback_connector_init_with_encoder(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, - struct drm_encoder *enc, - const struct drm_connector_funcs *con_funcs, - const u32 *formats, int n_formats) +int drm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const u32 *formats, int n_formats) { struct drm_connector *connector = &wb_connector->base; int ret; @@ -290,7 +288,7 @@ int drm_writeback_connector_init_with_encoder(struct drm_device *dev, return ret; } -EXPORT_SYMBOL(drm_writeback_connector_init_with_encoder); +EXPORT_SYMBOL(drm_writeback_connector_init); /** * drm_writeback_connector_cleanup - Cleanup the writeback connector @@ -320,8 +318,7 @@ static void drm_writeback_connector_cleanup(struct drm_device *dev, } /** - * drmm_writeback_connector_init - Initialize a writeback connector with - * a custom encoder + * drmm_writeback_connector_init - Initialize a writeback connector * * @dev: DRM device * @wb_connector: Writeback connector to initialize 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 b0c1ca0d0dfa..35460a314a7f 100644 --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c @@ -219,11 +219,11 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu, drm_connector_helper_add(&wb_conn->base, &rcar_du_wb_conn_helper_funcs); - ret = drm_writeback_connector_init_with_encoder(&rcdu->ddev, wb_conn, - encoder, - &rcar_du_wb_conn_funcs, - writeback_formats, - ARRAY_SIZE(writeback_formats)); + ret = drm_writeback_connector_init(&rcdu->ddev, wb_conn, + &rcar_du_wb_conn_funcs, + encoder, + writeback_formats, + ARRAY_SIZE(writeback_formats)); if (ret) drm_encoder_cleanup(encoder); diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index c469f8b1068b..33b1bc37b362 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -601,10 +601,10 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) drm_connector_helper_add(&txp->connector.base, &vc4_txp_connector_helper_funcs); - ret = drm_writeback_connector_init_with_encoder(drm, &txp->connector, - encoder, - &vc4_txp_connector_funcs, - drm_fmts, ARRAY_SIZE(drm_fmts)); + ret = drm_writeback_connector_init(drm, &txp->connector, + &vc4_txp_connector_funcs, + encoder, + drm_fmts, ARRAY_SIZE(drm_fmts)); if (ret) return ret; diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h index 879ca103320c..958466a05e60 100644 --- a/include/drm/drm_writeback.h +++ b/include/drm/drm_writeback.h @@ -137,11 +137,11 @@ drm_connector_to_writeback(struct drm_connector *connector) return container_of(connector, struct drm_writeback_connector, base); } -int drm_writeback_connector_init_with_encoder(struct drm_device *dev, - struct drm_writeback_connector *wb_connector, - struct drm_encoder *enc, - const struct drm_connector_funcs *con_funcs, const u32 *formats, - int n_formats); +int drm_writeback_connector_init(struct drm_device *dev, + struct drm_writeback_connector *wb_connector, + const struct drm_connector_funcs *con_funcs, + struct drm_encoder *enc, + const u32 *formats, int n_formats); int drmm_writeback_connector_init(struct drm_device *dev, struct drm_writeback_connector *wb_connector, -- 2.47.3