From: Kory Maincent (TI.com) Date: Fri, 23 Jan 2026 16:12:30 +0000 (+0100) Subject: drm/tilcdc: Rename tilcdc_external to tilcdc_encoder X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb18dbb74f46bd0aa612aaae144dd191c548739c;p=linux drm/tilcdc: Rename tilcdc_external to tilcdc_encoder The tilcdc_external module describes the encoder part of the tilcdc driver. Rename it to tilcdc_encoder for better clarity and to make the naming more consistent with DRM subsystem conventions, where encoder-related files typically use "encoder" in their names. Reviewed-by: Luca Ceresoli Signed-off-by: Kory Maincent (TI.com) Link: https://patch.msgid.link/20260123-feature_tilcdc-v5-12-5a44d2aa3f6f@bootlin.com Signed-off-by: Luca Ceresoli --- diff --git a/drivers/gpu/drm/tilcdc/Makefile b/drivers/gpu/drm/tilcdc/Makefile index b78204a65ce29..c6b484dad711a 100644 --- a/drivers/gpu/drm/tilcdc/Makefile +++ b/drivers/gpu/drm/tilcdc/Makefile @@ -6,7 +6,7 @@ endif tilcdc-y := \ tilcdc_plane.o \ tilcdc_crtc.o \ - tilcdc_external.o \ + tilcdc_encoder.o \ tilcdc_drv.o obj-$(CONFIG_DRM_TILCDC) += tilcdc.o diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 4b9fa819358a2..d0503778b5f6f 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -26,7 +26,7 @@ #include "tilcdc_drv.h" -#include "tilcdc_external.h" +#include "tilcdc_encoder.h" #include "tilcdc_regs.h" enum tilcdc_variant { diff --git a/drivers/gpu/drm/tilcdc/tilcdc_encoder.c b/drivers/gpu/drm/tilcdc/tilcdc_encoder.c new file mode 100644 index 0000000000000..b1c7b2257df30 --- /dev/null +++ b/drivers/gpu/drm/tilcdc/tilcdc_encoder.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2015 Texas Instruments + * Author: Jyri Sarha + */ + +#include + +#include +#include +#include +#include + +#include "tilcdc_drv.h" +#include "tilcdc_encoder.h" + +static +struct drm_connector *tilcdc_encoder_find_connector(struct drm_device *ddev, + struct drm_encoder *encoder) +{ + struct drm_connector *connector; + + list_for_each_entry(connector, &ddev->mode_config.connector_list, head) { + if (drm_connector_has_possible_encoder(connector, encoder)) + return connector; + } + + dev_err(ddev->dev, "No connector found for %s encoder (id %d)\n", + encoder->name, encoder->base.id); + + return NULL; +} + +static +int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridge) +{ + struct tilcdc_drm_private *priv = ddev->dev_private; + int ret; + + priv->encoder->possible_crtcs = BIT(0); + + ret = drm_bridge_attach(priv->encoder, bridge, NULL, 0); + if (ret) + return ret; + + priv->connector = tilcdc_encoder_find_connector(ddev, priv->encoder); + if (!priv->connector) + return -ENODEV; + + return 0; +} + +int tilcdc_encoder_create(struct drm_device *ddev) +{ + struct tilcdc_drm_private *priv = ddev->dev_private; + struct drm_bridge *bridge; + struct drm_panel *panel; + int ret; + + ret = drm_of_find_panel_or_bridge(ddev->dev->of_node, 0, 0, + &panel, &bridge); + if (ret == -ENODEV) + return 0; + else if (ret) + return ret; + + priv->encoder = devm_kzalloc(ddev->dev, sizeof(*priv->encoder), GFP_KERNEL); + if (!priv->encoder) + return -ENOMEM; + + ret = drm_simple_encoder_init(ddev, priv->encoder, + DRM_MODE_ENCODER_NONE); + if (ret) { + dev_err(ddev->dev, "drm_encoder_init() failed %d\n", ret); + return ret; + } + + if (panel) { + bridge = devm_drm_panel_bridge_add_typed(ddev->dev, panel, + DRM_MODE_CONNECTOR_DPI); + if (IS_ERR(bridge)) { + ret = PTR_ERR(bridge); + goto err_encoder_cleanup; + } + } + + ret = tilcdc_attach_bridge(ddev, bridge); + if (ret) + goto err_encoder_cleanup; + + return 0; + +err_encoder_cleanup: + drm_encoder_cleanup(priv->encoder); + return ret; +} diff --git a/drivers/gpu/drm/tilcdc/tilcdc_encoder.h b/drivers/gpu/drm/tilcdc/tilcdc_encoder.h new file mode 100644 index 0000000000000..c8f87f59024e6 --- /dev/null +++ b/drivers/gpu/drm/tilcdc/tilcdc_encoder.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2015 Texas Instruments + * Author: Jyri Sarha + */ + +#ifndef __TILCDC_EXTERNAL_H__ +#define __TILCDC_EXTERNAL_H__ + +int tilcdc_encoder_create(struct drm_device *ddev); +#endif /* __TILCDC_SLAVE_H__ */ diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c deleted file mode 100644 index 11ac9673ba98a..0000000000000 --- a/drivers/gpu/drm/tilcdc/tilcdc_external.c +++ /dev/null @@ -1,96 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2015 Texas Instruments - * Author: Jyri Sarha - */ - -#include - -#include -#include -#include -#include - -#include "tilcdc_drv.h" -#include "tilcdc_external.h" - -static -struct drm_connector *tilcdc_encoder_find_connector(struct drm_device *ddev, - struct drm_encoder *encoder) -{ - struct drm_connector *connector; - - list_for_each_entry(connector, &ddev->mode_config.connector_list, head) { - if (drm_connector_has_possible_encoder(connector, encoder)) - return connector; - } - - dev_err(ddev->dev, "No connector found for %s encoder (id %d)\n", - encoder->name, encoder->base.id); - - return NULL; -} - -static -int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridge) -{ - struct tilcdc_drm_private *priv = ddev->dev_private; - int ret; - - priv->encoder->possible_crtcs = BIT(0); - - ret = drm_bridge_attach(priv->encoder, bridge, NULL, 0); - if (ret) - return ret; - - priv->connector = tilcdc_encoder_find_connector(ddev, priv->encoder); - if (!priv->connector) - return -ENODEV; - - return 0; -} - -int tilcdc_encoder_create(struct drm_device *ddev) -{ - struct tilcdc_drm_private *priv = ddev->dev_private; - struct drm_bridge *bridge; - struct drm_panel *panel; - int ret; - - ret = drm_of_find_panel_or_bridge(ddev->dev->of_node, 0, 0, - &panel, &bridge); - if (ret == -ENODEV) - return 0; - else if (ret) - return ret; - - priv->encoder = devm_kzalloc(ddev->dev, sizeof(*priv->encoder), GFP_KERNEL); - if (!priv->encoder) - return -ENOMEM; - - ret = drm_simple_encoder_init(ddev, priv->encoder, - DRM_MODE_ENCODER_NONE); - if (ret) { - dev_err(ddev->dev, "drm_encoder_init() failed %d\n", ret); - return ret; - } - - if (panel) { - bridge = devm_drm_panel_bridge_add_typed(ddev->dev, panel, - DRM_MODE_CONNECTOR_DPI); - if (IS_ERR(bridge)) { - ret = PTR_ERR(bridge); - goto err_encoder_cleanup; - } - } - - ret = tilcdc_attach_bridge(ddev, bridge); - if (ret) - goto err_encoder_cleanup; - - return 0; - -err_encoder_cleanup: - drm_encoder_cleanup(priv->encoder); - return ret; -} diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.h b/drivers/gpu/drm/tilcdc/tilcdc_external.h deleted file mode 100644 index c8f87f59024e6..0000000000000 --- a/drivers/gpu/drm/tilcdc/tilcdc_external.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2015 Texas Instruments - * Author: Jyri Sarha - */ - -#ifndef __TILCDC_EXTERNAL_H__ -#define __TILCDC_EXTERNAL_H__ - -int tilcdc_encoder_create(struct drm_device *ddev); -#endif /* __TILCDC_SLAVE_H__ */