From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A7D637DEA9 for ; Sat, 18 Jul 2026 23:36:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417799; cv=none; b=ba9bSuHW7Z8TId0N5uLvW0+4FIRxx8HxRtWbrOO3ROL3Z0TmmCz9ztZ9lHqD8+j1/q2OwfanLmrIk38RaFpojJgrKj0ewkrtTPtqFYO6H4/Dzg24F7OIdvTfBYcEtAK+X1S6LQKnk2K1hNQQSKfI0jQqUG25kZVwV2YmHE4WKeo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417799; c=relaxed/simple; bh=b45v6y+LLUGyopM335rc2RHdtrcJI8ZwsczKTNDgp+c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J4j/Giadddj4cSBrEzr4ukD5+FZEeH0pLovH4GqJVwegVjs3NlazKPvHbKYIcGuOpd5qg5K/bweZ0b8x2Fut6iyr8XgexlFiEWxHVqH6/OSzqoFsk+yTx/esspASWyx049Hbui5ok7jj/4jtDbVYMHuLRuA2xiziPNWM5nygELI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JaAfHGWG; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JaAfHGWG" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-490cf322ed0so62569195e9.1 for ; Sat, 18 Jul 2026 16:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784417796; x=1785022596; 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=UCTzuFV7eFCGxIzO9ORcmzHtSM3Ggk/jrKBR0xDgYaA=; b=JaAfHGWG6TvBmkJTBMbup4QSWXEEO7R7E0EtGsSCvezJh1T4RzGoe5aPk6jWJAbie0 CEpxXQIF8MH845KBUddkDsMu2KYM8vRELPhHv4H8fQqzUSNbiqWVxylhjuwS8SgGjfQc S590pMS0qBw73IPh4p83yZAAZMR12OlUxwTIHf1hNlvlToEH2tR3gyGuJSLLZX3xkQ/0 wrUNALT28M2DxM/Z8/pB+/7+HNy6sSIUKWz2lmKpP9/atNVCahWwe11MhHcyn2RJAqOv qyN1pQhNumP73TylfFDfaUlzs+FWIB50AmAq+GQf/7Hb8pUc1mU/sqVz+0+97upvk4hy guDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784417796; x=1785022596; 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=UCTzuFV7eFCGxIzO9ORcmzHtSM3Ggk/jrKBR0xDgYaA=; b=kVkUDgs3Ho0WqKqp5beZmfxJF+I2ftSbEx6ec7M5AwAeFV77ZQ/dJP3hV+/MX7lRjX 7l9McpHW9epCVYb98gp61x1NnX2p85j4aswO+ZQIrFF0ADfaz1mSblDH0Q9OC6b1ZQF6 CInMNUCOEtju7ZReY3dJ6RLKXsrJ1Su73kuegZ8nV0m8+SGNt355X+3RXfHhScwsgy0B Z/HdOK6j/V2zXat+MMoPRxMcUX4RWEL46ecPRDUWuGoa+tdPXFjxoLOTHpwt1l+Xs1M9 eMjfLWybYGsH3JK5C4xZzTA9hmO+/Y/nuOdbXqelo7rwatqT29zODwYRe7g1/Jv8l4A+ XFwA== X-Forwarded-Encrypted: i=1; AHgh+Rpuxupk68mqmue0f4WSFAIP510aTqMjPKElK+zEhP1X+PzWgBaOi38/clKPbRWctAdcXLDtdCcgyCtS22Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4FgcS/RTNnbhv4AyjOLfyjrwt1lyj3Fp/yEaUIVTzhEUMhDTT +t7wK7TVdhe1C3fADWh8WR2zVsHkc33Z096skXEZx54KlB1gfHyFs1Mk X-Gm-Gg: AfdE7clRJ6DsLg/1RaAM/Dz7CDUqweSq9uXEHKQ9+AmXXdjiB/+A4SZkM4Y0X6kVF9Q bJeFLxiKA6lnve96FnfOVsqJ5QiGAnvuyyH1na0HCUNJCJS98R/HEVabKFQiRDgOgYEZBQaydBQ 4s7yX0KIvmOBHCPYf0GmhW7kRjBJHD+qwSnmui9eFbhWTw6cMwBg59QFgmAv3n7u5LWTjjMs31X m7AuOOhenR2JKfaXCs11Sac9sK5R7YcXZLFkeOCSL1DWqxf3CyOj28G4y21lds3RNH5DIQpT7p3 NcLSEmUDJl3BGRHwwt4ZjU4tZy6EgsA5aIEO9oKS+Qlxqvc3kMLFt5EiZj+Yo4X4LSlNk4hpPXV pekK2xUQ+mEbbnYiAy0M8SbRsLCUWFkXs+Hudv7xBXPlMG/7+N3UqYA+zzoYX32BTcYzg8nwYNL arPYI4FsFSgw== X-Received: by 2002:a05:600c:3b91:b0:495:4c62:9d43 with SMTP id 5b1f17b1804b1-4954c629e5emr98503215e9.34.1784417796224; Sat, 18 Jul 2026 16:36:36 -0700 (PDT) Received: from [127.0.0.2] ([2a01:14:111:ccf0:645b:9e5c:7fe3:c09f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954a2a24b6sm160964675e9.3.2026.07.18.16.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 16:36:35 -0700 (PDT) From: Diogo Silva Date: Sun, 19 Jul 2026 01:35:42 +0200 Subject: [PATCH 11/15] drm/hisilicon/kirin: remove dependency on DRM simple helpers 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: <20260719-drm_simple_encoder_init-v1-11-a78c509e3062@gmail.com> References: <20260719-drm_simple_encoder_init-v1-0-a78c509e3062@gmail.com> In-Reply-To: <20260719-drm_simple_encoder_init-v1-0-a78c509e3062@gmail.com> To: Jingoo Han , Inki Dae , Seung-Woo Kim , Kyungmin Park , David Airlie , Simona Vetter , Krzysztof Kozlowski , Peter Griffin , Alim Akhtar , Laurent Pinchart , Tomi Valkeinen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Michal Simek , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Stefan Agner , Alison Wang , Anitha Chrisanthus , David Airlie , Gerd Hoffmann , Dmitry Osipenko , Gurchetan Singh , Chia-I Wu , Jyri Sarha , Liu Ying , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Geert Uytterhoeven , Xinliang Liu , Sumit Semwal , Yongqin Liu , John Stultz , Liviu Dudau , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Jonathan Corbet , Shuah Khan Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, virtualization@lists.linux.dev, imx@lists.linux.dev, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-doc@vger.kernel.org, Diogo Silva X-Mailer: b4 0.15.2 The simple KMS helpers are deprecated because they only add an intermediate layer between drivers and atomic modesetting. Open-code drm_simple_encoder_init() by calling drm_encoder_init() directly and providing driver-local drm_encoder_funcs. Signed-off-by: Diogo Silva --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 15042365dec0..62c5bd3277da 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -20,11 +20,11 @@ #include #include #include +#include #include #include #include #include -#include #include "dw_dsi_reg.h" @@ -687,6 +687,10 @@ static int dsi_encoder_atomic_check(struct drm_encoder *encoder, return 0; } +static const struct drm_encoder_funcs dw_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static const struct drm_encoder_helper_funcs dw_encoder_helper_funcs = { .atomic_check = dsi_encoder_atomic_check, .mode_valid = dsi_encoder_mode_valid, @@ -708,7 +712,8 @@ static int dw_drm_encoder_init(struct device *dev, } encoder->possible_crtcs = crtc_mask; - ret = drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_DSI); + ret = drm_encoder_init(drm_dev, encoder, &dw_encoder_funcs, + DRM_MODE_ENCODER_DSI, NULL); if (ret) { DRM_ERROR("failed to init dsi encoder\n"); return ret; -- 2.54.0