From nobody Thu Apr  9 21:57:28 2026
Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56])
	(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 BE125262BD
	for <linux-kernel@vger.kernel.org>; Thu,  5 Mar 2026 15:59:30 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 arc=none smtp.client-ip=185.246.84.56
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772726372; cv=none;
 b=IjRBDwEPdW3rfxo85uXUnxlOhdT2B2cLW5YXi9NVf5upaQU+n7+LqaGD6QcvMR4dEZSEQ+2UZDiKLS70e6u+Cy/7FpnPnIZuFMJd21hQj/LrffssGa9tL4l00KyLm1p99l1HWSu4mqHKyEpae2JSTE780YAkkqlWyxzgdrvDvqg=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772726372; c=relaxed/simple;
	bh=QOs1bAsgjRYlWRZxNKohSQcjUzJLdZts1tx/SAc65bM=;
	h=From:To:Cc:Subject:Date:Message-ID:MIME-Version;
 b=mSKYKm9Bnpy0VGvR1xFZ0nVS24PDc1b36HsFk9Pdyqwdmhrf3PESo9YbnXilU+mRcE+d6WwIVYk13VfqAaASxEAkhZZxtsNbkih6im9Jsv4XYtffDSMySySiCfEa2H4MfVmgb4k4Wc3yIPLsyAE3tB1fkkiZzhqfCroAdgfx4t0=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
 dmarc=pass (p=reject dis=none) header.from=bootlin.com;
 spf=pass smtp.mailfrom=bootlin.com;
 dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com
 header.b=meDuvyIu; arc=none smtp.client-ip=185.246.84.56
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=pass (p=reject dis=none) header.from=bootlin.com
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=bootlin.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com
 header.b="meDuvyIu"
Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233])
	by smtpout-02.galae.net (Postfix) with ESMTPS id 3E3651A2CE2;
	Thu,  5 Mar 2026 15:59:29 +0000 (UTC)
Received: from mail.galae.net (mail.galae.net [212.83.136.155])
	by smtpout-01.galae.net (Postfix) with ESMTPS id 116CF5FF89;
	Thu,  5 Mar 2026 15:59:29 +0000 (UTC)
Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon)
 with ESMTPSA id 6DF5110369314;
	Thu,  5 Mar 2026 16:59:24 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim;
	t=1772726368; h=from:subject:date:message-id:to:cc:mime-version:
	 content-transfer-encoding; bh=2g55IQ9Z6PNGrryFVuRVWjR0F8ZMs0TVYXk90v/Q6fk=;
	b=meDuvyIuwyzVnNQ3XeHYVKFioNP6QqLVd7prIiaSmm++fHJcBymbnDRTY2BnNqSlV+EvWm
	gU2snTKi1TqM+6D1McSS7PHAUrqn2AVUr+qerYucws6Jek15IbVy7tzzzw5cuUoQSw2xJI
	2yvzb34orOAtCjIVYRTjaS8diHW0YJyNPDfrrfoySuK53Oo3O5ObpeMuqlQbkpCXHK792G
	5vWcFx7QqVCqMa9ylEwVz5F2aLoEg92mFpDu2dUm6Moi32oAW/IrvpTO7XjI94l6ZH3nCN
	DhioicOA8ptqZBRs1129k4Fc+xGn9QR0Ya6EatKkm+rXs5AONvGb4pMS+QiGgw==
From: Kory Maincent <kory.maincent@bootlin.com>
To: Maxime Ripard <mripard@kernel.org>,
	linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org
Cc: Luca Ceresoli <luca.ceresoli@bootlin.com>,
	Bajjuri Praneeth <praneeth@ti.com>,
	"Kory Maincent (TI)" <kory.maincent@bootlin.com>,
	thomas.petazzoni@bootlin.com,
	Jyri Sarha <jyri.sarha@iki.fi>,
	Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>,
	Simona Vetter <simona@ffwll.ch>
Subject: [PATCH] drm/tilcdc: Remove tilcdc_panel driver reintroduced by a
 merge
Date: Thu,  5 Mar 2026 16:59:19 +0100
Message-ID: <20260305155921.659550-1-kory.maincent@bootlin.com>
X-Mailer: git-send-email 2.43.0
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Last-TLS-Session-Version: TLSv1.3
Content-Type: text/plain; charset="utf-8"

From: "Kory Maincent (TI)" <kory.maincent@bootlin.com>

