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 614BD3A7D98 for ; Fri, 12 Jun 2026 18:30:27 +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=1781289029; cv=none; b=bNMspz3zT/O89SmIJRSANhtRvy9mOC8JCwfvQyV3oXa4r5grhVkhKGMYvEJZYsivhv7Vy+MRu/v54oeoouxyvuyuQOYpT8wfGCW2h8Y4+Amcajbp+rVf7rsdA6dkhXunrpXzGFU+xMd34HFGMjwdp1u6d87Wt6EwY03i4hNs2gs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781289029; c=relaxed/simple; bh=MbaRBOLwFT+ETgHAVWF3UBcaA1Q1ln0hWBI7tVGYbZw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KHnhJLliK8uuCmajCww3ex3x802zvB5p6VdydH/3ue+9Pq1ZwPsPhIyrPCztIogwghiNnl4+Yd+VsNLwIdIfFEIyHYUhALE2U98IB/1+0+KPDfvaza6sFkyO+Lc8y2bjjRCwpwsGurMGu8wBPwyAdAljNbWtXmohAcJImbdBBOI= 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=j1kCkMsT; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gphPfVaP; 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="j1kCkMsT"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gphPfVaP" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65CGVE0r047406 for ; Fri, 12 Jun 2026 18:30:26 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= jRi4QyMfJKJttBAEFdi1P15sbORxIAP33IpeK1RT27w=; b=j1kCkMsTOh3LWhON 0QAKPzpA3acIfOXO/MvUweopgToy0P2xRi9aznHifE0+rqx+rgwxVa+amb51jiNS diq2pHZ3HdNXpLnuH/Y8YbB//wDxYLxd6pY0VEa6WNOA99OPxvS8iSEH3xtDC9up PoX4jX9sE5Vt6RQAkyTnGFs7JCsBrS37IDLHQPt/dsnc083oBVyOpRJUeGdP8ZKp Qq4EL7EYdFL6G6928vhzHGg7B3DIG3td+WYA9nEVqEAACrJxoWyf56n/pKwxPLti 7K+ENyiNIW9Ed/7pTcKcHCxJHJz7oQI4oBDmb0ax0667GojX8TOl4NPEYVMSq05v eL/I9A== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4er2u440n7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 12 Jun 2026 18:30:26 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9157d38ab37so122897785a.1 for ; Fri, 12 Jun 2026 11:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781289026; x=1781893826; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=jRi4QyMfJKJttBAEFdi1P15sbORxIAP33IpeK1RT27w=; b=gphPfVaPsHHQ8EfI4Ix4CxaU/HswAy5BAhRgTRMS5bAUpfiM55kfLXjYFzZGiwF0eQ gmcERF8hr2kwo9sEbdKMXuTyREZekltm3yb8fq8LHvWbFksiPRbLXaD3BQ5LATECZtNg tCDy0dI7qMWx/8HspVxDtOo/m5xPhWTk94c8VWtp7eL06FU0ziYyT4deWwhraYy7yEjg 5mBHAgapCA6ROs1wZoMlzWa0nYZqoJ1HspPv1RgaTkLtqjOPoHVuiW2ZMQG3ETQaGjsB EAvi673rN4JuxqNKx+yPyBL6e3sDipWdHqymPMfuM88rEFRThuFmSj3i3pSgRqydIcQb UYnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781289026; x=1781893826; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=jRi4QyMfJKJttBAEFdi1P15sbORxIAP33IpeK1RT27w=; b=Uwz3luV/oXKxRIjNf8KZLlsy6kPO2Pc7GP+6QAzt3x5STWaAqStcabj6qqwwtm1QnV ZTK2d/JYDBqH9zT2ODxJL40wfd8BIavIt0E0Wllhul840LEtKygr7iX48x5iuojl4CCG Oh2GHRi6w9Fmh20ItBFiGul+aZLpKNdmFZ046OYwuRiTKJjSukYQwT9uJWNXjP1P7H/h 0UvTlv5oYIVhRAVj7eLioared1JvKpCeV24nmyhxSiDrfMJl/QQ/UTo7cW1HuxB554gd 2h1ZMeXWkHZ8r7RKiNhSFThli2yl97gkfdkp/fJL0ldaLUstVnCoRilLujmX4qTPjDTA hkdw== X-Forwarded-Encrypted: i=1; AFNElJ+/PKzGfK5/HR4dH+x7aRskf2XbG5UD6WQnay/zfA85FNOsZm6H3HIalwU1Z6KTKyqK+8Cu4cUCfaO08Bc=@vger.kernel.org X-Gm-Message-State: AOJu0YwGmXSN7+gzqgUVd+0b0+TDUuB+FPvG1jM7uYZ/7tuCMqVR/N+t 13w6MyXVE0jo/Oxv5jXwEkC4Biqy+L6PwTbhhRfUXnGSZRgRu2i7FyRkLvpBsNShi5FlEnSs9FY bSXym0pG+8fHkM6pZ0RPrADza7rniQWgBBq8BbaTyIwSIQq71eI5WopoTW6+JtH/oi7M= X-Gm-Gg: Acq92OGqApqokJCsDH55jXo6YulvXsPG9qnDIhHuR7od2cci8P3U+tK72U6tVts75Yp xmDR5JbqbuQ3YZCaPhlOFhodp/cCjG8mcIRob10KCT1d9kxcSuI1ptt5Xaq7Ucjh8n8+Ox3cdZa UIj6gDPqrK5AHg4MiJYzHLP1xSCVb3TzyYQYNwt0wNogyVn0/YigE7B/FFwFEopiQ9I9zIC1LwE 59SOBv/EjusBUJ9CfR4j+r+S6hbLPIW2G49QYiedR1wb/r0nOyEwVwB6GcnazoxVQmeqZaV7rl2 xm9GUKbI4hczN/ttYp0Gq7uE+bnYuVEExhrsBIeRsRu2YFhvNbja2AHt5o0kSgdqY0GbyzpbOPz L3J8JUUSTcfZBRaI6WsT1act6AOCcHTuS9dHmF2y60GCIsNiHa83VsubTkjIvTNzEw/8V6tbEAD /moKXLRGWVb4eRabfVTyrzfPp4s2mC4VbPayE= X-Received: by 2002:a05:620a:2714:b0:8ef:ca26:dcf8 with SMTP id af79cd13be357-9161b954533mr612526585a.0.1781289025593; Fri, 12 Jun 2026 11:30:25 -0700 (PDT) X-Received: by 2002:a05:620a:2714:b0:8ef:ca26:dcf8 with SMTP id af79cd13be357-9161b954533mr612513885a.0.1781289024928; Fri, 12 Jun 2026 11:30:24 -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 2adb3069b0e04-5ad2e161fefsm742173e87.8.2026.06.12.11.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 11:30:23 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 12 Jun 2026 21:30:13 +0300 Subject: [PATCH v6 3/9] drm/amd/display: use drmm_writeback_connector_init() 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: <20260612-wb-drop-encoder-v6-3-9f3a54f81310@oss.qualcomm.com> References: <20260612-wb-drop-encoder-v6-0-9f3a54f81310@oss.qualcomm.com> In-Reply-To: <20260612-wb-drop-encoder-v6-0-9f3a54f81310@oss.qualcomm.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , 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 Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Louis Chauvet , Suraj Kandpal X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3286; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=MbaRBOLwFT+ETgHAVWF3UBcaA1Q1ln0hWBI7tVGYbZw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqLFA2TF8iWOsdGp/XNhFFMMbJIh1AWUGAs9E8q XZNuCdRYNKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaixQNgAKCRCLPIo+Aiko 1edSB/0VjeuYOMaO2KkI6CX4me4o/IauFy8eyB2qW0cOD6x73XUrx6wzyhhmPiEQs9KITW95Aux vOlO1OGm4WTd10dda61ZQYwFQCxUQCr7hUhOhpYfjLILW8d5w6LcrB4e/y4VO+m9yt89EgCxZ84 m8nTMxnSfypw3OwMZya9EzwpgnFKQI/emxXRCB8fJh3mYb69roMD5FzqMiPiMJoG4uQMv9uPEea UQC3upMrVgAG8LSU+oom9Leb8S4NQuNZEWgRfKGNF0fMB+9rQvKjr7Ga6EL6VshD355ZdKH8cNv KCLIdEljpwWS5Cc5UowFwL+muSXLb74Lh/zEqFv53Rdxr5ax X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: paezdSCrBGlYv3zjfpfBTI_42_Yelth1 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjEyMDE3MyBTYWx0ZWRfX0J1ALfw2u2fX jqpSPtRnRNXH2aGfatmNGp4Umy4+fi4xJtGZ2SsYG5Bfo+7vp43zwRfiF5XXrCe00hzfpjc2LHB z24OpvmVFYjvdZvOD/U1+NfwfiM2Kgs= X-Proofpoint-ORIG-GUID: paezdSCrBGlYv3zjfpfBTI_42_Yelth1 X-Authority-Analysis: v=2.4 cv=N94Z0W9B c=1 sm=1 tr=0 ts=6a2c5042 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=P-IC7800AAAA:8 a=QyXUC8HyAAAA:8 a=EUspDBNiAAAA:8 a=M-qvw7r3wQx8XY5Jx90A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=d3PnA9EDa4IxuAV0gXij:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjEyMDE3MyBTYWx0ZWRfX0zOcRanCGyFU ctAQfdWThB1JTFd2Rsb7I395w9e8MtXcQXzf1LLxk2pPtPM3RihoJCRbxI5P2p9epo0CiVjRkUm NBu0buvZ06VvoUrkeAUtw7QXYjUIuZeNivKOFL3AwbNZXgbU1l4EyIMv52bHVHWYFlYt7SIMVwB 19KSdfG8QdAsHteN+oHYmuWKibNVzAzCHGi8TTstjaBektbVtxeL4g6ffNET6PHH6DrzsscucKr 0gOqUuHlvyIesvbJudSR6t3D8ITFwc6eGHgyuNjd1tdvOyot5/9oFCcRu5TFJLBX01YRMcy/dvK iMiY6lKDxoKr8qMi6ezVniyVApGjQ0Nb9fnFJvaPmEntqpaAzPvnxVlQxBNRqwdvHDV0q3aHqIu g8uOJGoIayJq6Lm+UvHBr46kSszdUccX6SAfnrG6z3iwNrQw0y2MgPledtDgi/6BDRy0h14V02t sfkafOr5a95jkeWLdBw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-12_02,2026-06-12_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 adultscore=0 suspectscore=0 bulkscore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606040000 definitions=main-2606120173 The driver uses drm_writeback_connector_init() instead of its drmm counterpart, but it doesn't perform the job queue cleanup (neither manually nor by calling drm_writeback_connector_cleanup()). On the contrary, the drmm_writeback_connector_init() function ensures the proper cleanup of the job queue. Use drmm_plain_encoder_alloc() to allocate simple encoder and drmm_writeback_connector_init() in order to initialize writeback connector instance. Reviewed-by: Louis Chauvet Reviewed-by: Suraj Kandpal 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 436562e32e63..066ba6b6ef76 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -10996,7 +10996,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 110f0173eee6..fdc3da40452f 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 @@ -169,7 +169,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, @@ -188,17 +187,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.47.3