From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1794141156; b=xZ50fT8leg8bx+l7Gg2p5Mcpb2UDDebMVJw27c20VlUo8ChSii3wzah4SV/pvk3CV0vb 8dG9G7Xuy4gFnAUrwwFDGVNbTSlSJH24dKVRR1kzm/NDcAgnCQiFEqthx5243rx0FFQyG r186DiOrdyflsArolrxu1taDa9lwvX37qEbzALZhIYP3LozwZ00BPIq9EQHkn1VbUFagD mUW81qfGHSX3SO9gsRDT292DLoCvgp/46fARHM/UJPcBDP8vgc2Udpu9EUfp3o2+5whOS J7iDqzZqq0jInSjhmIOlrLFf4lfLY8JSJspkV+eBRsA6j6loUNJT119fO1mrkJ25VZw== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794141156; h=Received:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Endpoint-Received: X-Original-From:Reply-To:Content-Transfer-Encoding; bh=X/DoHGbWC5JSvDDvY7gbXLwxKuA8YwkqE+dRdtUx7ek=; b=CwzWVuRN5wkfnW9Iq+P24gQKceMpm6B4mBZlXf8nYmTxUf9OYI/bzc+WJkA+wiGkscCg 6x7ZVW1mz6Wv2SyeqAOLu00g1cOzEcthhodMj22yIIz7tI6STXQK5/95JEzOu3unhnCa9 MnQd7gj2ZHTOq7O6HYaRtMsjQ/OH33Fhf8QMC874E3cPMHyFxR+KehaUjh6vFoVzCpecp xZ8MBTObYfTOJqmLQEzt4S/q53aPdzNwnyHH+nuabla+Uysq/caXnJ00uTB/ApYAg9PZw L7OFW/Pdd32XqQY/liUiWelFAyNkOseJtcM/vVt2jQ/OjRNUlIGVITVJXy42u0ch1dQ== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=EipOinmE; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59589606D818; Sun, 8 Nov 2026 12:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=EipOinmE Authentication-Results: smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 ARC-Seal: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; cv=none; t=1794141156; b=Ey3Fq11pmMBIjFZmlvGLJGXBDVOiSpPv5Bhro4B7TdDqEEVFR+zGGtAwQ8m446S5oj5j h6hfyX3Axi4ynNFIDET9UCR1S8nAbyInfuX1obt5hPV4zoFI57wSSnvPhKS/sXwj2yJ8J vKFs1MYoOHgPsvTS0M5tYXCAQo2oZoRgK4wdKFwtGy9sVFw0wX2sk4J+0cmUPz2dBGPi8 MBMthG7ySx/yMEZTHcYcOQCarQoPOz+ibFExs3C0kYeX1yr42ZvIEdzaZvo6lUdIG1Vk+ ul7tpUchT69tpB3pfoYarpLoJcdxWR8IQqpZsHpW7vJCMwgLjpnI4m3WaLiD0nx6E4w== ARC-Message-Signature: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; c=relaxed/relaxed; t=1794141156; h=DKIM-Signature:Received:From:Date:Subject:MIME-Version:Content-Type: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Endpoint-Received: X-Original-From:Reply-To:Content-Transfer-Encoding; bh=X/DoHGbWC5JSvDDvY7gbXLwxKuA8YwkqE+dRdtUx7ek=; b=L6q6S/uiLY5+AaenREPyHmMQkstGigHxbQ/D7iPGbDY6/NHzxXkxcKbuC14sFzT0IcZw KFEk6r4Hh5lOY/VVvbeWZOixWyAJlXVpQ3n6n7872QtgWF4mDrCFNnplcwD4NJrT0BR+F khKEEmQdB5uSXT5/KRyi6GAUsJL9rC5+X18gLGVM2onY19LoQq6orWsarKtGBgUTvHf+w 1+7eH00+cOh74MnzZKocDaNwyT/r8pxXi0Esmu6ToG2SWB0TnQFl7mrruGGg4bgc2owLU C8l2fXLEcU/eVR5gDSJ+oiSypTEwclKJBEHNp/joQQRH2Wi+rJr9/3ZTJTPqpoYPHUQ== ARC-Authentication-Results: i=1; smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 Received: from lkml.kernel.org (nexus.subspace.kernel.org [100.80.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id DD6931F008A5; Sun, 8 Nov 2026 12:32:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794141156; bh=X/DoHGbWC5JSvDDvY7gbXLwxKuA8YwkqE+dRdtUx7ek=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To; b=EipOinmEzGEIb3hxJFkncq69xzTVULS1KvsxCw1uMaP9RZRIvVgc1WhNVlpHnl/tN lroZ+dIpBedW3Qd96SzAE4eCVz7JWp/aEcA5O2FQTr+ODJLTfquhoL04v5ZPxu8w86 +B9MG/CTKfmkAPUFtTZMIl5KBhXU/PUjp3GkDs1mSog6g2zyozobR5CJGiXZVsRRNE u7Z7q+9UV7P+QYPDWkd5YxlJJJRvrmcJhO0NyDvg9yLspHJ0ICGOtcP/pI+EpOtp6x xD6JDZCu0pJr+QHa/hDTzTRjyK42MQ4q2M7BxgkqBwlN0bRgF+oh0Df5SwXKFp+KS9 lpEWFDhTh5NSA== Received: from nexus.subspace.kernel.org (localhost [IPv6:::1]) by lkml.kernel.org (Postfix) with ESMTP id 6366047F71; Sun, 8 Nov 2026 12:32:32 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Sun, 08 Nov 2026 12:32:25 +0000 Subject: [PATCH v3 04/10] drm/panel: s6e3ha8: Prepare for supporting multiple panels X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Message-Id: <20261108-crosshatch-panel-v3-4-87dd4ec4f7cc@ixit.cz> References: <20261108-crosshatch-panel-v3-0-87dd4ec4f7cc@ixit.cz> In-Reply-To: <20261108-crosshatch-panel-v3-0-87dd4ec4f7cc@ixit.cz> To: Dzmitry Sankouski , Neil Armstrong , Jessica Zhang , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Abel Vesa Cc: Konrad Dybcio , Petr Vorel , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, phone-devel@vger.kernel.org, David Heidelberg X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=10585; i=david@ixit.cz; h=from:subject:message-id; bh=vxv5cIvIJf2nydvOShwWwnNh6DF9O7yQfzANpYBQVv8=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBq8Gvezsk9LNpo3F8fGWjyZWg/upJ9kem81c9IE EEe2p7E20OJAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCavBr3gAKCRBgAj/E00kg cjPkEADBe98KBv5Auxum9m3BxUO49hYjoFpNjKC/MkS/ZK2L0QkOBr/7nnBA7CS1nNXKS5t1oaw UaUktCK75Gxy03Ns97eBV4OgTQChM5fitsLxNiKOkVqbygsaBY6ZL/gBRsATGfyAHYMetTjrDJT WWff0NkJ3CT5IZGqGXwnEuYWGoZsjfgjmY83FpkWh8EYC6I/x4BthN7dqn9oOYjnPgFkhQ1AAYX 9HWvWcRAFAztNOwWkdIkxvaL3LvATuE1geID4SYpdm89lPgE0K3dY9r6iXp33cd8DrnG6eMlSi4 ums+83ccEs3kHY3ndZaL8+L20vN2LLOSKJ5zrroUEBUSRyfkDwjrtzvHqpetAHqeOrDYaXPmy+Z soMP8RrJy/9KcuEQZ2kbsm0UlJm/SxKX9qt4xfJRmh4mrJMZuX13XyAlnBrlkND3WHM9oydb2GU cOTuIXTv/XBSTP7AAABIkOnxOWoHD4ylupyXPGe3NbH0cy+Pep6k2DTV0MlNVav3zb5tVtvOGw/ 6amPfB0804ZVccsAiawGkNiNWGGsy3nQdU6QRozhimnSYngUl76/0ruYLF53VNIdx8YcSPmZT8F OAsE0CWte1uqifwMtWLjdDfZ4g1twt4ORIzcKDq8dxt4f9ZZqTbJcEwLXA92AOnMH16P3h51dXp XFPptOTcFOEIP+Q== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz Content-Transfer-Encoding: 7bit From: David Heidelberg The S6E3HA8 DDIC drives more panels than the Galaxy S9 (AMB577PX01) one currently supported. Move the display mode, DSI mode flags, regulator supplies and panel functions into a per-compatible descriptor passed as OF match data, and rename the panel-specific symbols accordingly. No functional change. Reviewed-by: Neil Armstrong Signed-off-by: David Heidelberg --- drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c | 118 ++++++++++++++++---------- 1 file changed, 74 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c index 45b1c522b0ccf..f5b3992d948bc 100644 --- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c +++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c @@ -3,49 +3,73 @@ // Generated with linux-mdss-dsi-panel-driver-generator from vendor device tree: // Copyright (c) 2013, The Linux Foundation. All rights reserved. // Copyright (c) 2024 Dzmitry Sankouski #include #include #include #include +#include #include #include #include #include #include #include #include "panel-samsung-dsi.h" +struct s6e3ha8_desc { + const struct drm_panel_funcs *funcs; + const struct drm_display_mode *mode; + unsigned long mode_flags; + const struct regulator_bulk_data *supplies; + unsigned int num_supplies; +}; + struct s6e3ha8 { struct drm_panel panel; struct mipi_dsi_device *dsi; + const struct s6e3ha8_desc *desc; struct drm_dsc_config dsc; struct gpio_desc *reset_gpio; struct regulator_bulk_data *supplies; }; -static const struct regulator_bulk_data s6e3ha8_supplies[] = { +static const struct regulator_bulk_data s6e3ha8_vddr_supplies[] = { { .supply = "vdd3" }, { .supply = "vci" }, { .supply = "vddr" }, }; -static inline -struct s6e3ha8 *to_s6e3ha8_amb577px01_wqhd(struct drm_panel *panel) +static inline struct s6e3ha8 *to_s6e3ha8(struct drm_panel *panel) { return container_of(panel, struct s6e3ha8, panel); } #define s6e3ha8_afc_off(ctx) \ mipi_dsi_dcs_write_seq_multi(ctx, 0xe2, 0x00, 0x00) +static int s6e3ha8_get_modes(struct drm_panel *panel, + struct drm_connector *connector) +{ + struct s6e3ha8 *priv = to_s6e3ha8(panel); + + return drm_connector_helper_get_modes_fixed(connector, priv->desc->mode); +} + +static int s6e3ha8_unprepare(struct drm_panel *panel) +{ + struct s6e3ha8 *priv = to_s6e3ha8(panel); + + return regulator_bulk_disable(priv->desc->num_supplies, priv->supplies); +} + static void s6e3ha8_amb577px01_wqhd_reset(struct s6e3ha8 *priv) { gpiod_set_value_cansleep(priv->reset_gpio, 1); usleep_range(5000, 6000); gpiod_set_value_cansleep(priv->reset_gpio, 0); usleep_range(5000, 6000); gpiod_set_value_cansleep(priv->reset_gpio, 1); usleep_range(5000, 6000); @@ -130,32 +154,32 @@ static int s6e3ha8_amb577px01_wqhd_on(struct s6e3ha8 *priv) mipi_dsi_dcs_write_seq_multi(&ctx, 0xf7, 0x03); /* Gamma, LTPS(AID) update */ samsung_dsi_test_key_off_lvl2(&ctx); samsung_dsi_test_key_off_lvl1(&ctx); return ctx.accum_err; } -static int s6e3ha8_enable(struct drm_panel *panel) +static int s6e3ha8_amb577px01_wqhd_enable(struct drm_panel *panel) { - struct s6e3ha8 *priv = to_s6e3ha8_amb577px01_wqhd(panel); + struct s6e3ha8 *priv = to_s6e3ha8(panel); struct mipi_dsi_device *dsi = priv->dsi; struct mipi_dsi_multi_context ctx = { .dsi = dsi }; samsung_dsi_test_key_on_lvl1(&ctx); mipi_dsi_dcs_set_display_on_multi(&ctx); samsung_dsi_test_key_off_lvl1(&ctx); return ctx.accum_err; } -static int s6e3ha8_disable(struct drm_panel *panel) +static int s6e3ha8_amb577px01_wqhd_disable(struct drm_panel *panel) { - struct s6e3ha8 *priv = to_s6e3ha8_amb577px01_wqhd(panel); + struct s6e3ha8 *priv = to_s6e3ha8(panel); struct mipi_dsi_device *dsi = priv->dsi; struct mipi_dsi_multi_context ctx = { .dsi = dsi }; samsung_dsi_test_key_on_lvl1(&ctx); mipi_dsi_dcs_set_display_off_multi(&ctx); samsung_dsi_test_key_off_lvl1(&ctx); mipi_dsi_msleep(&ctx, 20); @@ -165,23 +189,23 @@ static int s6e3ha8_disable(struct drm_panel *panel) mipi_dsi_msleep(&ctx, 160); return ctx.accum_err; } static int s6e3ha8_amb577px01_wqhd_prepare(struct drm_panel *panel) { - struct s6e3ha8 *priv = to_s6e3ha8_amb577px01_wqhd(panel); + struct s6e3ha8 *priv = to_s6e3ha8(panel); struct mipi_dsi_device *dsi = priv->dsi; struct mipi_dsi_multi_context ctx = { .dsi = dsi }; struct drm_dsc_picture_parameter_set pps; int ret; - ret = regulator_bulk_enable(ARRAY_SIZE(s6e3ha8_supplies), priv->supplies); + ret = regulator_bulk_enable(priv->desc->num_supplies, priv->supplies); if (ret < 0) return ret; mipi_dsi_msleep(&ctx, 120); s6e3ha8_amb577px01_wqhd_reset(priv); ret = s6e3ha8_amb577px01_wqhd_on(priv); if (ret < 0) { gpiod_set_value_cansleep(priv->reset_gpio, 1); @@ -193,88 +217,88 @@ static int s6e3ha8_amb577px01_wqhd_prepare(struct drm_panel *panel) samsung_dsi_test_key_on_lvl1(&ctx); mipi_dsi_picture_parameter_set_multi(&ctx, &pps); samsung_dsi_test_key_off_lvl1(&ctx); mipi_dsi_msleep(&ctx, 28); return ctx.accum_err; err: - regulator_bulk_disable(ARRAY_SIZE(s6e3ha8_supplies), priv->supplies); + regulator_bulk_disable(priv->desc->num_supplies, priv->supplies); return ret; } -static int s6e3ha8_amb577px01_wqhd_unprepare(struct drm_panel *panel) -{ - struct s6e3ha8 *priv = to_s6e3ha8_amb577px01_wqhd(panel); - - return regulator_bulk_disable(ARRAY_SIZE(s6e3ha8_supplies), priv->supplies); -} - static const struct drm_display_mode s6e3ha8_amb577px01_wqhd_mode = { .clock = (1440 + 116 + 44 + 120) * (2960 + 120 + 80 + 124) * 60 / 1000, .hdisplay = 1440, .hsync_start = 1440 + 116, .hsync_end = 1440 + 116 + 44, .htotal = 1440 + 116 + 44 + 120, .vdisplay = 2960, .vsync_start = 2960 + 120, .vsync_end = 2960 + 120 + 80, .vtotal = 2960 + 120 + 80 + 124, .width_mm = 64, .height_mm = 132, }; -static int s6e3ha8_amb577px01_wqhd_get_modes(struct drm_panel *panel, - struct drm_connector *connector) -{ - return drm_connector_helper_get_modes_fixed(connector, &s6e3ha8_amb577px01_wqhd_mode); -} - static const struct drm_panel_funcs s6e3ha8_amb577px01_wqhd_panel_funcs = { .prepare = s6e3ha8_amb577px01_wqhd_prepare, - .unprepare = s6e3ha8_amb577px01_wqhd_unprepare, - .get_modes = s6e3ha8_amb577px01_wqhd_get_modes, - .enable = s6e3ha8_enable, - .disable = s6e3ha8_disable, + .unprepare = s6e3ha8_unprepare, + .get_modes = s6e3ha8_get_modes, + .enable = s6e3ha8_amb577px01_wqhd_enable, + .disable = s6e3ha8_amb577px01_wqhd_disable, +}; + +static const struct s6e3ha8_desc s6e3ha8_amb577px01_wqhd_desc = { + .funcs = &s6e3ha8_amb577px01_wqhd_panel_funcs, + .mode = &s6e3ha8_amb577px01_wqhd_mode, + .mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS | + MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP | + MIPI_DSI_MODE_VIDEO_NO_HSA | MIPI_DSI_MODE_NO_EOT_PACKET, + .supplies = s6e3ha8_vddr_supplies, + .num_supplies = ARRAY_SIZE(s6e3ha8_vddr_supplies), }; -static int s6e3ha8_amb577px01_wqhd_probe(struct mipi_dsi_device *dsi) +static int s6e3ha8_probe(struct mipi_dsi_device *dsi) { struct device *dev = &dsi->dev; + const struct s6e3ha8_desc *desc; struct s6e3ha8 *priv; int ret; - priv = devm_drm_panel_alloc(dev, struct s6e3ha8, panel, - &s6e3ha8_amb577px01_wqhd_panel_funcs, + desc = device_get_match_data(dev); + if (!desc) + return -ENODEV; + + priv = devm_drm_panel_alloc(dev, struct s6e3ha8, panel, desc->funcs, DRM_MODE_CONNECTOR_DSI); if (IS_ERR(priv)) return PTR_ERR(priv); - ret = devm_regulator_bulk_get_const(dev, ARRAY_SIZE(s6e3ha8_supplies), - s6e3ha8_supplies, - &priv->supplies); + priv->desc = desc; + + ret = devm_regulator_bulk_get_const(dev, desc->num_supplies, + desc->supplies, &priv->supplies); if (ret < 0) { dev_err(dev, "failed to get regulators: %d\n", ret); return ret; } priv->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(priv->reset_gpio)) return dev_err_probe(dev, PTR_ERR(priv->reset_gpio), "Failed to get reset-gpios\n"); priv->dsi = dsi; mipi_dsi_set_drvdata(dsi, priv); dsi->lanes = 4; dsi->format = MIPI_DSI_FMT_RGB888; - dsi->mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS | - MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP | - MIPI_DSI_MODE_VIDEO_NO_HSA | MIPI_DSI_MODE_NO_EOT_PACKET; + dsi->mode_flags = priv->desc->mode_flags; priv->panel.prepare_prev_first = true; ret = devm_drm_panel_add(dev, &priv->panel); if (ret) return ret; /* This panel only supports DSC; unconditionally enable it */ @@ -295,27 +319,33 @@ static int s6e3ha8_amb577px01_wqhd_probe(struct mipi_dsi_device *dsi) if (ret < 0) { dev_err(dev, "Failed to attach to DSI host: %d\n", ret); return ret; } return 0; } -static const struct of_device_id s6e3ha8_amb577px01_wqhd_of_match[] = { - { .compatible = "samsung,s6e3ha8" }, /* deprecated */ - { .compatible = "samsung,s6e3ha8-amb577px01" }, +static const struct of_device_id s6e3ha8_of_match[] = { + { + /* deprecated */ + .compatible = "samsung,s6e3ha8", + .data = &s6e3ha8_amb577px01_wqhd_desc, + }, { + .compatible = "samsung,s6e3ha8-amb577px01", + .data = &s6e3ha8_amb577px01_wqhd_desc, + }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(of, s6e3ha8_amb577px01_wqhd_of_match); +MODULE_DEVICE_TABLE(of, s6e3ha8_of_match); -static struct mipi_dsi_driver s6e3ha8_amb577px01_wqhd_driver = { - .probe = s6e3ha8_amb577px01_wqhd_probe, +static struct mipi_dsi_driver s6e3ha8_driver = { + .probe = s6e3ha8_probe, .driver = { .name = "panel-s6e3ha8", - .of_match_table = s6e3ha8_amb577px01_wqhd_of_match, + .of_match_table = s6e3ha8_of_match, }, }; -module_mipi_dsi_driver(s6e3ha8_amb577px01_wqhd_driver); +module_mipi_dsi_driver(s6e3ha8_driver); MODULE_AUTHOR("Dzmitry Sankouski "); MODULE_DESCRIPTION("DRM driver for S6E3HA8 panel"); MODULE_LICENSE("GPL"); -- 2.55.0