The tilcdc_panel driver was removed by commit 8f1e1ab9c794 ("drm/tilcdc:
Remove tilcdc panel driver"), but was inadvertently reintroduced by the
merge commit 8b85987d3cf5 ("Merge drm/drm-next into drm-misc-next").

The regression went unnoticed because standard git commands such as
'git show' do not expose the change. It was only spotted via
'git show --stat':

  git show --stat 8b85987d3cf5 | grep tilcdc
  drivers/gpu/drm/tilcdc/tilcdc_panel.c | 408 +

  git show 8b85987d3cf5 | grep tilcdc
  (no output)

Remove tilcdc_panel.c again to restore the previously intended state.

Fixes: 8b85987d3cf5 ("Merge drm/drm-next into drm-misc-next")
Signed-off-by: Kory Maincent (TI) <kory.maincent@bootlin.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
 drivers/gpu/drm/tilcdc/tilcdc_panel.c | 408 --------------------------
 1 file changed, 408 deletions(-)
 delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel.c

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc=
/tilcdc_panel.c
deleted file mode 100644
index 1de3996501f7b..0000000000000
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ /dev/null
@@ -1,408 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2012 Texas Instruments
- * Author: Rob Clark <robdclark@gmail.com>
- */
-
-#include <linux/backlight.h>
-#include <linux/gpio/consumer.h>
-#include <linux/platform_device.h>
-
-#include <video/display_timing.h>
-#include <video/of_display_timing.h>
-#include <video/videomode.h>
-
-#include <drm/drm_atomic_state_helper.h>
-#include <drm/drm_connector.h>
-#include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_simple_kms_helper.h>
-
-#include "tilcdc_drv.h"
-#include "tilcdc_panel.h"
-
-struct panel_module {
-	struct tilcdc_module base;
-	struct tilcdc_panel_info *info;
-	struct display_timings *timings;
-	struct backlight_device *backlight;
-	struct gpio_desc *enable_gpio;
-};
-#define to_panel_module(x) container_of(x, struct panel_module, base)
-
-
-/*
- * Encoder:
- */
-
-struct panel_encoder {
-	struct drm_encoder base;
-	struct panel_module *mod;
-};
-#define to_panel_encoder(x) container_of(x, struct panel_encoder, base)
-
-static void panel_encoder_dpms(struct drm_encoder *encoder, int mode)
-{
-	struct panel_encoder *panel_encoder =3D to_panel_encoder(encoder);
-	struct backlight_device *backlight =3D panel_encoder->mod->backlight;
-	struct gpio_desc *gpio =3D panel_encoder->mod->enable_gpio;
-
-	if (backlight) {
-		backlight->props.power =3D mode =3D=3D DRM_MODE_DPMS_ON ?
-					 BACKLIGHT_POWER_ON : BACKLIGHT_POWER_OFF;
-		backlight_update_status(backlight);
-	}
-
-	if (gpio)
-		gpiod_set_value_cansleep(gpio,
-					 mode =3D=3D DRM_MODE_DPMS_ON ? 1 : 0);
-}
-
-static void panel_encoder_prepare(struct drm_encoder *encoder)
-{
-	panel_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
-}
-
-static void panel_encoder_commit(struct drm_encoder *encoder)
-{
-	panel_encoder_dpms(encoder, DRM_MODE_DPMS_ON);
-}
-
-static void panel_encoder_mode_set(struct drm_encoder *encoder,
-		struct drm_display_mode *mode,
-		struct drm_display_mode *adjusted_mode)
-{
-	/* nothing needed */
-}
-
-static const struct drm_encoder_helper_funcs panel_encoder_helper_funcs =
=3D {
-		.dpms           =3D panel_encoder_dpms,
-		.prepare        =3D panel_encoder_prepare,
-		.commit         =3D panel_encoder_commit,
-		.mode_set       =3D panel_encoder_mode_set,
-};
-
-static struct drm_encoder *panel_encoder_create(struct drm_device *dev,
-		struct panel_module *mod)
-{
-	struct panel_encoder *panel_encoder;
-	struct drm_encoder *encoder;
-	int ret;
-
-	panel_encoder =3D devm_kzalloc(dev->dev, sizeof(*panel_encoder),
-				     GFP_KERNEL);
-	if (!panel_encoder)
-		return NULL;
-
-	panel_encoder->mod =3D mod;
-
-	encoder =3D &panel_encoder->base;
-	encoder->possible_crtcs =3D 1;
-
-	ret =3D drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_LVDS);
-	if (ret < 0)
-		goto fail;
-
-	drm_encoder_helper_add(encoder, &panel_encoder_helper_funcs);
-
-	return encoder;
-
-fail:
-	drm_encoder_cleanup(encoder);
-	return NULL;
-}
-
-/*
- * Connector:
- */
-
-struct panel_connector {
-	struct drm_connector base;
-
-	struct drm_encoder *encoder;  /* our connected encoder */
-	struct panel_module *mod;
-};
-#define to_panel_connector(x) container_of(x, struct panel_connector, base)
-
-
-static void panel_connector_destroy(struct drm_connector *connector)
-{
-	drm_connector_unregister(connector);
-	drm_connector_cleanup(connector);
-}
-
-static int panel_connector_get_modes(struct drm_connector *connector)
-{
-	struct drm_device *dev =3D connector->dev;
-	struct panel_connector *panel_connector =3D to_panel_connector(connector);
-	struct display_timings *timings =3D panel_connector->mod->timings;
-	int i;
-
-	for (i =3D 0; i < timings->num_timings; i++) {
-		struct drm_display_mode *mode;
-		struct videomode vm;
-
-		if (videomode_from_timings(timings, &vm, i))
-			break;
-
-		mode =3D drm_mode_create(dev);
-		if (!mode)
-			break;
-
-		drm_display_mode_from_videomode(&vm, mode);
-
-		mode->type =3D DRM_MODE_TYPE_DRIVER;
-
-		if (timings->native_mode =3D=3D i)
-			mode->type |=3D DRM_MODE_TYPE_PREFERRED;
-
-		drm_mode_set_name(mode);
-		drm_mode_probed_add(connector, mode);
-	}
-
-	return i;
-}
-
-static struct drm_encoder *panel_connector_best_encoder(
-		struct drm_connector *connector)
-{
-	struct panel_connector *panel_connector =3D to_panel_connector(connector);
-	return panel_connector->encoder;
-}
-
-static const struct drm_connector_funcs panel_connector_funcs =3D {
-	.destroy            =3D panel_connector_destroy,
-	.fill_modes         =3D drm_helper_probe_single_connector_modes,
-	.reset              =3D drm_atomic_helper_connector_reset,
-	.atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state,
-	.atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state,
-};
-
-static const struct drm_connector_helper_funcs panel_connector_helper_func=
s =3D {
-	.get_modes          =3D panel_connector_get_modes,
-	.best_encoder       =3D panel_connector_best_encoder,
-};
-
-static struct drm_connector *panel_connector_create(struct drm_device *dev,
-		struct panel_module *mod, struct drm_encoder *encoder)
-{
-	struct panel_connector *panel_connector;
-	struct drm_connector *connector;
-	int ret;
-
-	panel_connector =3D devm_kzalloc(dev->dev, sizeof(*panel_connector),
-				       GFP_KERNEL);
-	if (!panel_connector)
-		return NULL;
-
-	panel_connector->encoder =3D encoder;
-	panel_connector->mod =3D mod;
-
-	connector =3D &panel_connector->base;
-
-	drm_connector_init(dev, connector, &panel_connector_funcs,
-			DRM_MODE_CONNECTOR_LVDS);
-	drm_connector_helper_add(connector, &panel_connector_helper_funcs);
-
-	connector->interlace_allowed =3D 0;
-	connector->doublescan_allowed =3D 0;
-
-	ret =3D drm_connector_attach_encoder(connector, encoder);
-	if (ret)
-		goto fail;
-
-	return connector;
-
-fail:
-	panel_connector_destroy(connector);
-	return NULL;
-}
-
-/*
- * Module:
- */
-
-static int panel_modeset_init(struct tilcdc_module *mod, struct drm_device=
 *dev)
