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 062C8C87FCB for ; Fri, 1 Aug 2025 13:51:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EE1710E85F; Fri, 1 Aug 2025 13:51:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="ZixZKNRc"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 30E1210E85D for ; Fri, 1 Aug 2025 13:51:22 +0000 (UTC) Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5718TKqa024922 for ; Fri, 1 Aug 2025 13:51:21 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= V6zL/GI63V6YYKeGM1mEryAObeKPOCarM9uKEFJtsyk=; b=ZixZKNRcrQRvodJd apim1u6KzeyYaY//ocAWtkLz/m17cHyGdmVUAPav/oemBLjXWM8v5jOvdHVocNyI rvLr5FVYTG15cc0OaOsqlihXATZGE9p9a0nu/gA7i7Y7zySFoyb9RqfM+39/kq0c htiK2coTBIDxuR0EvVp/uYXqFjE30OEiAdkmtfDLs07DkBNbumDI9dasN5TB0CSJ 2d5r6trf5sCoWrC6aDCOov17JxzpbWd3mKWqpVLJ0oHEYu0bMDsIMgIK4yRQxBc/ KO6Vtw47yO6PTczVwalcNZcB1iTGnDVrhZOnTknXWFNdnJWnjDsD8VfMLNWAUU6C +MEndA== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48887g4fn7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 01 Aug 2025 13:51:21 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4ab657b88c7so19114951cf.0 for ; Fri, 01 Aug 2025 06:51:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754056280; x=1754661080; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V6zL/GI63V6YYKeGM1mEryAObeKPOCarM9uKEFJtsyk=; b=FV111pfXn8VLCyUvZFmuKbnRC0NfWR4KmYBNWP7VL41x5fvqyrAErRTlZeBew/e9E0 wzsBduY6D9zx8eQGbeOsCV/S9hLbuQ3fUuz2UH3TRJ0t6tGP04zaVHed9hN/r6Q58Atg 2vUSetag32+THSr91iMHAjJK+J2kOXkBLahLF9ufL1OVEMujYOF0sx7NUxb4utcgmtU4 wXgJxWnnewDa05FzKkst64z/TsxfSrixIV39P9q2FjymCy/aigtnI5SWg4m+DA0dBCV4 aag8SyUIqQ7ZfnaVNbMxRLHlvchPbknZBluD3wXI99etxenK6yJzcerP6kopbbcrNZD5 3obg== X-Forwarded-Encrypted: i=1; AJvYcCWQ/6S0fKgGNClZrN5+6rFrFvGOfXM56l9raj5KmKhpHBEoP/pjdAtptquRFycIULUKVB6uJlGTVpU=@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywet207ujX7kiVTXvl9PsikjPk151oAL7zxvjPcBufNNflERz+Z QoeKBrTkGqMlWkQmZiLoVHVvrWevUqbYiuJ9K3lZiIfrKYAPC7Dd8GdBMm+9etd6OIigthtsddq yB5pTXRJLQwePII6IG2aEU8W8Nq4V1uoNtMsOAwrXVsqEuGNGCclt/H56bh1DHzq9+P+Uwow= X-Gm-Gg: ASbGncu42LnIJa8uEGwm+ToNJ5QFz0PAs0BnIC9mLjNvkHE0Hc6QScaYdy3dcg8VES/ c640abmwWI+53m9LbHXD1wc58ESfQzDuYTqyjJA37xC9925I4PXAXCIwp3J6+QJCLawl8C0ULHW 836pwwrEbdtkjzaUAk3Pu3DsPDYw8Mlb2ewxW/zzhz+lmDW7ebidicEmPn2fDZYeF9pAxBg/+kb yelh09B+XiQCyV2dhHsnufBDT+ZXGKcWepsklAJGqbKIYHhXRRVV7dwqUfYG63lnr2UcF6tSfE+ hCpfVMAOKTG4YOngwDrBajvl5+pMBwTxl0ZBG4J2lR2RSn3NVjpRRysoF6igQJfvM1p+/NBCUzR L9pKHop04h1g1M29yew0Fn1l1OOBNLahp/wIHFYBKjm2yGssUa6b0 X-Received: by 2002:ac8:5813:0:b0:4af:219:b8e9 with SMTP id d75a77b69052e-4af0219bd62mr28441111cf.6.1754056279996; Fri, 01 Aug 2025 06:51:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFR0G/8/mp3NoMeNSdNh5xGLdgi/uAIOcZPk20PI9XWjmBIPiXjC/zontxCRxjb7k+mVn1ffA== X-Received: by 2002:ac8:5813:0:b0:4af:219:b8e9 with SMTP id d75a77b69052e-4af0219bd62mr28440731cf.6.1754056279485; Fri, 01 Aug 2025 06:51:19 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-33238273006sm5917801fa.9.2025.08.01.06.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 06:51:18 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 01 Aug 2025 16:51:09 +0300 Subject: [PATCH 1/8] drm/amd/display: use drmm_writeback_connector_init() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250801-wb-drop-encoder-v1-1-824646042f7d@oss.qualcomm.com> References: <20250801-wb-drop-encoder-v1-0-824646042f7d@oss.qualcomm.com> In-Reply-To: <20250801-wb-drop-encoder-v1-0-824646042f7d@oss.qualcomm.com> To: Jani Nikula , "Kandpal, Suraj" , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Laurent Pinchart , Tomi Valkeinen , Kieran Bingham , Geert Uytterhoeven , Magnus Damm , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2980; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Npu11OGBlNLZEIA4iffNoHuzYf6/Fg1CUI3VmwQheFU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBojMZSZXL0kc9QaXkC+l3w6n53625xXoOoWi1Rf w1dSHbBA4+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaIzGUgAKCRCLPIo+Aiko 1bpSB/94A2+Addr9RNnuGBvk1NYZ/RWjJSnSxboR9iOfirpPVgua99XOaoDsSnhD3nuxJDmBBgF 98NqAbJF6AFI97xmYBM/6ZHsdItWame0lELe7Aw/j7btMsZu4+ROQl6Y0xZAX084XeDcL/jBaJP xamILenkg4IgIBeN9bJeA5pyCqsvRXSezPiBgNrZsYGeaqPvNmK9Mn0W0Y8TFvSvDNOvYTcOYSP iArGGeNBhFZpGcWJn4cJDKYMfOSQLAW9ZQg0/3fe0/pp9MfDoYSyOjWvZsX73WeP5lIM0vOShqs 9ONfy5Np+vHNO0rlKWiXD7XgdKfRRU203q22p1TS+tHpzFKa X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=Vdn3PEp9 c=1 sm=1 tr=0 ts=688cc659 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=EUspDBNiAAAA:8 a=8cP71iSYcfV9S7Y4u-4A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-ORIG-GUID: 0ad7N79GKQiAFZfsNL-tYeQqwjcqbNW2 X-Proofpoint-GUID: 0ad7N79GKQiAFZfsNL-tYeQqwjcqbNW2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODAxMDEwNSBTYWx0ZWRfX3FHGUhMhAxYW BxtkjnfXtRH3TPo9880jesl9PdLsTBkSrucfExFnIS+XiyetN/iaWeqXsN14c4UXpFKTz3EYPCl xUBfeI1qelgwCoayhATxZKoYfB/nrEQU8y9rVIzlACwNlFVjn3Yli8T8Cct2mn1p/dbjFc6oVU5 rJKQ7ZKrnxNmZ2+8uhu4rmAAv6R2n3pFl8EmbWC4RerB17nJdwp7yW6+DEWbOfzA9NztB2OxX9x XbD0ln4N5Vi90pO1Gt/IxbcylRCaoGBJ11H5HHLm4PlKsxhbhuPKMxqbuf0SYEG1aeeqDZceEWO z2aVg/3ykWSumpFHpG4rzt6DuufgjgE1WTLqG5Uo49OYGjKWqZOygLc8xsm6yrHHBDh1ph/52AM oKeCFCjqRjNqc7eFFqpnks4lBnIskT5PZ63qtYs7/g+iVHug4C7gbeT5el0BeHd2q4ERzOZC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-01_04,2025-08-01_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 mlxlogscore=999 spamscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2508010105 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use drmm_plain_encoder_alloc() to allocate simple encoder and drmm_writeback_connector_init() in order to initialize writeback connector instance. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 096b23ad4845d365dad707deed4e3e84b1f9945d..a9948e8d67a6e9556d21090b5cdd101258d62480 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -10003,7 +10003,7 @@ static void dm_set_writeback(struct amdgpu_display_manager *dm, return; } - acrtc = to_amdgpu_crtc(wb_conn->encoder.crtc); + acrtc = to_amdgpu_crtc(crtc_state->base.crtc); if (!acrtc) { drm_err(adev_to_drm(adev), "no amdgpu_crtc found\n"); kfree(wb_info); 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 d9527c05fc878ef6916782ff9fde847813938461..80c37487ca77c0494eaf769c5b9a3c53486aa52d 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 @@ -171,7 +171,6 @@ static const struct drm_encoder_helper_funcs amdgpu_dm_wb_encoder_helper_funcs = static const struct drm_connector_funcs amdgpu_dm_wb_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = drm_connector_cleanup, .reset = amdgpu_dm_connector_funcs_reset, .atomic_duplicate_state = amdgpu_dm_connector_atomic_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, @@ -190,17 +189,26 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_manager *dm, struct dc *dc = dm->dc; struct dc_link *link = dc_get_link_at_index(dc, link_index); int res = 0; + struct drm_encoder *encoder; + + encoder = drmm_plain_encoder_alloc(&dm->adev->ddev, NULL, + DRM_MODE_ENCODER_VIRTUAL, NULL); + if (IS_ERR(encoder)) + return PTR_ERR(encoder); + + drm_encoder_helper_add(encoder, &amdgpu_dm_wb_encoder_helper_funcs); + + encoder->possible_crtcs = amdgpu_dm_get_encoder_crtc_mask(dm->adev); wbcon->link = link; drm_connector_helper_add(&wbcon->base.base, &amdgpu_dm_wb_conn_helper_funcs); - res = drm_writeback_connector_init(&dm->adev->ddev, &wbcon->base, + res = drmm_writeback_connector_init(&dm->adev->ddev, &wbcon->base, &amdgpu_dm_wb_connector_funcs, - &amdgpu_dm_wb_encoder_helper_funcs, + encoder, amdgpu_dm_wb_formats, - ARRAY_SIZE(amdgpu_dm_wb_formats), - amdgpu_dm_get_encoder_crtc_mask(dm->adev)); + ARRAY_SIZE(amdgpu_dm_wb_formats)); if (res) return res; -- 2.39.5