This patch attempts to convert the ingenic-dw-hdmi driver
into a version that uses the component framework.
Unfortunately the new version does not work.
Debugging shows that ingenic_dw_hdmi_bind() is never called.
Suggestions for reasons and fixes are welcome.
Signed-off-by: Paul Boddie <p...@boddie.org.uk>
Co-authored-by: Paul Boddie <p...@boddie.org.uk>
Signed-off-by: H. Nikolaus Schaller <h...@goldelico.com>
---
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 57 ++++++++++++++++++-----
1 file changed, 46 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
index 61e7a57d7cec1..a5ba0b69baa8c 100644
--- a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
+++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
@@ -1,17 +1,24 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
- * Copyright (C) 2019, 2020 Paul Boddie <p...@boddie.org.uk>
+ * Copyright (C) 2019, 2020, 2021 Paul Boddie <p...@boddie.org.uk>
*
* Derived from dw_hdmi-imx.c with i.MX portions removed.
- * Probe and remove operations derived from rcar_dw_hdmi.c.
*/
+#include <linux/component.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_of.h>
+#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/drm_simple_kms_helper.h>
+
+struct ingenic_dw_hdmi_encoder {
+ struct drm_encoder encoder;
+ struct dw_hdmi *hdmi;
+};
static const struct dw_hdmi_mpll_config ingenic_mpll_cfg[] = {
{ 45250000, { { 0x01e0, 0x0000 }, { 0x21e1, 0x0000 }, { 0x41e2, 0x0000
} } },
@@ -87,24 +94,52 @@ static const struct of_device_id ingenic_dw_hdmi_dt_ids[] =
{
};
MODULE_DEVICE_TABLE(of, ingenic_dw_hdmi_dt_ids);
-static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
+static int ingenic_dw_hdmi_bind(struct device *dev, struct device *master,
+ void *data)
{
- struct dw_hdmi *hdmi;
+ struct platform_device *pdev = to_platform_device(dev);
+ struct drm_device *drm = data;
+ struct drm_encoder *enc;
+ struct ingenic_dw_hdmi_encoder *hdmi_encoder;
- hdmi = dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
- if (IS_ERR(hdmi))
- return PTR_ERR(hdmi);
+ hdmi_encoder = drmm_simple_encoder_alloc(drm, struct
ingenic_dw_hdmi_encoder,
+ encoder,
DRM_MODE_ENCODER_TMDS);
+ if (IS_ERR(hdmi_encoder))
+ return PTR_ERR(hdmi_encoder);
- platform_set_drvdata(pdev, hdmi);
+ enc = &hdmi_encoder->encoder;
+ drm_encoder_helper_add(enc, NULL);
+ hdmi_encoder->hdmi = dw_hdmi_bind(pdev, enc,
&ingenic_dw_hdmi_plat_data);
+
+ if (IS_ERR(hdmi_encoder->hdmi))
+ return PTR_ERR(hdmi_encoder->hdmi);
+
+ dev_set_drvdata(dev, hdmi_encoder->hdmi);
return 0;
}
-static int ingenic_dw_hdmi_remove(struct platform_device *pdev)
+static void ingenic_dw_hdmi_unbind(struct device *dev, struct device *master,
+ void *data)
+{
+ struct dw_hdmi *hdmi = dev_get_drvdata(dev);
+
+ dw_hdmi_unbind(hdmi);
+}
+
+static const struct component_ops ingenic_dw_hdmi_ops = {
+ .bind = ingenic_dw_hdmi_bind,
+ .unbind = ingenic_dw_hdmi_unbind,
+};
+
+static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
{
- struct dw_hdmi *hdmi = platform_get_drvdata(pdev);
+ return component_add(&pdev->dev, &ingenic_dw_hdmi_ops);
+}
- dw_hdmi_remove(hdmi);
+static int ingenic_dw_hdmi_remove(struct platform_device *pdev)
+{
+ component_del(&pdev->dev, &ingenic_dw_hdmi_ops);
return 0;
}
--
2.31.1