-{
-	struct panel_module *panel_mod =3D to_panel_module(mod);
-	struct tilcdc_drm_private *priv =3D dev->dev_private;
-	struct drm_encoder *encoder;
-	struct drm_connector *connector;
-
-	encoder =3D panel_encoder_create(dev, panel_mod);
-	if (!encoder)
-		return -ENOMEM;
-
-	connector =3D panel_connector_create(dev, panel_mod, encoder);
-	if (!connector)
-		return -ENOMEM;
-
-	priv->encoders[priv->num_encoders++] =3D encoder;
-	priv->connectors[priv->num_connectors++] =3D connector;
-
-	tilcdc_crtc_set_panel_info(priv->crtc,
-				   to_panel_encoder(encoder)->mod->info);
-
-	return 0;
-}
-
-static const struct tilcdc_module_ops panel_module_ops =3D {
-		.modeset_init =3D panel_modeset_init,
-};
-
-/*
- * Device:
- */
-
-/* maybe move this somewhere common if it is needed by other outputs? */
-static struct tilcdc_panel_info *of_get_panel_info(struct device_node *np)
-{
-	struct device_node *info_np;
-	struct tilcdc_panel_info *info;
-	int ret =3D 0;
-
-	if (!np) {
-		pr_err("%s: no devicenode given\n", __func__);
-		return NULL;
-	}
-
-	info_np =3D of_get_child_by_name(np, "panel-info");
-	if (!info_np) {
-		pr_err("%s: could not find panel-info node\n", __func__);
-		return NULL;
-	}
-
-	info =3D kzalloc_obj(*info);
-	if (!info)
-		goto put_node;
-
-	ret |=3D of_property_read_u32(info_np, "ac-bias", &info->ac_bias);
-	ret |=3D of_property_read_u32(info_np, "ac-bias-intrpt", &info->ac_bias_i=
ntrpt);
-	ret |=3D of_property_read_u32(info_np, "dma-burst-sz", &info->dma_burst_s=
z);
-	ret |=3D of_property_read_u32(info_np, "bpp", &info->bpp);
-	ret |=3D of_property_read_u32(info_np, "fdd", &info->fdd);
-	ret |=3D of_property_read_u32(info_np, "sync-edge", &info->sync_edge);
-	ret |=3D of_property_read_u32(info_np, "sync-ctrl", &info->sync_ctrl);
-	ret |=3D of_property_read_u32(info_np, "raster-order", &info->raster_orde=
r);
-	ret |=3D of_property_read_u32(info_np, "fifo-th", &info->fifo_th);
-
-	/* optional: */
-	info->tft_alt_mode      =3D of_property_read_bool(info_np, "tft-alt-mode"=
);
-	info->invert_pxl_clk    =3D of_property_read_bool(info_np, "invert-pxl-cl=
k");
-
-	if (ret) {
-		pr_err("%s: error reading panel-info properties\n", __func__);
-		kfree(info);
-		info =3D NULL;
-	}
-
-put_node:
-	of_node_put(info_np);
-	return info;
-}
-
-static int panel_probe(struct platform_device *pdev)
-{
-	struct device_node *node =3D pdev->dev.of_node;
-	struct backlight_device *backlight;
-	struct panel_module *panel_mod;
-	struct tilcdc_module *mod;
-	int ret;
-
-	/* bail out early if no DT data: */
-	if (!node) {
-		dev_err(&pdev->dev, "device-tree data is missing\n");
-		return -ENXIO;
-	}
-
-	panel_mod =3D devm_kzalloc(&pdev->dev, sizeof(*panel_mod), GFP_KERNEL);
-	if (!panel_mod)
-		return -ENOMEM;
-
-	backlight =3D devm_of_find_backlight(&pdev->dev);
-	if (IS_ERR(backlight))
-		return PTR_ERR(backlight);
-	panel_mod->backlight =3D backlight;
-
-	panel_mod->enable_gpio =3D devm_gpiod_get_optional(&pdev->dev, "enable",
-							 GPIOD_OUT_LOW);
-	if (IS_ERR(panel_mod->enable_gpio)) {
-		ret =3D PTR_ERR(panel_mod->enable_gpio);
-		dev_err(&pdev->dev, "failed to request enable GPIO\n");
-		goto fail_backlight;
-	}
-
-	if (panel_mod->enable_gpio)
-		dev_info(&pdev->dev, "found enable GPIO\n");
-
-	mod =3D &panel_mod->base;
-	pdev->dev.platform_data =3D mod;
-
-	tilcdc_module_init(mod, "panel", &panel_module_ops);
-
-	panel_mod->timings =3D of_get_display_timings(node);
-	if (!panel_mod->timings) {
-		dev_err(&pdev->dev, "could not get panel timings\n");
-		ret =3D -EINVAL;
-		goto fail_free;
-	}
-
-	panel_mod->info =3D of_get_panel_info(node);
-	if (!panel_mod->info) {
-		dev_err(&pdev->dev, "could not get panel info\n");
-		ret =3D -EINVAL;
-		goto fail_timings;
-	}
-
-	return 0;
-
-fail_timings:
-	display_timings_release(panel_mod->timings);
-
-fail_free:
-	tilcdc_module_cleanup(mod);
-
-fail_backlight:
-	if (panel_mod->backlight)
-		put_device(&panel_mod->backlight->dev);
-	return ret;
-}
-
-static void panel_remove(struct platform_device *pdev)
-{
-	struct tilcdc_module *mod =3D dev_get_platdata(&pdev->dev);
-	struct panel_module *panel_mod =3D to_panel_module(mod);
-	struct backlight_device *backlight =3D panel_mod->backlight;
-
-	if (backlight)
-		put_device(&backlight->dev);
-
-	display_timings_release(panel_mod->timings);
-
-	tilcdc_module_cleanup(mod);
-	kfree(panel_mod->info);
-}
-
-static const struct of_device_id panel_of_match[] =3D {
-		{ .compatible =3D "ti,tilcdc,panel", },
-		{ },
-};
-
-static struct platform_driver panel_driver =3D {
-	.probe =3D panel_probe,
-	.remove =3D panel_remove,
-	.driver =3D {
-		.name =3D "tilcdc-panel",
-		.of_match_table =3D panel_of_match,
-	},
-};
-
-int __init tilcdc_panel_init(void)
-{
-	return platform_driver_register(&panel_driver);
-}
-
-void __exit tilcdc_panel_fini(void)
-{
-	platform_driver_unregister(&panel_driver);
-}
--=20
2.43.0