From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 07970436BD1 for ; Mon, 20 Jul 2026 15:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784562091; cv=none; b=S76VpIrWo8PpHTnyWKdnJz1pxa2xE4+H22k7VrN+ybokOQ7bYuHnCTSK6a2/fLKWm9uWiqKl2JY+TOu/70BFqro0jWywp/9z8E6CpBxdLTN+dG6ED+XeXJyMf2gKidDp7a038L2WY02pd8hlG3Ky0ryV9lNNHdFf2YNSzz253wU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784562091; c=relaxed/simple; bh=b45v6y+LLUGyopM335rc2RHdtrcJI8ZwsczKTNDgp+c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=onwZAFZMKgBZhOzkyWvIlyYesBDo34ciF99h35XxS0rzdN37vF0/0BCMtGUUDF6yqX40DVDrTKFDv432Ri1mnI946HET7JV9rguX1nH2HeTtEpgxK9zp0iR4WMCKdnkJO6dFyygxnAxUjBFU5hRO6QAlKXVUr5TkyCD+qZ0hGV8= 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=QayUpF17; arc=none smtp.client-ip=209.85.128.41 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="QayUpF17" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4954c0833b4so18818165e9.1 for ; Mon, 20 Jul 2026 08:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784562088; x=1785166888; 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=QayUpF17xIC1mlZkqF3QKUN6AM+/crGZ0xwMgLfy3ONaUrLJmX12m6lI9XDD/unC2Y EyDFhOqFK874VxTI4ITJiy2uYySi5pSQNXKY5/gbPdkZX8cs3v/+dN7fTN2UF9eQ3qZ3 zAdHvqMRANCeZXiJm5zzc+JKOVzYCi6gPe3Z8nEBK48j+uDbJ+VCCAXdR45sY8AhXv3Q hlHpInJOu4cU1NyUM/OdZD7+58dWDLPL99oEihxGVyzFj1XJvd0ziCJU+Vy27EFroJma g6BHlQx5rdpmpuMozXwKwI74FNDcFksAgk7i9PY0YLrehWStdimk0F925NoWLZQlCVzY chHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784562088; x=1785166888; 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=Zvw6eLqFKQmzgmqCbOdUg+t0faHpw1DTeHABuOOeb1T1BbXUKY/KRK2EUmOo1tSBCl O1o/g+gU0Q0mr4pXahoD8AVx+RppRvKjpCOsX6MU8Xvlfwu+0pVIITii9xL16ahZaL0T wvpxztdviOrEeZJOnaBIn0WlsySRCNzMlW3Jc3edpAshD+oWyVwSgJO4fODjqwDWW0VB MFrcnR+UQCBfZY4fFItiObhysfxNxA0V2JBDZ9Jb8GDw5J5l3PKtnW6Z/lrRD0rCsjKj KKp5pzZ3rGinnC98V3G40rfLw1L6E7Ro0L9HLPTHLwtBp95NZxGhcA+93jut3Z2WdDz1 pCsg== X-Forwarded-Encrypted: i=1; AHgh+RooEqNYhsLTAcaNEbvNr3K9QXo+/JCKq73VkuQKD2leGCoaFelosnSkIZKoSq1/vR/MWvily9JSX+Y/KZL5pVgwBg==@vger.kernel.org X-Gm-Message-State: AOJu0YyW079xmmsW2VLegpCO3DMbV8EGwwVYVqfEAfCpI5QpQMRjj53j NZAr8HkhdTsbUhKwaipkbvXTyECfoN7AtjN3t7fO78InVCEUKQXCVnjM X-Gm-Gg: AfdE7cmxOy/ry6yLYQJoniB8VuJm0nOdwNaPtDnQePOvhBXodlehz69uC+LeNiy9gdI c1K13lFlfitwfsKu+93NH6HiBDvRY5tKk8rXweHXf7i27+kCp45yLoiiznhgo3XNtKY6UQQAIbT CMFW4flJDkISYAS+FMxiyHx4A5m0RkmY34aYQoGUVjkars8Hx23tv2dA8lCJjhD76Jp36ikOVM3 yfWJOv7Wn//hwWO/sFihDjC4V6J0Mw7LxPy9PF/QNknrHzOyKD6FXHTUTMe6h75zJxxi6RXTvEk g5i8kDGVGT4BOBOdTk3zRI+l/1fBP4UlTfaHghD6KLL1tCHEkvrP/ptUvxXR5ficcHFp4flnlAr rjNt+NFzk0NauTetjWgrSbRMayaGHNQo2Ea9ImLSYF4IQ+Rwk1E7+tYxH2rvhSHdlxKAw0P9ggi xi7DfxdHggiLedG86y22dd X-Received: by 2002:a05:600c:1d1e:b0:493:b6ee:fcb7 with SMTP id 5b1f17b1804b1-4954a3f39ffmr153406895e9.14.1784562088052; Mon, 20 Jul 2026 08:41:28 -0700 (PDT) Received: from [127.0.0.2] ([2a01:14:111:ccf0:e9c1:2f80:10a9:c708]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f67466e09sm32667936f8f.21.2026.07.20.08.41.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 08:41:27 -0700 (PDT) From: Diogo Silva Date: Mon, 20 Jul 2026 17:40:43 +0200 Subject: [PATCH v2 11/15] drm/hisilicon/kirin: remove dependency on DRM simple helpers Precedence: bulk X-Mailing-List: linux-samsung-soc@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: <20260720-drm_simple_encoder_init-v2-11-5020b630668a@gmail.com> References: <20260720-drm_simple_encoder_init-v2-0-5020b630668a@gmail.com> In-Reply-To: <20260720-drm_simple_encoder_init-v2-0-5020b630668a@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