* [PATCH 01/16] drm/encoder: remove obsolete documentation of bridge
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 22:04 ` Laurent Pinchart
2020-09-03 16:57 ` [PATCH 02/16] drm/exynos: extract helper functions for probe Michael Tretter
` (14 subsequent siblings)
15 siblings, 1 reply; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
In commit 05193dc38197 ("drm/bridge: Make the bridge chain a
double-linked list") the bridge has been removed and replaced by a
private field. Remove the leftover documentation of the removed field.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
include/drm/drm_encoder.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/drm/drm_encoder.h b/include/drm/drm_encoder.h
index a60f5f1555ac..5dfa5f7a80a7 100644
--- a/include/drm/drm_encoder.h
+++ b/include/drm/drm_encoder.h
@@ -89,7 +89,6 @@ struct drm_encoder_funcs {
* @head: list management
* @base: base KMS object
* @name: human readable name, can be overwritten by the driver
- * @bridge: bridge associated to the encoder
* @funcs: control functions
* @helper_private: mid-layer private data
*
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 01/16] drm/encoder: remove obsolete documentation of bridge
2020-09-03 16:57 ` [PATCH 01/16] drm/encoder: remove obsolete documentation of bridge Michael Tretter
@ 2020-09-03 22:04 ` Laurent Pinchart
0 siblings, 0 replies; 22+ messages in thread
From: Laurent Pinchart @ 2020-09-03 22:04 UTC (permalink / raw)
To: Michael Tretter; +Cc: dri-devel, linux-samsung-soc, kernel, krzk, narmstrong
Hi Michael,
Thank you for the patch.
On Thu, Sep 03, 2020 at 06:57:02PM +0200, Michael Tretter wrote:
> In commit 05193dc38197 ("drm/bridge: Make the bridge chain a
> double-linked list") the bridge has been removed and replaced by a
> private field. Remove the leftover documentation of the removed field.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> include/drm/drm_encoder.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/include/drm/drm_encoder.h b/include/drm/drm_encoder.h
> index a60f5f1555ac..5dfa5f7a80a7 100644
> --- a/include/drm/drm_encoder.h
> +++ b/include/drm/drm_encoder.h
> @@ -89,7 +89,6 @@ struct drm_encoder_funcs {
> * @head: list management
> * @base: base KMS object
> * @name: human readable name, can be overwritten by the driver
> - * @bridge: bridge associated to the encoder
> * @funcs: control functions
> * @helper_private: mid-layer private data
> *
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 02/16] drm/exynos: extract helper functions for probe
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
2020-09-03 16:57 ` [PATCH 01/16] drm/encoder: remove obsolete documentation of bridge Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-04 9:04 ` Marek Szyprowski
2020-09-03 16:57 ` [PATCH 03/16] drm/exynos: remove in_bridge_node from exynos_dsi Michael Tretter
` (13 subsequent siblings)
15 siblings, 1 reply; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
As the driver shall be usable with drivers that use the component
framework and drivers that don't, split the common probing code into a
separate function that can be called from different locations.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 54 ++++++++++++++-----------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index b38e9b592b8a..32f999dfd8c1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1734,7 +1734,7 @@ static const struct component_ops exynos_dsi_component_ops = {
.unbind = exynos_dsi_unbind,
};
-static int exynos_dsi_probe(struct platform_device *pdev)
+static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct resource *res;
@@ -1743,7 +1743,7 @@ static int exynos_dsi_probe(struct platform_device *pdev)
dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
if (!dsi)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
/* To be checked as invalid one */
dsi->te_gpio = -ENOENT;
@@ -1766,14 +1766,14 @@ static int exynos_dsi_probe(struct platform_device *pdev)
if (ret) {
if (ret != -EPROBE_DEFER)
dev_info(dev, "failed to get regulators: %d\n", ret);
- return ret;
+ return ERR_PTR(ret);
}
dsi->clks = devm_kcalloc(dev,
dsi->driver_data->num_clks, sizeof(*dsi->clks),
GFP_KERNEL);
if (!dsi->clks)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
for (i = 0; i < dsi->driver_data->num_clks; i++) {
dsi->clks[i] = devm_clk_get(dev, clk_names[i]);
@@ -1787,7 +1787,7 @@ static int exynos_dsi_probe(struct platform_device *pdev)
dev_info(dev, "failed to get the clock: %s\n",
clk_names[i]);
- return PTR_ERR(dsi->clks[i]);
+ return ERR_PTR(PTR_ERR(dsi->clks[i]));
}
}
@@ -1795,18 +1795,18 @@ static int exynos_dsi_probe(struct platform_device *pdev)
dsi->reg_base = devm_ioremap_resource(dev, res);
if (IS_ERR(dsi->reg_base)) {
dev_err(dev, "failed to remap io region\n");
- return PTR_ERR(dsi->reg_base);
+ return dsi->reg_base;
}
dsi->phy = devm_phy_get(dev, "dsim");
if (IS_ERR(dsi->phy)) {
dev_info(dev, "failed to get dsim phy\n");
- return PTR_ERR(dsi->phy);
+ return ERR_PTR(PTR_ERR(dsi->phy));
}
dsi->irq = platform_get_irq(pdev, 0);
if (dsi->irq < 0)
- return dsi->irq;
+ return ERR_PTR(dsi->irq);
irq_set_status_flags(dsi->irq, IRQ_NOAUTOEN);
ret = devm_request_threaded_irq(dev, dsi->irq, NULL,
@@ -1814,37 +1814,43 @@ static int exynos_dsi_probe(struct platform_device *pdev)
dev_name(dev), dsi);
if (ret) {
dev_err(dev, "failed to request dsi irq\n");
- return ret;
+ return ERR_PTR(ret);
}
ret = exynos_dsi_parse_dt(dsi);
if (ret)
- return ret;
-
- platform_set_drvdata(pdev, &dsi->encoder);
+ return ERR_PTR(ret);
pm_runtime_enable(dev);
- ret = component_add(dev, &exynos_dsi_component_ops);
- if (ret)
- goto err_disable_runtime;
-
- return 0;
+ return dsi;
+}
-err_disable_runtime:
- pm_runtime_disable(dev);
+static void __exynos_dsi_remove(struct exynos_dsi *dsi)
+{
of_node_put(dsi->in_bridge_node);
- return ret;
+ pm_runtime_disable(dsi->dev);
}
-static int exynos_dsi_remove(struct platform_device *pdev)
+static int exynos_dsi_probe(struct platform_device *pdev)
{
- struct exynos_dsi *dsi = platform_get_drvdata(pdev);
+ struct exynos_dsi *dsi;
- of_node_put(dsi->in_bridge_node);
+ dsi = __exynos_dsi_probe(pdev);
+ if (IS_ERR(dsi))
+ return PTR_ERR(dsi);
+ platform_set_drvdata(pdev, &dsi->encoder);
+
+ return component_add(&pdev->dev, &exynos_dsi_component_ops);
+}
+
+static int exynos_dsi_remove(struct platform_device *pdev)
+{
+ struct drm_encoder *encoder = platform_get_drvdata(pdev);
+ struct exynos_dsi *dsi = encoder_to_dsi(encoder);
- pm_runtime_disable(&pdev->dev);
+ __exynos_dsi_remove(dsi);
component_del(&pdev->dev, &exynos_dsi_component_ops);
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 02/16] drm/exynos: extract helper functions for probe
2020-09-03 16:57 ` [PATCH 02/16] drm/exynos: extract helper functions for probe Michael Tretter
@ 2020-09-04 9:04 ` Marek Szyprowski
2020-09-04 9:21 ` Marek Szyprowski
0 siblings, 1 reply; 22+ messages in thread
From: Marek Szyprowski @ 2020-09-04 9:04 UTC (permalink / raw)
To: Michael Tretter, dri-devel, linux-samsung-soc
Cc: krzk, Laurent.pinchart, kernel, narmstrong, Andrzej Hajda
Hi Michael,
On 03.09.2020 18:57, Michael Tretter wrote:
> As the driver shall be usable with drivers that use the component
> framework and drivers that don't, split the common probing code into a
> separate function that can be called from different locations.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
This is the first patch that causes the crash on Exynos boards:
exynos4-fb 11c00000.fimd: Adding to iommu group 0
OF: graph: no port node found in /soc/fimd@11c00000
[drm] Exynos DRM: using 11c00000.fimd device for DMA mapping operations
exynos-drm exynos-drm: bound 11c00000.fimd (ops fimd_component_ops)
OF: graph: no port node found in /soc/dsi@11c80000
8<--- cut here ---
Unable to handle kernel NULL pointer dereference at virtual address 00000084
pgd = (ptrval)
[00000084] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 1 PID: 1 Comm: swapper/0 Not tainted
5.9.0-rc2-next-20200824-00004-g680baccba1c2 #1591
Hardware name: Samsung Exynos (Flattened Device Tree)
PC is at drm_bridge_attach+0x18/0x164
LR is at exynos_dsi_bind+0x88/0x9c
pc : [<c0620524>] lr : [<c0644df8>] psr: 20000013
...
Process swapper/0 (pid: 1, stack limit = 0x(ptrval))
...
[<c0620524>] (drm_bridge_attach) from [<c0644df8>]
(exynos_dsi_bind+0x88/0x9c)
[<c0644df8>] (exynos_dsi_bind) from [<c0661aec>]
(component_bind_all+0xfc/0x290)
[<c0661aec>] (component_bind_all) from [<c06413d0>]
(exynos_drm_bind+0xe4/0x19c)
[<c06413d0>] (exynos_drm_bind) from [<c0662060>]
(try_to_bring_up_master+0x1e4/0x2c4)
[<c0662060>] (try_to_bring_up_master) from [<c06625a0>]
(component_master_add_with_match+0xd4/0x108)
[<c06625a0>] (component_master_add_with_match) from [<c06410f8>]
(exynos_drm_platform_probe+0xe4/0x110)
[<c06410f8>] (exynos_drm_platform_probe) from [<c066c788>]
(platform_drv_probe+0x6c/0xa4)
[<c066c788>] (platform_drv_probe) from [<c0669cc4>]
(really_probe+0x200/0x4fc)
[<c0669cc4>] (really_probe) from [<c066a188>]
(driver_probe_device+0x78/0x1fc)
[<c066a188>] (driver_probe_device) from [<c066a570>]
(device_driver_attach+0x58/0x60)
[<c066a570>] (device_driver_attach) from [<c066a654>]
(__driver_attach+0xdc/0x174)
[<c066a654>] (__driver_attach) from [<c0667a4c>]
(bus_for_each_dev+0x68/0xb4)
[<c0667a4c>] (bus_for_each_dev) from [<c0668d80>]
(bus_add_driver+0x158/0x214)
[<c0668d80>] (bus_add_driver) from [<c066b538>] (driver_register+0x78/0x110)
[<c066b538>] (driver_register) from [<c06412b8>]
(exynos_drm_init+0xe4/0x118)
[<c06412b8>] (exynos_drm_init) from [<c01023f4>]
(do_one_initcall+0x8c/0x424)
[<c01023f4>] (do_one_initcall) from [<c10011a8>]
(kernel_init_freeable+0x190/0x1dc)
[<c10011a8>] (kernel_init_freeable) from [<c0ae8ab4>]
(kernel_init+0x8/0x118)
[<c0ae8ab4>] (kernel_init) from [<c0100114>] (ret_from_fork+0x14/0x20)
Exception stack(0xef0dffb0 to 0xef0dfff8)
ffa0: 00000000 00000000 00000000
00000000
ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000
00000000
ffe0: 00000000 00000000 00000000 00000000 00000013 00000000
Code: e92d4070 0a00002e e3520000 0a000044 (e592c06c)
---[ end trace 1c93b26d166070f6 ]---
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
CPU0: stopping
CPU: 0 PID: 0 Comm: swapper/0 Tainted: G D
5.9.0-rc2-next-20200824-00004-g680baccba1c2 #1591
Hardware name: Samsung Exynos (Flattened Device Tree)
[<c011160c>] (unwind_backtrace) from [<c010cfc0>] (show_stack+0x10/0x14)
[<c010cfc0>] (show_stack) from [<c0533c3c>] (dump_stack+0xbc/0xe8)
[<c0533c3c>] (dump_stack) from [<c01104e0>] (handle_IPI+0x3e0/0x428)
[<c01104e0>] (handle_IPI) from [<c05511dc>] (gic_handle_irq+0x98/0x9c)
[<c05511dc>] (gic_handle_irq) from [<c0100af0>] (__irq_svc+0x70/0xb0)
Exception stack(0xc1101f08 to 0xc1101f50)
1f00: c01095d8 00000000 00000000 c1100000 c1108eec
c1108f30
1f20: 00000001 c107d068 c1108ec8 00000000 00000000 00000000 00005dc0
c1101f58
1f40: c01095d8 c01095dc 60000013 ffffffff
[<c0100af0>] (__irq_svc) from [<c01095dc>] (arch_cpu_idle+0x24/0x44)
[<c01095dc>] (arch_cpu_idle) from [<c01635dc>] (do_idle+0x1bc/0x2bc)
[<c01635dc>] (do_idle) from [<c0163a90>] (cpu_startup_entry+0x18/0x1c)
[<c0163a90>] (cpu_startup_entry) from [<c1000f88>]
(start_kernel+0x628/0x664)
[<c1000f88>] (start_kernel) from [<00000000>] (0x0)
---[ end Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b ]---
> ---
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 54 ++++++++++++++-----------
> 1 file changed, 30 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index b38e9b592b8a..32f999dfd8c1 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1734,7 +1734,7 @@ static const struct component_ops exynos_dsi_component_ops = {
> .unbind = exynos_dsi_unbind,
> };
>
> -static int exynos_dsi_probe(struct platform_device *pdev)
> +static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct resource *res;
> @@ -1743,7 +1743,7 @@ static int exynos_dsi_probe(struct platform_device *pdev)
>
> dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
> if (!dsi)
> - return -ENOMEM;
> + return ERR_PTR(-ENOMEM);
>
> /* To be checked as invalid one */
> dsi->te_gpio = -ENOENT;
> @@ -1766,14 +1766,14 @@ static int exynos_dsi_probe(struct platform_device *pdev)
> if (ret) {
> if (ret != -EPROBE_DEFER)
> dev_info(dev, "failed to get regulators: %d\n", ret);
> - return ret;
> + return ERR_PTR(ret);
> }
>
> dsi->clks = devm_kcalloc(dev,
> dsi->driver_data->num_clks, sizeof(*dsi->clks),
> GFP_KERNEL);
> if (!dsi->clks)
> - return -ENOMEM;
> + return ERR_PTR(-ENOMEM);
>
> for (i = 0; i < dsi->driver_data->num_clks; i++) {
> dsi->clks[i] = devm_clk_get(dev, clk_names[i]);
> @@ -1787,7 +1787,7 @@ static int exynos_dsi_probe(struct platform_device *pdev)
>
> dev_info(dev, "failed to get the clock: %s\n",
> clk_names[i]);
> - return PTR_ERR(dsi->clks[i]);
> + return ERR_PTR(PTR_ERR(dsi->clks[i]));
> }
> }
>
> @@ -1795,18 +1795,18 @@ static int exynos_dsi_probe(struct platform_device *pdev)
> dsi->reg_base = devm_ioremap_resource(dev, res);
> if (IS_ERR(dsi->reg_base)) {
> dev_err(dev, "failed to remap io region\n");
> - return PTR_ERR(dsi->reg_base);
> + return dsi->reg_base;
> }
>
> dsi->phy = devm_phy_get(dev, "dsim");
> if (IS_ERR(dsi->phy)) {
> dev_info(dev, "failed to get dsim phy\n");
> - return PTR_ERR(dsi->phy);
> + return ERR_PTR(PTR_ERR(dsi->phy));
> }
>
> dsi->irq = platform_get_irq(pdev, 0);
> if (dsi->irq < 0)
> - return dsi->irq;
> + return ERR_PTR(dsi->irq);
>
> irq_set_status_flags(dsi->irq, IRQ_NOAUTOEN);
> ret = devm_request_threaded_irq(dev, dsi->irq, NULL,
> @@ -1814,37 +1814,43 @@ static int exynos_dsi_probe(struct platform_device *pdev)
> dev_name(dev), dsi);
> if (ret) {
> dev_err(dev, "failed to request dsi irq\n");
> - return ret;
> + return ERR_PTR(ret);
> }
>
> ret = exynos_dsi_parse_dt(dsi);
> if (ret)
> - return ret;
> -
> - platform_set_drvdata(pdev, &dsi->encoder);
> + return ERR_PTR(ret);
>
> pm_runtime_enable(dev);
>
> - ret = component_add(dev, &exynos_dsi_component_ops);
> - if (ret)
> - goto err_disable_runtime;
> -
> - return 0;
> + return dsi;
> +}
>
> -err_disable_runtime:
> - pm_runtime_disable(dev);
> +static void __exynos_dsi_remove(struct exynos_dsi *dsi)
> +{
> of_node_put(dsi->in_bridge_node);
>
> - return ret;
> + pm_runtime_disable(dsi->dev);
> }
>
> -static int exynos_dsi_remove(struct platform_device *pdev)
> +static int exynos_dsi_probe(struct platform_device *pdev)
> {
> - struct exynos_dsi *dsi = platform_get_drvdata(pdev);
> + struct exynos_dsi *dsi;
>
> - of_node_put(dsi->in_bridge_node);
> + dsi = __exynos_dsi_probe(pdev);
> + if (IS_ERR(dsi))
> + return PTR_ERR(dsi);
> + platform_set_drvdata(pdev, &dsi->encoder);
> +
> + return component_add(&pdev->dev, &exynos_dsi_component_ops);
> +}
> +
> +static int exynos_dsi_remove(struct platform_device *pdev)
> +{
> + struct drm_encoder *encoder = platform_get_drvdata(pdev);
> + struct exynos_dsi *dsi = encoder_to_dsi(encoder);
>
> - pm_runtime_disable(&pdev->dev);
> + __exynos_dsi_remove(dsi);
>
> component_del(&pdev->dev, &exynos_dsi_component_ops);
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 02/16] drm/exynos: extract helper functions for probe
2020-09-04 9:04 ` Marek Szyprowski
@ 2020-09-04 9:21 ` Marek Szyprowski
0 siblings, 0 replies; 22+ messages in thread
From: Marek Szyprowski @ 2020-09-04 9:21 UTC (permalink / raw)
To: Michael Tretter, dri-devel, linux-samsung-soc
Cc: krzk, Laurent.pinchart, kernel, narmstrong, Andrzej Hajda
Hi
On 04.09.2020 11:04, Marek Szyprowski wrote:
> On 03.09.2020 18:57, Michael Tretter wrote:
>> As the driver shall be usable with drivers that use the component
>> framework and drivers that don't, split the common probing code into a
>> separate function that can be called from different locations.
>>
>> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
>
> This is the first patch that causes the crash on Exynos boards:
>
> exynos4-fb 11c00000.fimd: Adding to iommu group 0
> OF: graph: no port node found in /soc/fimd@11c00000
> [drm] Exynos DRM: using 11c00000.fimd device for DMA mapping operations
> exynos-drm exynos-drm: bound 11c00000.fimd (ops fimd_component_ops)
> OF: graph: no port node found in /soc/dsi@11c80000
> 8<--- cut here ---
> Unable to handle kernel NULL pointer dereference at virtual address
> 00000084
> pgd = (ptrval)
> [00000084] *pgd=00000000
> Internal error: Oops: 5 [#1] PREEMPT SMP ARM
> Modules linked in:
> CPU: 1 PID: 1 Comm: swapper/0 Not tainted
> 5.9.0-rc2-next-20200824-00004-g680baccba1c2 #1591
> Hardware name: Samsung Exynos (Flattened Device Tree)
> PC is at drm_bridge_attach+0x18/0x164
> LR is at exynos_dsi_bind+0x88/0x9c
> pc : [<c0620524>] lr : [<c0644df8>] psr: 20000013
> ...
> Process swapper/0 (pid: 1, stack limit = 0x(ptrval))
> ...
> [<c0620524>] (drm_bridge_attach) from [<c0644df8>]
> (exynos_dsi_bind+0x88/0x9c)
> [<c0644df8>] (exynos_dsi_bind) from [<c0661aec>]
> (component_bind_all+0xfc/0x290)
> [<c0661aec>] (component_bind_all) from [<c06413d0>]
> (exynos_drm_bind+0xe4/0x19c)
> [<c06413d0>] (exynos_drm_bind) from [<c0662060>]
> (try_to_bring_up_master+0x1e4/0x2c4)
> [<c0662060>] (try_to_bring_up_master) from [<c06625a0>]
> (component_master_add_with_match+0xd4/0x108)
> [<c06625a0>] (component_master_add_with_match) from [<c06410f8>]
> (exynos_drm_platform_probe+0xe4/0x110)
> [<c06410f8>] (exynos_drm_platform_probe) from [<c066c788>]
> (platform_drv_probe+0x6c/0xa4)
> [<c066c788>] (platform_drv_probe) from [<c0669cc4>]
> (really_probe+0x200/0x4fc)
> [<c0669cc4>] (really_probe) from [<c066a188>]
> (driver_probe_device+0x78/0x1fc)
> [<c066a188>] (driver_probe_device) from [<c066a570>]
> (device_driver_attach+0x58/0x60)
> [<c066a570>] (device_driver_attach) from [<c066a654>]
> (__driver_attach+0xdc/0x174)
> [<c066a654>] (__driver_attach) from [<c0667a4c>]
> (bus_for_each_dev+0x68/0xb4)
> [<c0667a4c>] (bus_for_each_dev) from [<c0668d80>]
> (bus_add_driver+0x158/0x214)
> [<c0668d80>] (bus_add_driver) from [<c066b538>]
> (driver_register+0x78/0x110)
> [<c066b538>] (driver_register) from [<c06412b8>]
> (exynos_drm_init+0xe4/0x118)
> [<c06412b8>] (exynos_drm_init) from [<c01023f4>]
> (do_one_initcall+0x8c/0x424)
> [<c01023f4>] (do_one_initcall) from [<c10011a8>]
> (kernel_init_freeable+0x190/0x1dc)
> [<c10011a8>] (kernel_init_freeable) from [<c0ae8ab4>]
> (kernel_init+0x8/0x118)
> [<c0ae8ab4>] (kernel_init) from [<c0100114>] (ret_from_fork+0x14/0x20)
> Exception stack(0xef0dffb0 to 0xef0dfff8)
> ffa0: 00000000 00000000 00000000
> 00000000
> ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> 00000000
> ffe0: 00000000 00000000 00000000 00000000 00000013 00000000
> Code: e92d4070 0a00002e e3520000 0a000044 (e592c06c)
> ---[ end trace 1c93b26d166070f6 ]---
> Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
> CPU0: stopping
> CPU: 0 PID: 0 Comm: swapper/0 Tainted: G D
> 5.9.0-rc2-next-20200824-00004-g680baccba1c2 #1591
> Hardware name: Samsung Exynos (Flattened Device Tree)
> [<c011160c>] (unwind_backtrace) from [<c010cfc0>] (show_stack+0x10/0x14)
> [<c010cfc0>] (show_stack) from [<c0533c3c>] (dump_stack+0xbc/0xe8)
> [<c0533c3c>] (dump_stack) from [<c01104e0>] (handle_IPI+0x3e0/0x428)
> [<c01104e0>] (handle_IPI) from [<c05511dc>] (gic_handle_irq+0x98/0x9c)
> [<c05511dc>] (gic_handle_irq) from [<c0100af0>] (__irq_svc+0x70/0xb0)
> Exception stack(0xc1101f08 to 0xc1101f50)
> 1f00: c01095d8 00000000 00000000 c1100000 c1108eec
> c1108f30
> 1f20: 00000001 c107d068 c1108ec8 00000000 00000000 00000000 00005dc0
> c1101f58
> 1f40: c01095d8 c01095dc 60000013 ffffffff
> [<c0100af0>] (__irq_svc) from [<c01095dc>] (arch_cpu_idle+0x24/0x44)
> [<c01095dc>] (arch_cpu_idle) from [<c01635dc>] (do_idle+0x1bc/0x2bc)
> [<c01635dc>] (do_idle) from [<c0163a90>] (cpu_startup_entry+0x18/0x1c)
> [<c0163a90>] (cpu_startup_entry) from [<c1000f88>]
> (start_kernel+0x628/0x664)
> [<c1000f88>] (start_kernel) from [<00000000>] (0x0)
> ---[ end Kernel panic - not syncing: Attempted to kill init!
> exitcode=0x0000000b ]---
# arm-linux-gnueabi-addr2line -a c0620524 -e vmlinux
0xc0620524
drivers/gpu/drm/drm_bridge.c:184 (discriminator 1)
what is:
184: if (previous && (!previous->dev || previous->encoder != encoder))
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 03/16] drm/exynos: remove in_bridge_node from exynos_dsi
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
2020-09-03 16:57 ` [PATCH 01/16] drm/encoder: remove obsolete documentation of bridge Michael Tretter
2020-09-03 16:57 ` [PATCH 02/16] drm/exynos: extract helper functions for probe Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 04/16] drm/exynos: implement a drm bridge Michael Tretter
` (12 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
We do not need to keep a reference to the in_bridge_node, but we can
simply drop it, once we found and attached the previous bridge.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 32f999dfd8c1..ddbda33dea91 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -282,7 +282,6 @@ struct exynos_dsi {
struct list_head transfer_list;
const struct exynos_dsi_driver_data *driver_data;
- struct device_node *in_bridge_node;
};
#define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host)
@@ -1687,8 +1686,6 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
if (ret < 0)
return ret;
- dsi->in_bridge_node = of_graph_get_remote_node(node, DSI_PORT_IN, 0);
-
return 0;
}
@@ -1698,6 +1695,7 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
struct drm_encoder *encoder = dev_get_drvdata(dev);
struct exynos_dsi *dsi = encoder_to_dsi(encoder);
struct drm_device *drm_dev = data;
+ struct device_node *in_bridge_node;
struct drm_bridge *in_bridge;
int ret;
@@ -1709,10 +1707,12 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
if (ret < 0)
return ret;
- if (dsi->in_bridge_node) {
- in_bridge = of_drm_find_bridge(dsi->in_bridge_node);
+ in_bridge_node = of_graph_get_remote_node(dev->of_node, DSI_PORT_IN, 0);
+ if (in_bridge_node) {
+ in_bridge = of_drm_find_bridge(in_bridge_node);
if (in_bridge)
drm_bridge_attach(encoder, in_bridge, NULL, 0);
+ of_node_put(in_bridge_node);
}
return mipi_dsi_host_register(&dsi->dsi_host);
@@ -1828,8 +1828,6 @@ static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
static void __exynos_dsi_remove(struct exynos_dsi *dsi)
{
- of_node_put(dsi->in_bridge_node);
-
pm_runtime_disable(dsi->dev);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 04/16] drm/exynos: implement a drm bridge
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (2 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 03/16] drm/exynos: remove in_bridge_node from exynos_dsi Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 05/16] drm/exynos: convert encoder functions to bridge function Michael Tretter
` (11 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
Make the exynos_dsi driver a full drm bridge that can be found and used
from other drivers.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 45 +++++++++++++++++++++++--
1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index ddbda33dea91..4d19630f33e7 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -253,6 +253,7 @@ struct exynos_dsi_driver_data {
struct exynos_dsi {
struct drm_encoder encoder;
+ struct drm_bridge bridge;
struct mipi_dsi_host dsi_host;
struct drm_connector connector;
struct drm_panel *panel;
@@ -1523,19 +1524,43 @@ static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = {
.disable = exynos_dsi_disable,
};
+static int exynos_dsi_bridge_attach(struct drm_bridge *bridge,
+ enum drm_bridge_attach_flags flags)
+{
+ struct exynos_dsi *dsi = bridge->driver_private;
+
+ if (!bridge->encoder) {
+ dev_err(dsi->dev, "missing encoder\n");
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = {
+ .attach = exynos_dsi_bridge_attach,
+};
+
MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
struct exynos_dsi *dsi = host_to_dsi(host);
- struct drm_encoder *encoder = &dsi->encoder;
- struct drm_device *drm = encoder->dev;
+ struct drm_bridge *bridge = &dsi->bridge;
+ struct drm_encoder *encoder;
+ struct drm_device *drm;
struct drm_bridge *out_bridge;
+ if (!bridge->encoder)
+ return -EPROBE_DEFER;
+
+ encoder = bridge->encoder;
+ drm = encoder->dev;
+
out_bridge = of_drm_find_bridge(device->dev.of_node);
if (out_bridge) {
- drm_bridge_attach(encoder, out_bridge, NULL, 0);
+ drm_bridge_attach(encoder, out_bridge, bridge, 0);
dsi->out_bridge = out_bridge;
list_splice_init(&encoder->bridge_chain, &dsi->bridge_chain);
} else {
@@ -1715,6 +1740,10 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
of_node_put(in_bridge_node);
}
+ ret = drm_bridge_attach(encoder, &dsi->bridge, in_bridge, 0);
+ if (ret)
+ return ret;
+
return mipi_dsi_host_register(&dsi->dsi_host);
}
@@ -1740,6 +1769,7 @@ static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
struct resource *res;
struct exynos_dsi *dsi;
int ret, i;
+ struct drm_bridge *bridge;
dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
if (!dsi)
@@ -1823,11 +1853,20 @@ static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
pm_runtime_enable(dev);
+ bridge = &dsi->bridge;
+ bridge->driver_private = dsi;
+ bridge->funcs = &exynos_dsi_bridge_funcs;
+ bridge->of_node = dev->of_node;
+
+ drm_bridge_add(bridge);
+
return dsi;
}
static void __exynos_dsi_remove(struct exynos_dsi *dsi)
{
+ drm_bridge_remove(&dsi->bridge);
+
pm_runtime_disable(dsi->dev);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 05/16] drm/exynos: convert encoder functions to bridge function
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (3 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 04/16] drm/exynos: implement a drm bridge Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 06/16] drm/exynos: configure mode on drm bridge Michael Tretter
` (10 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
If other drivers use the exynos_dsi driver as a bridge, they might bring
their own encoder. Enable and disable the MIPI-DSI bridge using the
bridge functions instead of the encoder functions.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 33 +++++++++++++++----------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 4d19630f33e7..31d62c10614a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1376,9 +1376,8 @@ static void exynos_dsi_unregister_te_irq(struct exynos_dsi *dsi)
}
}
-static void exynos_dsi_enable(struct drm_encoder *encoder)
+static void exynos_dsi_enable(struct exynos_dsi *dsi)
{
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
struct drm_bridge *iter;
int ret;
@@ -1426,9 +1425,8 @@ static void exynos_dsi_enable(struct drm_encoder *encoder)
pm_runtime_put(dsi->dev);
}
-static void exynos_dsi_disable(struct drm_encoder *encoder)
+static void exynos_dsi_disable(struct exynos_dsi *dsi)
{
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
struct drm_bridge *iter;
if (!(dsi->state & DSIM_STATE_ENABLED))
@@ -1519,11 +1517,6 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
return 0;
}
-static const struct drm_encoder_helper_funcs exynos_dsi_encoder_helper_funcs = {
- .enable = exynos_dsi_enable,
- .disable = exynos_dsi_disable,
-};
-
static int exynos_dsi_bridge_attach(struct drm_bridge *bridge,
enum drm_bridge_attach_flags flags)
{
@@ -1537,8 +1530,24 @@ static int exynos_dsi_bridge_attach(struct drm_bridge *bridge,
return 0;
}
+static void exynos_dsi_bridge_enable(struct drm_bridge *bridge)
+{
+ struct exynos_dsi *dsi = bridge->driver_private;
+
+ exynos_dsi_enable(dsi);
+}
+
+static void exynos_dsi_bridge_disable(struct drm_bridge *bridge)
+{
+ struct exynos_dsi *dsi = bridge->driver_private;
+
+ exynos_dsi_disable(dsi);
+}
+
static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = {
.attach = exynos_dsi_bridge_attach,
+ .enable = exynos_dsi_bridge_enable,
+ .disable = exynos_dsi_bridge_disable,
};
MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
@@ -1619,7 +1628,7 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,
if (dsi->panel) {
mutex_lock(&drm->mode_config.mutex);
- exynos_dsi_disable(&dsi->encoder);
+ exynos_dsi_disable(dsi);
drm_panel_detach(dsi->panel);
dsi->panel = NULL;
dsi->connector.status = connector_status_disconnected;
@@ -1726,8 +1735,6 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
- drm_encoder_helper_add(encoder, &exynos_dsi_encoder_helper_funcs);
-
ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);
if (ret < 0)
return ret;
@@ -1753,7 +1760,7 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master,
struct drm_encoder *encoder = dev_get_drvdata(dev);
struct exynos_dsi *dsi = encoder_to_dsi(encoder);
- exynos_dsi_disable(encoder);
+ exynos_dsi_disable(dsi);
mipi_dsi_host_unregister(&dsi->dsi_host);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 06/16] drm/exynos: configure mode on drm bridge
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (4 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 05/16] drm/exynos: convert encoder functions to bridge function Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 07/16] drm/exynos: get encoder from bridge whenever possible Michael Tretter
` (9 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
The driver uses the encoder to get the mode that shall be configured.
This is not possible, if the driver is used as a bridge, because the
encoder might not be used.
Use the mode_set function to get the display mode.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 31d62c10614a..657de5407190 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -275,6 +275,8 @@ struct exynos_dsi {
u32 mode_flags;
u32 format;
+ struct drm_display_mode mode;
+
int state;
struct drm_property *brightness;
struct completion completed;
@@ -883,7 +885,7 @@ static int exynos_dsi_init_link(struct exynos_dsi *dsi)
static void exynos_dsi_set_display_mode(struct exynos_dsi *dsi)
{
- struct drm_display_mode *m = &dsi->encoder.crtc->state->adjusted_mode;
+ struct drm_display_mode *m = &dsi->mode;
unsigned int num_bits_resol = dsi->driver_data->num_bits_resol;
u32 reg;
@@ -1544,10 +1546,21 @@ static void exynos_dsi_bridge_disable(struct drm_bridge *bridge)
exynos_dsi_disable(dsi);
}
+static void exynos_dsi_bridge_mode_set(struct drm_bridge *bridge,
+ const struct drm_display_mode *mode,
+ const struct drm_display_mode *adjusted_mode)
+{
+ struct exynos_dsi *dsi = bridge->driver_private;
+
+ /* The mode is set when actually enabling the device. */
+ drm_mode_copy(&dsi->mode, adjusted_mode);
+}
+
static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = {
.attach = exynos_dsi_bridge_attach,
.enable = exynos_dsi_bridge_enable,
.disable = exynos_dsi_bridge_disable,
+ .mode_set = exynos_dsi_bridge_mode_set,
};
MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 07/16] drm/exynos: get encoder from bridge whenever possible
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (5 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 06/16] drm/exynos: configure mode on drm bridge Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 08/16] drm/exynos: use exynos_dsi as drvdata Michael Tretter
` (8 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
The bridge will not necessarily use the encoder of struct exynos_dsi,
but might use another encoder from another drm driver. Therefore, the
driver has to use the encoder from the bridge instead of the one from
exynos_dsi.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 657de5407190..51ec37304a69 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1289,7 +1289,7 @@ static irqreturn_t exynos_dsi_irq(int irq, void *dev_id)
static irqreturn_t exynos_dsi_te_irq_handler(int irq, void *dev_id)
{
struct exynos_dsi *dsi = (struct exynos_dsi *)dev_id;
- struct drm_encoder *encoder = &dsi->encoder;
+ struct drm_encoder *encoder = dsi->bridge.encoder;
if (dsi->state & DSIM_STATE_VIDOUT_AVAILABLE)
exynos_drm_crtc_te_handler(encoder->crtc);
@@ -1491,11 +1491,10 @@ static const struct drm_connector_helper_funcs exynos_dsi_connector_helper_funcs
.get_modes = exynos_dsi_get_modes,
};
-static int exynos_dsi_create_connector(struct drm_encoder *encoder)
+static int exynos_dsi_create_connector(struct exynos_dsi *dsi)
{
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
struct drm_connector *connector = &dsi->connector;
- struct drm_device *drm = encoder->dev;
+ struct drm_device *drm = dsi->bridge.dev;
int ret;
connector->polled = DRM_CONNECTOR_POLL_HPD;
@@ -1510,7 +1509,7 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
connector->status = connector_status_disconnected;
drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
- drm_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, dsi->bridge.encoder);
if (!drm->registered)
return 0;
@@ -1586,7 +1585,7 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
dsi->out_bridge = out_bridge;
list_splice_init(&encoder->bridge_chain, &dsi->bridge_chain);
} else {
- int ret = exynos_dsi_create_connector(encoder);
+ int ret = exynos_dsi_create_connector(dsi);
if (ret) {
DRM_DEV_ERROR(dsi->dev,
@@ -1637,7 +1636,7 @@ static int exynos_dsi_host_detach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
struct exynos_dsi *dsi = host_to_dsi(host);
- struct drm_device *drm = dsi->encoder.dev;
+ struct drm_device *drm = dsi->bridge.encoder->dev;
if (dsi->panel) {
mutex_lock(&drm->mode_config.mutex);
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 08/16] drm/exynos: use exynos_dsi as drvdata
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (6 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 07/16] drm/exynos: get encoder from bridge whenever possible Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 09/16] drm/exynos: call probe helper from bind Michael Tretter
` (7 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
Use the exynos_dsi as drvdata instead of the encoder to further decouple
the driver from the encoder.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 51ec37304a69..2e8142464b74 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -290,11 +290,6 @@ struct exynos_dsi {
#define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host)
#define connector_to_dsi(c) container_of(c, struct exynos_dsi, connector)
-static inline struct exynos_dsi *encoder_to_dsi(struct drm_encoder *e)
-{
- return container_of(e, struct exynos_dsi, encoder);
-}
-
enum reg_idx {
DSIM_STATUS_REG, /* Status register */
DSIM_SWRST_REG, /* Software reset register */
@@ -1738,8 +1733,8 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
static int exynos_dsi_bind(struct device *dev, struct device *master,
void *data)
{
- struct drm_encoder *encoder = dev_get_drvdata(dev);
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
+ struct exynos_dsi *dsi = dev_get_drvdata(dev);
+ struct drm_encoder *encoder = &dsi->encoder;
struct drm_device *drm_dev = data;
struct device_node *in_bridge_node;
struct drm_bridge *in_bridge;
@@ -1769,8 +1764,7 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
static void exynos_dsi_unbind(struct device *dev, struct device *master,
void *data)
{
- struct drm_encoder *encoder = dev_get_drvdata(dev);
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
+ struct exynos_dsi *dsi = dev_get_drvdata(dev);
exynos_dsi_disable(dsi);
@@ -1896,15 +1890,14 @@ static int exynos_dsi_probe(struct platform_device *pdev)
dsi = __exynos_dsi_probe(pdev);
if (IS_ERR(dsi))
return PTR_ERR(dsi);
- platform_set_drvdata(pdev, &dsi->encoder);
+ platform_set_drvdata(pdev, dsi);
return component_add(&pdev->dev, &exynos_dsi_component_ops);
}
static int exynos_dsi_remove(struct platform_device *pdev)
{
- struct drm_encoder *encoder = platform_get_drvdata(pdev);
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
+ struct exynos_dsi *dsi = platform_get_drvdata(pdev);
__exynos_dsi_remove(dsi);
@@ -1915,8 +1908,7 @@ static int exynos_dsi_remove(struct platform_device *pdev)
static int __maybe_unused exynos_dsi_suspend(struct device *dev)
{
- struct drm_encoder *encoder = dev_get_drvdata(dev);
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
+ struct exynos_dsi *dsi = dev_get_drvdata(dev);
const struct exynos_dsi_driver_data *driver_data = dsi->driver_data;
int ret, i;
@@ -1946,8 +1938,7 @@ static int __maybe_unused exynos_dsi_suspend(struct device *dev)
static int __maybe_unused exynos_dsi_resume(struct device *dev)
{
- struct drm_encoder *encoder = dev_get_drvdata(dev);
- struct exynos_dsi *dsi = encoder_to_dsi(encoder);
+ struct exynos_dsi *dsi = dev_get_drvdata(dev);
const struct exynos_dsi_driver_data *driver_data = dsi->driver_data;
int ret, i;
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 09/16] drm/exynos: call probe helper from bind
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (7 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 08/16] drm/exynos: use exynos_dsi as drvdata Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 10/16] drm/exynos: move dsi host registration to probe helper Michael Tretter
` (6 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
The probe shall only register the driver at the component framework. The
actual probing happens when the driver is bound.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 27 +++++++++++++------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 2e8142464b74..7485097472dc 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1730,16 +1730,26 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
return 0;
}
+static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev);
+static void __exynos_dsi_remove(struct exynos_dsi *dsi);
+
static int exynos_dsi_bind(struct device *dev, struct device *master,
void *data)
{
- struct exynos_dsi *dsi = dev_get_drvdata(dev);
- struct drm_encoder *encoder = &dsi->encoder;
+ struct platform_device *pdev = to_platform_device(dev);
+ struct exynos_dsi *dsi;
+ struct drm_encoder *encoder;
struct drm_device *drm_dev = data;
struct device_node *in_bridge_node;
struct drm_bridge *in_bridge;
int ret;
+ dsi = __exynos_dsi_probe(pdev);
+ if (IS_ERR(dsi))
+ return PTR_ERR(dsi);
+ platform_set_drvdata(pdev, dsi);
+
+ encoder = &dsi->encoder;
drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);
@@ -1768,6 +1778,8 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master,
exynos_dsi_disable(dsi);
+ __exynos_dsi_remove(dsi);
+
mipi_dsi_host_unregister(&dsi->dsi_host);
}
@@ -1885,22 +1897,11 @@ static void __exynos_dsi_remove(struct exynos_dsi *dsi)
static int exynos_dsi_probe(struct platform_device *pdev)
{
- struct exynos_dsi *dsi;
-
- dsi = __exynos_dsi_probe(pdev);
- if (IS_ERR(dsi))
- return PTR_ERR(dsi);
- platform_set_drvdata(pdev, dsi);
-
return component_add(&pdev->dev, &exynos_dsi_component_ops);
}
static int exynos_dsi_remove(struct platform_device *pdev)
{
- struct exynos_dsi *dsi = platform_get_drvdata(pdev);
-
- __exynos_dsi_remove(dsi);
-
component_del(&pdev->dev, &exynos_dsi_component_ops);
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 10/16] drm/exynos: move dsi host registration to probe helper
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (8 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 09/16] drm/exynos: call probe helper from bind Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 11/16] drm/exynos: shift register values to fields on write Michael Tretter
` (5 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
The bind/unbind API will be only used with the component framework, but
the mipi dsi host is always required. Therefore, move it to the shared
probe helper function.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 7485097472dc..3bf4ae0fe6cc 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1768,7 +1768,7 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
if (ret)
return ret;
- return mipi_dsi_host_register(&dsi->dsi_host);
+ return 0;
}
static void exynos_dsi_unbind(struct device *dev, struct device *master,
@@ -1779,8 +1779,6 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master,
exynos_dsi_disable(dsi);
__exynos_dsi_remove(dsi);
-
- mipi_dsi_host_unregister(&dsi->dsi_host);
}
static const struct component_ops exynos_dsi_component_ops = {
@@ -1878,6 +1876,10 @@ static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
pm_runtime_enable(dev);
+ ret = mipi_dsi_host_register(&dsi->dsi_host);
+ if (ret)
+ return ERR_PTR(ret);
+
bridge = &dsi->bridge;
bridge->driver_private = dsi;
bridge->funcs = &exynos_dsi_bridge_funcs;
@@ -1892,6 +1894,8 @@ static void __exynos_dsi_remove(struct exynos_dsi *dsi)
{
drm_bridge_remove(&dsi->bridge);
+ mipi_dsi_host_unregister(&dsi->dsi_host);
+
pm_runtime_disable(dsi->dev);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 11/16] drm/exynos: shift register values to fields on write
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (9 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 10/16] drm/exynos: move dsi host registration to probe helper Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 12/16] drm/exynos: use identifier instead of register offsets Michael Tretter
` (4 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
The phy timings are already shifted to the field position. If the driver
is reused on multiple platforms, this exposes the field positions to the
platform code.
Store only the timing values in the platform data and shift the value to
the field when writing the fields to the registers.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 88 +++++++++++++------------
1 file changed, 46 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 3bf4ae0fe6cc..21db18ae0772 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -397,54 +397,54 @@ static const unsigned int reg_values[] = {
[RESET_TYPE] = DSIM_SWRST,
[PLL_TIMER] = 500,
[STOP_STATE_CNT] = 0xf,
- [PHYCTRL_ULPS_EXIT] = DSIM_PHYCTRL_ULPS_EXIT(0x0af),
+ [PHYCTRL_ULPS_EXIT] = 0x0af,
[PHYCTRL_VREG_LP] = 0,
[PHYCTRL_SLEW_UP] = 0,
- [PHYTIMING_LPX] = DSIM_PHYTIMING_LPX(0x06),
- [PHYTIMING_HS_EXIT] = DSIM_PHYTIMING_HS_EXIT(0x0b),
- [PHYTIMING_CLK_PREPARE] = DSIM_PHYTIMING1_CLK_PREPARE(0x07),
- [PHYTIMING_CLK_ZERO] = DSIM_PHYTIMING1_CLK_ZERO(0x27),
- [PHYTIMING_CLK_POST] = DSIM_PHYTIMING1_CLK_POST(0x0d),
- [PHYTIMING_CLK_TRAIL] = DSIM_PHYTIMING1_CLK_TRAIL(0x08),
- [PHYTIMING_HS_PREPARE] = DSIM_PHYTIMING2_HS_PREPARE(0x09),
- [PHYTIMING_HS_ZERO] = DSIM_PHYTIMING2_HS_ZERO(0x0d),
- [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0b),
+ [PHYTIMING_LPX] = 0x06,
+ [PHYTIMING_HS_EXIT] = 0x0b,
+ [PHYTIMING_CLK_PREPARE] = 0x07,
+ [PHYTIMING_CLK_ZERO] = 0x27,
+ [PHYTIMING_CLK_POST] = 0x0d,
+ [PHYTIMING_CLK_TRAIL] = 0x08,
+ [PHYTIMING_HS_PREPARE] = 0x09,
+ [PHYTIMING_HS_ZERO] = 0x0d,
+ [PHYTIMING_HS_TRAIL] = 0x0b,
};
static const unsigned int exynos5422_reg_values[] = {
[RESET_TYPE] = DSIM_SWRST,
[PLL_TIMER] = 500,
[STOP_STATE_CNT] = 0xf,
- [PHYCTRL_ULPS_EXIT] = DSIM_PHYCTRL_ULPS_EXIT(0xaf),
+ [PHYCTRL_ULPS_EXIT] = 0xaf,
[PHYCTRL_VREG_LP] = 0,
[PHYCTRL_SLEW_UP] = 0,
- [PHYTIMING_LPX] = DSIM_PHYTIMING_LPX(0x08),
- [PHYTIMING_HS_EXIT] = DSIM_PHYTIMING_HS_EXIT(0x0d),
- [PHYTIMING_CLK_PREPARE] = DSIM_PHYTIMING1_CLK_PREPARE(0x09),
- [PHYTIMING_CLK_ZERO] = DSIM_PHYTIMING1_CLK_ZERO(0x30),
- [PHYTIMING_CLK_POST] = DSIM_PHYTIMING1_CLK_POST(0x0e),
- [PHYTIMING_CLK_TRAIL] = DSIM_PHYTIMING1_CLK_TRAIL(0x0a),
- [PHYTIMING_HS_PREPARE] = DSIM_PHYTIMING2_HS_PREPARE(0x0c),
- [PHYTIMING_HS_ZERO] = DSIM_PHYTIMING2_HS_ZERO(0x11),
- [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0d),
+ [PHYTIMING_LPX] = 0x08,
+ [PHYTIMING_HS_EXIT] = 0x0d,
+ [PHYTIMING_CLK_PREPARE] = 0x09,
+ [PHYTIMING_CLK_ZERO] = 0x30,
+ [PHYTIMING_CLK_POST] = 0x0e,
+ [PHYTIMING_CLK_TRAIL] = 0x0a,
+ [PHYTIMING_HS_PREPARE] = 0x0c,
+ [PHYTIMING_HS_ZERO] = 0x11,
+ [PHYTIMING_HS_TRAIL] = 0x0d,
};
static const unsigned int exynos5433_reg_values[] = {
[RESET_TYPE] = DSIM_FUNCRST,
[PLL_TIMER] = 22200,
[STOP_STATE_CNT] = 0xa,
- [PHYCTRL_ULPS_EXIT] = DSIM_PHYCTRL_ULPS_EXIT(0x190),
- [PHYCTRL_VREG_LP] = DSIM_PHYCTRL_B_DPHYCTL_VREG_LP,
- [PHYCTRL_SLEW_UP] = DSIM_PHYCTRL_B_DPHYCTL_SLEW_UP,
- [PHYTIMING_LPX] = DSIM_PHYTIMING_LPX(0x07),
- [PHYTIMING_HS_EXIT] = DSIM_PHYTIMING_HS_EXIT(0x0c),
- [PHYTIMING_CLK_PREPARE] = DSIM_PHYTIMING1_CLK_PREPARE(0x09),
- [PHYTIMING_CLK_ZERO] = DSIM_PHYTIMING1_CLK_ZERO(0x2d),
- [PHYTIMING_CLK_POST] = DSIM_PHYTIMING1_CLK_POST(0x0e),
- [PHYTIMING_CLK_TRAIL] = DSIM_PHYTIMING1_CLK_TRAIL(0x09),
- [PHYTIMING_HS_PREPARE] = DSIM_PHYTIMING2_HS_PREPARE(0x0b),
- [PHYTIMING_HS_ZERO] = DSIM_PHYTIMING2_HS_ZERO(0x10),
- [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0c),
+ [PHYCTRL_ULPS_EXIT] = 0x190,
+ [PHYCTRL_VREG_LP] = 1,
+ [PHYCTRL_SLEW_UP] = 1,
+ [PHYTIMING_LPX] = 0x07,
+ [PHYTIMING_HS_EXIT] = 0x0c,
+ [PHYTIMING_CLK_PREPARE] = 0x09,
+ [PHYTIMING_CLK_ZERO] = 0x2d,
+ [PHYTIMING_CLK_POST] = 0x0e,
+ [PHYTIMING_CLK_TRAIL] = 0x09,
+ [PHYTIMING_HS_PREPARE] = 0x0b,
+ [PHYTIMING_HS_ZERO] = 0x10,
+ [PHYTIMING_HS_TRAIL] = 0x0c,
};
static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
@@ -696,8 +696,11 @@ static void exynos_dsi_set_phy_ctrl(struct exynos_dsi *dsi)
return;
/* B D-PHY: D-PHY Master & Slave Analog Block control */
- reg = reg_values[PHYCTRL_ULPS_EXIT] | reg_values[PHYCTRL_VREG_LP] |
- reg_values[PHYCTRL_SLEW_UP];
+ reg = DSIM_PHYCTRL_ULPS_EXIT(reg_values[PHYCTRL_ULPS_EXIT]);
+ if (reg_values[PHYCTRL_VREG_LP])
+ reg |= DSIM_PHYCTRL_B_DPHYCTL_VREG_LP;
+ if (reg_values[PHYCTRL_SLEW_UP])
+ reg |= DSIM_PHYCTRL_B_DPHYCTL_SLEW_UP;
exynos_dsi_write(dsi, DSIM_PHYCTRL_REG, reg);
/*
@@ -705,7 +708,8 @@ static void exynos_dsi_set_phy_ctrl(struct exynos_dsi *dsi)
* T HS-EXIT: Time that the transmitter drives LP-11 following a HS
* burst
*/
- reg = reg_values[PHYTIMING_LPX] | reg_values[PHYTIMING_HS_EXIT];
+ reg = DSIM_PHYTIMING_LPX(reg_values[PHYTIMING_LPX]) |
+ DSIM_PHYTIMING_HS_EXIT(reg_values[PHYTIMING_HS_EXIT]);
exynos_dsi_write(dsi, DSIM_PHYTIMING_REG, reg);
/*
@@ -721,11 +725,10 @@ static void exynos_dsi_set_phy_ctrl(struct exynos_dsi *dsi)
* T CLK-TRAIL: Time that the transmitter drives the HS-0 state after
* the last payload clock bit of a HS transmission burst
*/
- reg = reg_values[PHYTIMING_CLK_PREPARE] |
- reg_values[PHYTIMING_CLK_ZERO] |
- reg_values[PHYTIMING_CLK_POST] |
- reg_values[PHYTIMING_CLK_TRAIL];
-
+ reg = DSIM_PHYTIMING1_CLK_PREPARE(reg_values[PHYTIMING_CLK_PREPARE]) |
+ DSIM_PHYTIMING1_CLK_ZERO(reg_values[PHYTIMING_CLK_ZERO]) |
+ DSIM_PHYTIMING1_CLK_POST(reg_values[PHYTIMING_CLK_POST]) |
+ DSIM_PHYTIMING1_CLK_TRAIL(reg_values[PHYTIMING_CLK_TRAIL]);
exynos_dsi_write(dsi, DSIM_PHYTIMING1_REG, reg);
/*
@@ -737,8 +740,9 @@ static void exynos_dsi_set_phy_ctrl(struct exynos_dsi *dsi)
* T HS-TRAIL: Time that the transmitter drives the flipped differential
* state after last payload data bit of a HS transmission burst
*/
- reg = reg_values[PHYTIMING_HS_PREPARE] | reg_values[PHYTIMING_HS_ZERO] |
- reg_values[PHYTIMING_HS_TRAIL];
+ reg = DSIM_PHYTIMING2_HS_PREPARE(reg_values[PHYTIMING_HS_PREPARE]) |
+ DSIM_PHYTIMING2_HS_ZERO(reg_values[PHYTIMING_HS_ZERO]) |
+ DSIM_PHYTIMING2_HS_TRAIL(reg_values[PHYTIMING_HS_TRAIL]);
exynos_dsi_write(dsi, DSIM_PHYTIMING2_REG, reg);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 12/16] drm/exynos: use identifier instead of register offsets
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (10 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 11/16] drm/exynos: shift register values to fields on write Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 13/16] drm/exynos: add callback for tearing effect handler Michael Tretter
` (3 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
Different revisions of the MIPI-DSI PHY have slightly different register
layouts. Currently, the register layout was stored per platform, which
makes it necessary to define the layout for each new platform.
Keep the register layout in the driver and use identifiers to specify
which register layout shall be used on a platform.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 54 ++++++++++++++++---------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 21db18ae0772..287bc6e9b3ca 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -239,8 +239,13 @@ struct exynos_dsi_transfer {
#define DSIM_STATE_CMD_LPM BIT(2)
#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3)
+enum exynos_reg_offset {
+ EXYNOS_REG_OFS,
+ EXYNOS5433_REG_OFS
+};
+
struct exynos_dsi_driver_data {
- const unsigned int *reg_ofs;
+ enum exynos_reg_offset reg_ofs;
unsigned int plltmr_reg;
unsigned int has_freqband:1;
unsigned int has_clklane_stop:1;
@@ -315,18 +320,6 @@ enum reg_idx {
NUM_REGS
};
-static inline void exynos_dsi_write(struct exynos_dsi *dsi, enum reg_idx idx,
- u32 val)
-{
-
- writel(val, dsi->reg_base + dsi->driver_data->reg_ofs[idx]);
-}
-
-static inline u32 exynos_dsi_read(struct exynos_dsi *dsi, enum reg_idx idx)
-{
- return readl(dsi->reg_base + dsi->driver_data->reg_ofs[idx]);
-}
-
static const unsigned int exynos_reg_ofs[] = {
[DSIM_STATUS_REG] = 0x00,
[DSIM_SWRST_REG] = 0x04,
@@ -375,6 +368,31 @@ static const unsigned int exynos5433_reg_ofs[] = {
[DSIM_PHYTIMING2_REG] = 0xBC,
};
+static inline void exynos_dsi_write(struct exynos_dsi *dsi, enum reg_idx idx,
+ u32 val)
+{
+ const unsigned int *reg_ofs;
+
+ if (dsi->driver_data->reg_ofs == EXYNOS5433_REG_OFS)
+ reg_ofs = exynos5433_reg_ofs;
+ else
+ reg_ofs = exynos_reg_ofs;
+
+ writel(val, dsi->reg_base + reg_ofs[idx]);
+}
+
+static inline u32 exynos_dsi_read(struct exynos_dsi *dsi, enum reg_idx idx)
+{
+ const unsigned int *reg_ofs;
+
+ if (dsi->driver_data->reg_ofs == EXYNOS5433_REG_OFS)
+ reg_ofs = exynos5433_reg_ofs;
+ else
+ reg_ofs = exynos_reg_ofs;
+
+ return readl(dsi->reg_base + reg_ofs[idx]);
+}
+
enum reg_value_idx {
RESET_TYPE,
PLL_TIMER,
@@ -448,7 +466,7 @@ static const unsigned int exynos5433_reg_values[] = {
};
static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
- .reg_ofs = exynos_reg_ofs,
+ .reg_ofs = EXYNOS_REG_OFS,
.plltmr_reg = 0x50,
.has_freqband = 1,
.has_clklane_stop = 1,
@@ -460,7 +478,7 @@ static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
};
static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
- .reg_ofs = exynos_reg_ofs,
+ .reg_ofs = EXYNOS_REG_OFS,
.plltmr_reg = 0x50,
.has_freqband = 1,
.has_clklane_stop = 1,
@@ -472,7 +490,7 @@ static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
};
static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
- .reg_ofs = exynos_reg_ofs,
+ .reg_ofs = EXYNOS_REG_OFS,
.plltmr_reg = 0x58,
.num_clks = 2,
.max_freq = 1000,
@@ -482,7 +500,7 @@ static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
};
static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
- .reg_ofs = exynos5433_reg_ofs,
+ .reg_ofs = EXYNOS5433_REG_OFS,
.plltmr_reg = 0xa0,
.has_clklane_stop = 1,
.num_clks = 5,
@@ -493,7 +511,7 @@ static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
};
static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
- .reg_ofs = exynos5433_reg_ofs,
+ .reg_ofs = EXYNOS5433_REG_OFS,
.plltmr_reg = 0xa0,
.has_clklane_stop = 1,
.num_clks = 2,
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 13/16] drm/exynos: add callback for tearing effect handler
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (11 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 12/16] drm/exynos: use identifier instead of register offsets Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 14/16] drm/exynos: add callback for enabling i80 mode Michael Tretter
` (2 subsequent siblings)
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
The tearing effect interrupts are not handled by the MIPI DSI bridge
driver, but the display controller driver.
Allow platforms to register a callback for the tearing effect interrupt.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 287bc6e9b3ca..993402f1f7c7 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -254,6 +254,7 @@ struct exynos_dsi_driver_data {
unsigned int wait_for_reset;
unsigned int num_bits_resol;
const unsigned int *reg_values;
+ void (*te_handler)(struct drm_encoder *encoder);
};
struct exynos_dsi {
@@ -465,6 +466,11 @@ static const unsigned int exynos5433_reg_values[] = {
[PHYTIMING_HS_TRAIL] = 0x0c,
};
+static void exynos_dsi_te_handler(struct drm_encoder *encoder)
+{
+ exynos_drm_crtc_te_handler(encoder->crtc);
+}
+
static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
.reg_ofs = EXYNOS_REG_OFS,
.plltmr_reg = 0x50,
@@ -475,6 +481,7 @@ static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
.wait_for_reset = 1,
.num_bits_resol = 11,
.reg_values = reg_values,
+ .te_handler = exynos_dsi_te_handler,
};
static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
@@ -487,6 +494,7 @@ static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
.wait_for_reset = 1,
.num_bits_resol = 11,
.reg_values = reg_values,
+ .te_handler = exynos_dsi_te_handler,
};
static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
@@ -497,6 +505,7 @@ static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
.wait_for_reset = 1,
.num_bits_resol = 11,
.reg_values = reg_values,
+ .te_handler = exynos_dsi_te_handler,
};
static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
@@ -508,6 +517,7 @@ static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
.wait_for_reset = 0,
.num_bits_resol = 12,
.reg_values = exynos5433_reg_values,
+ .te_handler = exynos_dsi_te_handler,
};
static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
@@ -519,6 +529,7 @@ static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
.wait_for_reset = 1,
.num_bits_resol = 12,
.reg_values = exynos5422_reg_values,
+ .te_handler = exynos_dsi_te_handler,
};
static const struct of_device_id exynos_dsi_of_match[] = {
@@ -1305,11 +1316,13 @@ static irqreturn_t exynos_dsi_irq(int irq, void *dev_id)
static irqreturn_t exynos_dsi_te_irq_handler(int irq, void *dev_id)
{
- struct exynos_dsi *dsi = (struct exynos_dsi *)dev_id;
+ struct exynos_dsi *dsi = dev_id;
+ const struct exynos_dsi_driver_data *driver_data = dsi->driver_data;
struct drm_encoder *encoder = dsi->bridge.encoder;
- if (dsi->state & DSIM_STATE_VIDOUT_AVAILABLE)
- exynos_drm_crtc_te_handler(encoder->crtc);
+ if (driver_data->te_handler &&
+ (dsi->state & DSIM_STATE_VIDOUT_AVAILABLE))
+ driver_data->te_handler(encoder);
return IRQ_HANDLED;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 14/16] drm/exynos: add callback for enabling i80 mode
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (12 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 13/16] drm/exynos: add callback for tearing effect handler Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 16:57 ` [PATCH 15/16] drm/exynos: split out platform specific code Michael Tretter
2020-09-03 20:08 ` [PATCH 00/16] drm/exynos: Convert driver to drm bridge Krzysztof Kozlowski
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
Display controllers need to know if the MIPI DSI bridge is running in
command or video mode. Allow platform drivers to register a callback for
being notified about the used mode.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 993402f1f7c7..a9dac66c834f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -255,6 +255,7 @@ struct exynos_dsi_driver_data {
unsigned int num_bits_resol;
const unsigned int *reg_values;
void (*te_handler)(struct drm_encoder *encoder);
+ void (*set_command_node)(struct drm_encoder *encoder, bool enable);
};
struct exynos_dsi {
@@ -471,6 +472,19 @@ static void exynos_dsi_te_handler(struct drm_encoder *encoder)
exynos_drm_crtc_te_handler(encoder->crtc);
}
+static void exynos_dsi_set_command_mode(struct drm_encoder *encoder,
+ bool enable)
+{
+ struct drm_device *drm = encoder->dev;
+ struct exynos_drm_crtc *crtc;
+
+ crtc = exynos_drm_crtc_get_by_type(drm, EXYNOS_DISPLAY_TYPE_LCD);
+ if (IS_ERR(crtc))
+ return;
+
+ crtc->i80_mode = enable;
+}
+
static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
.reg_ofs = EXYNOS_REG_OFS,
.plltmr_reg = 0x50,
@@ -482,6 +496,7 @@ static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
.num_bits_resol = 11,
.reg_values = reg_values,
.te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
};
static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
@@ -495,6 +510,7 @@ static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
.num_bits_resol = 11,
.reg_values = reg_values,
.te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
};
static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
@@ -506,6 +522,7 @@ static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
.num_bits_resol = 11,
.reg_values = reg_values,
.te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
};
static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
@@ -518,6 +535,7 @@ static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
.num_bits_resol = 12,
.reg_values = exynos5433_reg_values,
.te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
};
static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
@@ -530,6 +548,7 @@ static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
.num_bits_resol = 12,
.reg_values = exynos5422_reg_values,
.te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
};
static const struct of_device_id exynos_dsi_of_match[] = {
@@ -1651,8 +1670,9 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
dsi->lanes = device->lanes;
dsi->format = device->format;
dsi->mode_flags = device->mode_flags;
- exynos_drm_crtc_get_by_type(drm, EXYNOS_DISPLAY_TYPE_LCD)->i80_mode =
- !(dsi->mode_flags & MIPI_DSI_MODE_VIDEO);
+ if (dsi->driver_data->set_command_node)
+ dsi->driver_data->set_command_node(encoder,
+ !(dsi->mode_flags & MIPI_DSI_MODE_VIDEO));
mutex_unlock(&drm->mode_config.mutex);
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 15/16] drm/exynos: split out platform specific code
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (13 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 14/16] drm/exynos: add callback for enabling i80 mode Michael Tretter
@ 2020-09-03 16:57 ` Michael Tretter
2020-09-03 20:08 ` [PATCH 00/16] drm/exynos: Convert driver to drm bridge Krzysztof Kozlowski
15 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-03 16:57 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: kernel, Laurent.pinchart, krzk, narmstrong, Michael Tretter
Split the driver into the drm bridge driver and the exynos platform
specific driver.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
drivers/gpu/drm/exynos/Makefile | 2 +-
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 312 ++----------------
drivers/gpu/drm/exynos/exynos_drm_dsi.h | 57 ++++
drivers/gpu/drm/exynos/exynos_drm_dsi_pltfm.c | 307 +++++++++++++++++
4 files changed, 393 insertions(+), 285 deletions(-)
create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dsi.h
create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dsi_pltfm.c
diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile
index 2fd2f3ee4fcf..add70b336935 100644
--- a/drivers/gpu/drm/exynos/Makefile
+++ b/drivers/gpu/drm/exynos/Makefile
@@ -11,7 +11,7 @@ exynosdrm-$(CONFIG_DRM_EXYNOS_FIMD) += exynos_drm_fimd.o
exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON) += exynos5433_drm_decon.o
exynosdrm-$(CONFIG_DRM_EXYNOS7_DECON) += exynos7_drm_decon.o
exynosdrm-$(CONFIG_DRM_EXYNOS_DPI) += exynos_drm_dpi.o
-exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o
+exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o exynos_drm_dsi_pltfm.o
exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp.o
exynosdrm-$(CONFIG_DRM_EXYNOS_MIXER) += exynos_mixer.o
exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index a9dac66c834f..a6ff6326e8f1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -32,8 +32,7 @@
#include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
-#include "exynos_drm_crtc.h"
-#include "exynos_drm_drv.h"
+#include "exynos_drm_dsi.h"
/* returns true iff both arguments logically differs */
#define NEQV(a, b) (!(a) ^ !(b))
@@ -44,10 +43,6 @@
#define DSIM_TX_READY_HS_CLK (1 << 10)
#define DSIM_PLL_STABLE (1 << 31)
-/* DSIM_SWRST */
-#define DSIM_FUNCRST (1 << 16)
-#define DSIM_SWRST (1 << 0)
-
/* DSIM_TIMEOUT */
#define DSIM_LPDR_TIMEOUT(x) ((x) << 0)
#define DSIM_BTA_TIMEOUT(x) ((x) << 16)
@@ -239,25 +234,6 @@ struct exynos_dsi_transfer {
#define DSIM_STATE_CMD_LPM BIT(2)
#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3)
-enum exynos_reg_offset {
- EXYNOS_REG_OFS,
- EXYNOS5433_REG_OFS
-};
-
-struct exynos_dsi_driver_data {
- enum exynos_reg_offset reg_ofs;
- unsigned int plltmr_reg;
- unsigned int has_freqband:1;
- unsigned int has_clklane_stop:1;
- unsigned int num_clks;
- unsigned int max_freq;
- unsigned int wait_for_reset;
- unsigned int num_bits_resol;
- const unsigned int *reg_values;
- void (*te_handler)(struct drm_encoder *encoder);
- void (*set_command_node)(struct drm_encoder *encoder, bool enable);
-};
-
struct exynos_dsi {
struct drm_encoder encoder;
struct drm_bridge bridge;
@@ -395,176 +371,6 @@ static inline u32 exynos_dsi_read(struct exynos_dsi *dsi, enum reg_idx idx)
return readl(dsi->reg_base + reg_ofs[idx]);
}
-enum reg_value_idx {
- RESET_TYPE,
- PLL_TIMER,
- STOP_STATE_CNT,
- PHYCTRL_ULPS_EXIT,
- PHYCTRL_VREG_LP,
- PHYCTRL_SLEW_UP,
- PHYTIMING_LPX,
- PHYTIMING_HS_EXIT,
- PHYTIMING_CLK_PREPARE,
- PHYTIMING_CLK_ZERO,
- PHYTIMING_CLK_POST,
- PHYTIMING_CLK_TRAIL,
- PHYTIMING_HS_PREPARE,
- PHYTIMING_HS_ZERO,
- PHYTIMING_HS_TRAIL
-};
-
-static const unsigned int reg_values[] = {
- [RESET_TYPE] = DSIM_SWRST,
- [PLL_TIMER] = 500,
- [STOP_STATE_CNT] = 0xf,
- [PHYCTRL_ULPS_EXIT] = 0x0af,
- [PHYCTRL_VREG_LP] = 0,
- [PHYCTRL_SLEW_UP] = 0,
- [PHYTIMING_LPX] = 0x06,
- [PHYTIMING_HS_EXIT] = 0x0b,
- [PHYTIMING_CLK_PREPARE] = 0x07,
- [PHYTIMING_CLK_ZERO] = 0x27,
- [PHYTIMING_CLK_POST] = 0x0d,
- [PHYTIMING_CLK_TRAIL] = 0x08,
- [PHYTIMING_HS_PREPARE] = 0x09,
- [PHYTIMING_HS_ZERO] = 0x0d,
- [PHYTIMING_HS_TRAIL] = 0x0b,
-};
-
-static const unsigned int exynos5422_reg_values[] = {
- [RESET_TYPE] = DSIM_SWRST,
- [PLL_TIMER] = 500,
- [STOP_STATE_CNT] = 0xf,
- [PHYCTRL_ULPS_EXIT] = 0xaf,
- [PHYCTRL_VREG_LP] = 0,
- [PHYCTRL_SLEW_UP] = 0,
- [PHYTIMING_LPX] = 0x08,
- [PHYTIMING_HS_EXIT] = 0x0d,
- [PHYTIMING_CLK_PREPARE] = 0x09,
- [PHYTIMING_CLK_ZERO] = 0x30,
- [PHYTIMING_CLK_POST] = 0x0e,
- [PHYTIMING_CLK_TRAIL] = 0x0a,
- [PHYTIMING_HS_PREPARE] = 0x0c,
- [PHYTIMING_HS_ZERO] = 0x11,
- [PHYTIMING_HS_TRAIL] = 0x0d,
-};
-
-static const unsigned int exynos5433_reg_values[] = {
- [RESET_TYPE] = DSIM_FUNCRST,
- [PLL_TIMER] = 22200,
- [STOP_STATE_CNT] = 0xa,
- [PHYCTRL_ULPS_EXIT] = 0x190,
- [PHYCTRL_VREG_LP] = 1,
- [PHYCTRL_SLEW_UP] = 1,
- [PHYTIMING_LPX] = 0x07,
- [PHYTIMING_HS_EXIT] = 0x0c,
- [PHYTIMING_CLK_PREPARE] = 0x09,
- [PHYTIMING_CLK_ZERO] = 0x2d,
- [PHYTIMING_CLK_POST] = 0x0e,
- [PHYTIMING_CLK_TRAIL] = 0x09,
- [PHYTIMING_HS_PREPARE] = 0x0b,
- [PHYTIMING_HS_ZERO] = 0x10,
- [PHYTIMING_HS_TRAIL] = 0x0c,
-};
-
-static void exynos_dsi_te_handler(struct drm_encoder *encoder)
-{
- exynos_drm_crtc_te_handler(encoder->crtc);
-}
-
-static void exynos_dsi_set_command_mode(struct drm_encoder *encoder,
- bool enable)
-{
- struct drm_device *drm = encoder->dev;
- struct exynos_drm_crtc *crtc;
-
- crtc = exynos_drm_crtc_get_by_type(drm, EXYNOS_DISPLAY_TYPE_LCD);
- if (IS_ERR(crtc))
- return;
-
- crtc->i80_mode = enable;
-}
-
-static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
- .reg_ofs = EXYNOS_REG_OFS,
- .plltmr_reg = 0x50,
- .has_freqband = 1,
- .has_clklane_stop = 1,
- .num_clks = 2,
- .max_freq = 1000,
- .wait_for_reset = 1,
- .num_bits_resol = 11,
- .reg_values = reg_values,
- .te_handler = exynos_dsi_te_handler,
- .set_command_node = exynos_dsi_set_command_mode,
-};
-
-static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
- .reg_ofs = EXYNOS_REG_OFS,
- .plltmr_reg = 0x50,
- .has_freqband = 1,
- .has_clklane_stop = 1,
- .num_clks = 2,
- .max_freq = 1000,
- .wait_for_reset = 1,
- .num_bits_resol = 11,
- .reg_values = reg_values,
- .te_handler = exynos_dsi_te_handler,
- .set_command_node = exynos_dsi_set_command_mode,
-};
-
-static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
- .reg_ofs = EXYNOS_REG_OFS,
- .plltmr_reg = 0x58,
- .num_clks = 2,
- .max_freq = 1000,
- .wait_for_reset = 1,
- .num_bits_resol = 11,
- .reg_values = reg_values,
- .te_handler = exynos_dsi_te_handler,
- .set_command_node = exynos_dsi_set_command_mode,
-};
-
-static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
- .reg_ofs = EXYNOS5433_REG_OFS,
- .plltmr_reg = 0xa0,
- .has_clklane_stop = 1,
- .num_clks = 5,
- .max_freq = 1500,
- .wait_for_reset = 0,
- .num_bits_resol = 12,
- .reg_values = exynos5433_reg_values,
- .te_handler = exynos_dsi_te_handler,
- .set_command_node = exynos_dsi_set_command_mode,
-};
-
-static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
- .reg_ofs = EXYNOS5433_REG_OFS,
- .plltmr_reg = 0xa0,
- .has_clklane_stop = 1,
- .num_clks = 2,
- .max_freq = 1500,
- .wait_for_reset = 1,
- .num_bits_resol = 12,
- .reg_values = exynos5422_reg_values,
- .te_handler = exynos_dsi_te_handler,
- .set_command_node = exynos_dsi_set_command_mode,
-};
-
-static const struct of_device_id exynos_dsi_of_match[] = {
- { .compatible = "samsung,exynos3250-mipi-dsi",
- .data = &exynos3_dsi_driver_data },
- { .compatible = "samsung,exynos4210-mipi-dsi",
- .data = &exynos4_dsi_driver_data },
- { .compatible = "samsung,exynos5410-mipi-dsi",
- .data = &exynos5_dsi_driver_data },
- { .compatible = "samsung,exynos5422-mipi-dsi",
- .data = &exynos5422_dsi_driver_data },
- { .compatible = "samsung,exynos5433-mipi-dsi",
- .data = &exynos5433_dsi_driver_data },
- { }
-};
-
static void exynos_dsi_wait_for_reset(struct exynos_dsi *dsi)
{
if (wait_for_completion_timeout(&dsi->completed, msecs_to_jiffies(300)))
@@ -1611,8 +1417,6 @@ static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = {
.mode_set = exynos_dsi_bridge_mode_set,
};
-MODULE_DEVICE_TABLE(of, exynos_dsi_of_match);
-
static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
@@ -1756,11 +1560,6 @@ static int exynos_dsi_of_read_u32(const struct device_node *np,
return ret;
}
-enum {
- DSI_PORT_IN,
- DSI_PORT_OUT
-};
-
static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
{
struct device *dev = dsi->dev;
@@ -1785,62 +1584,6 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
return 0;
}
-static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev);
-static void __exynos_dsi_remove(struct exynos_dsi *dsi);
-
-static int exynos_dsi_bind(struct device *dev, struct device *master,
- void *data)
-{
- struct platform_device *pdev = to_platform_device(dev);
- struct exynos_dsi *dsi;
- struct drm_encoder *encoder;
- struct drm_device *drm_dev = data;
- struct device_node *in_bridge_node;
- struct drm_bridge *in_bridge;
- int ret;
-
- dsi = __exynos_dsi_probe(pdev);
- if (IS_ERR(dsi))
- return PTR_ERR(dsi);
- platform_set_drvdata(pdev, dsi);
-
- encoder = &dsi->encoder;
- drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
-
- ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);
- if (ret < 0)
- return ret;
-
- in_bridge_node = of_graph_get_remote_node(dev->of_node, DSI_PORT_IN, 0);
- if (in_bridge_node) {
- in_bridge = of_drm_find_bridge(in_bridge_node);
- if (in_bridge)
- drm_bridge_attach(encoder, in_bridge, NULL, 0);
- of_node_put(in_bridge_node);
- }
-
- ret = drm_bridge_attach(encoder, &dsi->bridge, in_bridge, 0);
- if (ret)
- return ret;
-
- return 0;
-}
-
-static void exynos_dsi_unbind(struct device *dev, struct device *master,
- void *data)
-{
- struct exynos_dsi *dsi = dev_get_drvdata(dev);
-
- exynos_dsi_disable(dsi);
-
- __exynos_dsi_remove(dsi);
-}
-
-static const struct component_ops exynos_dsi_component_ops = {
- .bind = exynos_dsi_bind,
- .unbind = exynos_dsi_unbind,
-};
-
static struct exynos_dsi *__exynos_dsi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -1954,21 +1697,40 @@ static void __exynos_dsi_remove(struct exynos_dsi *dsi)
pm_runtime_disable(dsi->dev);
}
-static int exynos_dsi_probe(struct platform_device *pdev)
+/*
+ * Bind/unbind API, used from platforms based on the component framework.
+ */
+struct exynos_dsi *exynos_dsi_bind(struct platform_device *pdev,
+ struct drm_encoder *encoder)
{
- return component_add(&pdev->dev, &exynos_dsi_component_ops);
+ struct exynos_dsi *dsi;
+ struct drm_bridge *previous = drm_bridge_chain_get_first_bridge(encoder);
+ int ret;
+
+ dsi = __exynos_dsi_probe(pdev);
+ if (IS_ERR(dsi))
+ return dsi;
+
+ ret = drm_bridge_attach(encoder, &dsi->bridge, previous, 0);
+ if (ret) {
+ __exynos_dsi_remove(dsi);
+ return ERR_PTR(ret);
+ }
+
+ return dsi;
}
+EXPORT_SYMBOL_GPL(exynos_dsi_bind);
-static int exynos_dsi_remove(struct platform_device *pdev)
+void exynos_dsi_unbind(struct exynos_dsi *dsi)
{
- component_del(&pdev->dev, &exynos_dsi_component_ops);
+ exynos_dsi_disable(dsi);
- return 0;
+ __exynos_dsi_remove(dsi);
}
+EXPORT_SYMBOL_GPL(exynos_dsi_unbind);
-static int __maybe_unused exynos_dsi_suspend(struct device *dev)
+int __maybe_unused exynos_dsi_suspend(struct exynos_dsi *dsi)
{
- struct exynos_dsi *dsi = dev_get_drvdata(dev);
const struct exynos_dsi_driver_data *driver_data = dsi->driver_data;
int ret, i;
@@ -1996,9 +1758,8 @@ static int __maybe_unused exynos_dsi_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused exynos_dsi_resume(struct device *dev)
+int __maybe_unused exynos_dsi_resume(struct exynos_dsi *dsi)
{
- struct exynos_dsi *dsi = dev_get_drvdata(dev);
const struct exynos_dsi_driver_data *driver_data = dsi->driver_data;
int ret, i;
@@ -2030,23 +1791,6 @@ static int __maybe_unused exynos_dsi_resume(struct device *dev)
return ret;
}
-static const struct dev_pm_ops exynos_dsi_pm_ops = {
- SET_RUNTIME_PM_OPS(exynos_dsi_suspend, exynos_dsi_resume, NULL)
- SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
- pm_runtime_force_resume)
-};
-
-struct platform_driver dsi_driver = {
- .probe = exynos_dsi_probe,
- .remove = exynos_dsi_remove,
- .driver = {
- .name = "exynos-dsi",
- .owner = THIS_MODULE,
- .pm = &exynos_dsi_pm_ops,
- .of_match_table = exynos_dsi_of_match,
- },
-};
-
MODULE_AUTHOR("Tomasz Figa <t.figa@samsung.com>");
MODULE_AUTHOR("Andrzej Hajda <a.hajda@samsung.com>");
MODULE_DESCRIPTION("Samsung SoC MIPI DSI Master");
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.h b/drivers/gpu/drm/exynos/exynos_drm_dsi.h
new file mode 100644
index 000000000000..5b44f8bbd38d
--- /dev/null
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.h
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef __EXYNOS_DRM_DSI__
+#define __EXYNOS_DRM_DSI__
+
+struct drm_encoder;
+struct exynos_dsi;
+struct platform_device;
+
+enum exynos_reg_offset {
+ EXYNOS_REG_OFS,
+ EXYNOS5433_REG_OFS
+};
+
+struct exynos_dsi *exynos_dsi_bind(struct platform_device *pdev,
+ struct drm_encoder *encoder);
+void exynos_dsi_unbind(struct exynos_dsi *dsi);
+
+int exynos_dsi_suspend(struct exynos_dsi *dsi);
+int exynos_dsi_resume(struct exynos_dsi *dsi);
+
+enum reg_value_idx {
+ RESET_TYPE,
+ PLL_TIMER,
+ STOP_STATE_CNT,
+ PHYCTRL_ULPS_EXIT,
+ PHYCTRL_VREG_LP,
+ PHYCTRL_SLEW_UP,
+ PHYTIMING_LPX,
+ PHYTIMING_HS_EXIT,
+ PHYTIMING_CLK_PREPARE,
+ PHYTIMING_CLK_ZERO,
+ PHYTIMING_CLK_POST,
+ PHYTIMING_CLK_TRAIL,
+ PHYTIMING_HS_PREPARE,
+ PHYTIMING_HS_ZERO,
+ PHYTIMING_HS_TRAIL
+};
+
+/* DSIM_SWRST */
+#define DSIM_FUNCRST (1 << 16)
+#define DSIM_SWRST (1 << 0)
+
+struct exynos_dsi_driver_data {
+ enum exynos_reg_offset reg_ofs;
+ unsigned int plltmr_reg;
+ unsigned int has_freqband:1;
+ unsigned int has_clklane_stop:1;
+ unsigned int num_clks;
+ unsigned int max_freq;
+ unsigned int wait_for_reset;
+ unsigned int num_bits_resol;
+ const unsigned int *reg_values;
+ void (*te_handler)(struct drm_encoder *encoder);
+ void (*set_command_node)(struct drm_encoder *encoder, bool enable);
+};
+
+#endif /* __EXYNOS_DRM_DSI__ */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi_pltfm.c b/drivers/gpu/drm/exynos/exynos_drm_dsi_pltfm.c
new file mode 100644
index 000000000000..8d8c3a652773
--- /dev/null
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi_pltfm.c
@@ -0,0 +1,307 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Samsung SoC MIPI DSI Master driver.
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd
+ *
+ * Contacts: Tomasz Figa <t.figa@samsung.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/component.h>
+#include <linux/gpio/consumer.h>
+#include <linux/irq.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/of_graph.h>
+#include <linux/phy/phy.h>
+#include <linux/regulator/consumer.h>
+
+#include <asm/unaligned.h>
+
+#include <video/mipi_display.h>
+#include <video/videomode.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_print.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_simple_kms_helper.h>
+
+#include "exynos_drm_crtc.h"
+#include "exynos_drm_drv.h"
+
+#include "exynos_drm_dsi.h"
+
+enum {
+ DSI_PORT_IN,
+ DSI_PORT_OUT
+};
+
+struct exynos_dsi_pltfm {
+ struct exynos_dsi *dsi;
+ struct drm_encoder encoder;
+};
+
+static const unsigned int reg_values[] = {
+ [RESET_TYPE] = DSIM_SWRST,
+ [PLL_TIMER] = 500,
+ [STOP_STATE_CNT] = 0xf,
+ [PHYCTRL_ULPS_EXIT] = 0x0af,
+ [PHYCTRL_VREG_LP] = 0,
+ [PHYCTRL_SLEW_UP] = 0,
+ [PHYTIMING_LPX] = 0x06,
+ [PHYTIMING_HS_EXIT] = 0x0b,
+ [PHYTIMING_CLK_PREPARE] = 0x07,
+ [PHYTIMING_CLK_ZERO] = 0x27,
+ [PHYTIMING_CLK_POST] = 0x0d,
+ [PHYTIMING_CLK_TRAIL] = 0x08,
+ [PHYTIMING_HS_PREPARE] = 0x09,
+ [PHYTIMING_HS_ZERO] = 0x0d,
+ [PHYTIMING_HS_TRAIL] = 0x0b,
+};
+
+static const unsigned int exynos5422_reg_values[] = {
+ [RESET_TYPE] = DSIM_SWRST,
+ [PLL_TIMER] = 500,
+ [STOP_STATE_CNT] = 0xf,
+ [PHYCTRL_ULPS_EXIT] = 0xaf,
+ [PHYCTRL_VREG_LP] = 0,
+ [PHYCTRL_SLEW_UP] = 0,
+ [PHYTIMING_LPX] = 0x08,
+ [PHYTIMING_HS_EXIT] = 0x0d,
+ [PHYTIMING_CLK_PREPARE] = 0x09,
+ [PHYTIMING_CLK_ZERO] = 0x30,
+ [PHYTIMING_CLK_POST] = 0x0e,
+ [PHYTIMING_CLK_TRAIL] = 0x0a,
+ [PHYTIMING_HS_PREPARE] = 0x0c,
+ [PHYTIMING_HS_ZERO] = 0x11,
+ [PHYTIMING_HS_TRAIL] = 0x0d,
+};
+
+static const unsigned int exynos5433_reg_values[] = {
+ [RESET_TYPE] = DSIM_FUNCRST,
+ [PLL_TIMER] = 22200,
+ [STOP_STATE_CNT] = 0xa,
+ [PHYCTRL_ULPS_EXIT] = 0x190,
+ [PHYCTRL_VREG_LP] = 1,
+ [PHYCTRL_SLEW_UP] = 1,
+ [PHYTIMING_LPX] = 0x07,
+ [PHYTIMING_HS_EXIT] = 0x0c,
+ [PHYTIMING_CLK_PREPARE] = 0x09,
+ [PHYTIMING_CLK_ZERO] = 0x2d,
+ [PHYTIMING_CLK_POST] = 0x0e,
+ [PHYTIMING_CLK_TRAIL] = 0x09,
+ [PHYTIMING_HS_PREPARE] = 0x0b,
+ [PHYTIMING_HS_ZERO] = 0x10,
+ [PHYTIMING_HS_TRAIL] = 0x0c,
+};
+
+static void exynos_dsi_te_handler(struct drm_encoder *encoder)
+{
+ exynos_drm_crtc_te_handler(encoder->crtc);
+}
+
+static void exynos_dsi_set_command_mode(struct drm_encoder *encoder,
+ bool enable)
+{
+ struct drm_device *drm = encoder->dev;
+ struct exynos_drm_crtc *crtc;
+
+ crtc = exynos_drm_crtc_get_by_type(drm, EXYNOS_DISPLAY_TYPE_LCD);
+ if (IS_ERR(crtc))
+ return;
+
+ crtc->i80_mode = enable;
+}
+
+static const struct exynos_dsi_driver_data exynos3_dsi_driver_data = {
+ .reg_ofs = EXYNOS_REG_OFS,
+ .plltmr_reg = 0x50,
+ .has_freqband = 1,
+ .has_clklane_stop = 1,
+ .num_clks = 2,
+ .max_freq = 1000,
+ .wait_for_reset = 1,
+ .num_bits_resol = 11,
+ .reg_values = reg_values,
+ .te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
+};
+
+static const struct exynos_dsi_driver_data exynos4_dsi_driver_data = {
+ .reg_ofs = EXYNOS_REG_OFS,
+ .plltmr_reg = 0x50,
+ .has_freqband = 1,
+ .has_clklane_stop = 1,
+ .num_clks = 2,
+ .max_freq = 1000,
+ .wait_for_reset = 1,
+ .num_bits_resol = 11,
+ .reg_values = reg_values,
+ .te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
+};
+
+static const struct exynos_dsi_driver_data exynos5_dsi_driver_data = {
+ .reg_ofs = EXYNOS_REG_OFS,
+ .plltmr_reg = 0x58,
+ .num_clks = 2,
+ .max_freq = 1000,
+ .wait_for_reset = 1,
+ .num_bits_resol = 11,
+ .reg_values = reg_values,
+ .te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
+};
+
+static const struct exynos_dsi_driver_data exynos5433_dsi_driver_data = {
+ .reg_ofs = EXYNOS5433_REG_OFS,
+ .plltmr_reg = 0xa0,
+ .has_clklane_stop = 1,
+ .num_clks = 5,
+ .max_freq = 1500,
+ .wait_for_reset = 0,
+ .num_bits_resol = 12,
+ .reg_values = exynos5433_reg_values,
+ .te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
+};
+
+static const struct exynos_dsi_driver_data exynos5422_dsi_driver_data = {
+ .reg_ofs = EXYNOS5433_REG_OFS,
+ .plltmr_reg = 0xa0,
+ .has_clklane_stop = 1,
+ .num_clks = 2,
+ .max_freq = 1500,
+ .wait_for_reset = 1,
+ .num_bits_resol = 12,
+ .reg_values = exynos5422_reg_values,
+ .te_handler = exynos_dsi_te_handler,
+ .set_command_node = exynos_dsi_set_command_mode,
+};
+
+static const struct of_device_id exynos_dsi_of_match[] = {
+ { .compatible = "samsung,exynos3250-mipi-dsi",
+ .data = &exynos3_dsi_driver_data },
+ { .compatible = "samsung,exynos4210-mipi-dsi",
+ .data = &exynos4_dsi_driver_data },
+ { .compatible = "samsung,exynos5410-mipi-dsi",
+ .data = &exynos5_dsi_driver_data },
+ { .compatible = "samsung,exynos5422-mipi-dsi",
+ .data = &exynos5422_dsi_driver_data },
+ { .compatible = "samsung,exynos5433-mipi-dsi",
+ .data = &exynos5433_dsi_driver_data },
+ { }
+};
+
+static int exynos_dsi_pltfm_bind(struct device *dev, struct device *master, void *data)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct exynos_dsi_pltfm *dsi = platform_get_drvdata(pdev);
+ struct drm_encoder *encoder = &dsi->encoder;
+ struct drm_device *drm_dev = data;
+ struct drm_bridge *in_bridge;
+ struct device_node *in_bridge_node;
+ struct device_node *node = dev->of_node;
+ int ret;
+
+ drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_TMDS);
+
+ ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);
+ if (ret < 0)
+ return ret;
+
+ in_bridge_node = of_graph_get_remote_node(node, DSI_PORT_IN, 0);
+ if (in_bridge_node) {
+ in_bridge = of_drm_find_bridge(in_bridge_node);
+ if (in_bridge)
+ drm_bridge_attach(encoder, in_bridge, NULL, 0);
+ of_node_put(in_bridge_node);
+ }
+
+ dsi->dsi = exynos_dsi_bind(pdev, encoder);
+ if (IS_ERR(dsi->dsi))
+ return PTR_ERR(dsi->dsi);
+
+ return 0;
+}
+
+static void exynos_dsi_pltfm_unbind(struct device *dev, struct device *master,
+ void *data)
+{
+ struct exynos_dsi_pltfm *dsi = dev_get_drvdata(dev);
+
+ exynos_dsi_unbind(dsi->dsi);
+}
+
+static const struct component_ops exynos_dsi_component_ops = {
+ .bind = exynos_dsi_pltfm_bind,
+ .unbind = exynos_dsi_pltfm_unbind,
+};
+
+static int exynos_dsi_pltfm_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct exynos_dsi_pltfm *dsi;
+ unsigned int ret;
+
+ dsi = devm_kzalloc(&pdev->dev, sizeof(*dsi), GFP_KERNEL);
+ if (!dsi)
+ return -ENOMEM;
+ platform_set_drvdata(pdev, dsi);
+
+ ret = component_add(dev, &exynos_dsi_component_ops);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int exynos_dsi_pltfm_remove(struct platform_device *pdev)
+{
+ component_del(&pdev->dev, &exynos_dsi_component_ops);
+
+ return 0;
+}
+
+static int exynos_dsi_pltfm_suspend(struct device *dev)
+{
+ struct exynos_dsi_pltfm *dsi = dev_get_drvdata(dev);
+
+ return exynos_dsi_suspend(dsi->dsi);
+}
+
+static int exynos_dsi_pltfm_resume(struct device *dev)
+{
+ struct exynos_dsi_pltfm *dsi = dev_get_drvdata(dev);
+
+ return exynos_dsi_resume(dsi->dsi);
+}
+
+static const struct dev_pm_ops exynos_dsi_pm_ops = {
+ SET_RUNTIME_PM_OPS(exynos_dsi_pltfm_suspend,
+ exynos_dsi_pltfm_resume, NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+ pm_runtime_force_resume)
+};
+
+struct platform_driver dsi_driver = {
+ .probe = exynos_dsi_pltfm_probe,
+ .remove = exynos_dsi_pltfm_remove,
+ .driver = {
+ .name = "exynos-dsi",
+ .owner = THIS_MODULE,
+ .pm = &exynos_dsi_pm_ops,
+ .of_match_table = exynos_dsi_of_match,
+ },
+};
+
+MODULE_AUTHOR("Tomasz Figa <t.figa@samsung.com>");
+MODULE_AUTHOR("Andrzej Hajda <a.hajda@samsung.com>");
+MODULE_DESCRIPTION("Samsung SoC MIPI DSI Master");
+MODULE_LICENSE("GPL v2");
--
2.20.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 00/16] drm/exynos: Convert driver to drm bridge
2020-09-03 16:57 [PATCH 00/16] drm/exynos: Convert driver to drm bridge Michael Tretter
` (14 preceding siblings ...)
2020-09-03 16:57 ` [PATCH 15/16] drm/exynos: split out platform specific code Michael Tretter
@ 2020-09-03 20:08 ` Krzysztof Kozlowski
2020-09-04 8:31 ` Marek Szyprowski
15 siblings, 1 reply; 22+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-03 20:08 UTC (permalink / raw)
To: Michael Tretter, Marek Szyprowski,
Bartłomiej Żołnierkiewicz, Sylwester Nawrocki,
Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim
Cc: dri-devel, linux-samsung-soc@vger.kernel.org, kernel,
Laurent.pinchart, narmstrong
On Thu, 3 Sep 2020 at 18:57, Michael Tretter <m.tretter@pengutronix.de> wrote:
>
> Hello,
>
> the Exynos MIPI DSI Phy is also found on the i.MX8M Mini. However, on the
> i.MX8M Mini, the bridge is driven by an LCDIF display controller instead of
> the Exynos Decon. The driver for the LCDIF does not use the component
> framework, but uses drm bridges.
>
> This series converts the Exynos MIPI DSI into a drm bridge and makes it usable
> with such drivers. Although the driver is converted, it still supports the
> component framework API to stay compliant with the Exynos DRM driver.
>
> Unfortunately, I don't have any Exynos SoC to actually test the series. I
> tested the driver with a few additional unfinished patches on the i.MX8M Mini
> EVK, but somebody should definitely verify that the driver is still working on
> Exynos hardware.
Hi Michael,
+Cc maintainers and folks in Samsung.
Please follow the script/get_maintainers.pl to get the list of
maintainers of the Exynos DRM drivers. First they could provide you
with testing, second they might be the people merging the driver.
Unfortunately I cannot provide proper testing as none of my boards
have a display attached. :)
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 00/16] drm/exynos: Convert driver to drm bridge
2020-09-03 20:08 ` [PATCH 00/16] drm/exynos: Convert driver to drm bridge Krzysztof Kozlowski
@ 2020-09-04 8:31 ` Marek Szyprowski
2020-09-04 12:20 ` Michael Tretter
0 siblings, 1 reply; 22+ messages in thread
From: Marek Szyprowski @ 2020-09-04 8:31 UTC (permalink / raw)
To: Krzysztof Kozlowski, Michael Tretter,
Bartłomiej Żołnierkiewicz, Sylwester Nawrocki,
Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim
Cc: dri-devel, linux-samsung-soc@vger.kernel.org, kernel,
Laurent.pinchart, narmstrong
Hi Krzysztof,
On 03.09.2020 22:08, Krzysztof Kozlowski wrote:
> On Thu, 3 Sep 2020 at 18:57, Michael Tretter <m.tretter@pengutronix.de> wrote:
>> the Exynos MIPI DSI Phy is also found on the i.MX8M Mini. However, on the
>> i.MX8M Mini, the bridge is driven by an LCDIF display controller instead of
>> the Exynos Decon. The driver for the LCDIF does not use the component
>> framework, but uses drm bridges.
>>
>> This series converts the Exynos MIPI DSI into a drm bridge and makes it usable
>> with such drivers. Although the driver is converted, it still supports the
>> component framework API to stay compliant with the Exynos DRM driver.
>>
>> Unfortunately, I don't have any Exynos SoC to actually test the series. I
>> tested the driver with a few additional unfinished patches on the i.MX8M Mini
>> EVK, but somebody should definitely verify that the driver is still working on
>> Exynos hardware.
> Hi Michael,
>
> +Cc maintainers and folks in Samsung.
>
> Please follow the script/get_maintainers.pl to get the list of
> maintainers of the Exynos DRM drivers. First they could provide you
> with testing, second they might be the people merging the driver.
>
> Unfortunately I cannot provide proper testing as none of my boards
> have a display attached. :)
Thanks for adding cc to me. Sadly this patchset crashed badly on Samsung
Exnyos based boards. Here is the log from Exynos3250-based Rinato:
exynos4-fb 11c00000.fimd: Adding to iommu group 0
OF: graph: no port node found in /soc/fimd@11c00000
[drm] Exynos DRM: using 11c00000.fimd device for DMA mapping operations
exynos-drm exynos-drm: bound 11c00000.fimd (ops fimd_component_ops)
OF: graph: no port node found in /soc/dsi@11c80000
8<--- cut here ---
Unable to handle kernel NULL pointer dereference at virtual address 00000650
pgd = (ptrval)
[00000650] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 1 PID: 1 Comm: swapper/0 Not tainted
5.9.0-rc2-next-20200824-00017-g3e9b20f7eb0d #1576
Hardware name: Samsung Exynos (Flattened Device Tree)
PC is at samsung_dsim_resume+0x18/0x120
LR is at genpd_runtime_resume+0x160/0x278
...
[<c064f590>] (samsung_dsim_resume) from [<c0685020>]
(genpd_runtime_resume+0x160/0x278)
[<c0685020>] (genpd_runtime_resume) from [<c0677e84>]
(__rpm_callback+0xbc/0x124)
[<c0677e84>] (__rpm_callback) from [<c0677f0c>] (rpm_callback+0x20/0x80)
[<c0677f0c>] (rpm_callback) from [<c0676aec>] (rpm_resume+0x388/0x714)
[<c0676aec>] (rpm_resume) from [<c0676edc>] (__pm_runtime_resume+0x64/0x9c)
[<c0676edc>] (__pm_runtime_resume) from [<c0669e10>]
(__device_attach+0xcc/0x17c)
[<c0669e10>] (__device_attach) from [<c0668ee8>]
(bus_probe_device+0x88/0x90)
[<c0668ee8>] (bus_probe_device) from [<c06660a0>] (device_add+0x4e8/0x79c)
[<c06660a0>] (device_add) from [<c063dc1c>]
(mipi_dsi_device_register_full+0xc8/0x148)
[<c063dc1c>] (mipi_dsi_device_register_full) from [<c063dcec>]
(mipi_dsi_host_register+0x50/0x168)
[<c063dcec>] (mipi_dsi_host_register) from [<c064d90c>]
(samsung_dsim_bind+0x368/0x40c)
[<c064d90c>] (samsung_dsim_bind) from [<c06449f8>]
(exynos_dsi_bind+0x78/0x88)
[<c06449f8>] (exynos_dsi_bind) from [<c0661ef0>]
(component_bind_all+0xfc/0x290)
[<c0661ef0>] (component_bind_all) from [<c06413d0>]
(exynos_drm_bind+0xe4/0x19c)
[<c06413d0>] (exynos_drm_bind) from [<c0662464>]
(try_to_bring_up_master+0x1e4/0x2c4)
[<c0662464>] (try_to_bring_up_master) from [<c06629a4>]
(component_master_add_with_match+0xd4/0x108)
[<c06629a4>] (component_master_add_with_match) from [<c06410f8>]
(exynos_drm_platform_probe+0xe4/0x110)
[<c06410f8>] (exynos_drm_platform_probe) from [<c066cb8c>]
(platform_drv_probe+0x6c/0xa4)
[<c066cb8c>] (platform_drv_probe) from [<c066a0c8>]
(really_probe+0x200/0x4fc)
[<c066a0c8>] (really_probe) from [<c066a58c>]
(driver_probe_device+0x78/0x1fc)
[<c066a58c>] (driver_probe_device) from [<c066a974>]
(device_driver_attach+0x58/0x60)
[<c066a974>] (device_driver_attach) from [<c066aa58>]
(__driver_attach+0xdc/0x174)
[<c066aa58>] (__driver_attach) from [<c0667e50>]
(bus_for_each_dev+0x68/0xb4)
[<c0667e50>] (bus_for_each_dev) from [<c0669184>]
(bus_add_driver+0x158/0x214)
[<c0669184>] (bus_add_driver) from [<c066b93c>] (driver_register+0x78/0x110)
[<c066b93c>] (driver_register) from [<c06412b8>]
(exynos_drm_init+0xe4/0x118)
[<c06412b8>] (exynos_drm_init) from [<c01023f4>]
(do_one_initcall+0x8c/0x424)
[<c01023f4>] (do_one_initcall) from [<c10011a8>]
(kernel_init_freeable+0x190/0x1dc)
[<c10011a8>] (kernel_init_freeable) from [<c0ae8e5c>]
(kernel_init+0x8/0x118)
[<c0ae8e5c>] (kernel_init) from [<c0100114>] (ret_from_fork+0x14/0x20)
Exception stack(0xd94a5fb0 to 0xd94a5ff8)
...
---[ end trace 1a053145d15f23dc ]---
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
CPU0: stopping
CPU: 0 PID: 0 Comm: swapper/0 Tainted: G D
5.9.0-rc2-next-20200824-00017-g3e9b20f7eb0d #1576
Hardware name: Samsung Exynos (Flattened Device Tree)
[<c011160c>] (unwind_backtrace) from [<c010cfc0>] (show_stack+0x10/0x14)
[<c010cfc0>] (show_stack) from [<c0533c3c>] (dump_stack+0xbc/0xe8)
[<c0533c3c>] (dump_stack) from [<c01104e0>] (handle_IPI+0x3e0/0x428)
[<c01104e0>] (handle_IPI) from [<c05511dc>] (gic_handle_irq+0x98/0x9c)
[<c05511dc>] (gic_handle_irq) from [<c0100af0>] (__irq_svc+0x70/0xb0)
Exception stack(0xc1101f08 to 0xc1101f50)
...
[<c0100af0>] (__irq_svc) from [<c01095dc>] (arch_cpu_idle+0x24/0x44)
[<c01095dc>] (arch_cpu_idle) from [<c01635dc>] (do_idle+0x1bc/0x2bc)
[<c01635dc>] (do_idle) from [<c0163a90>] (cpu_startup_entry+0x18/0x1c)
[<c0163a90>] (cpu_startup_entry) from [<c1000f88>]
(start_kernel+0x628/0x664)
[<c1000f88>] (start_kernel) from [<00000000>] (0x0)
---[ end Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b ]---
I've didn't check the code yet, but the conversion also lacks "select
DRM_SAMSUNG_DSIM" in the Exynos DSI driver's Kconfig, as I wasn't even
able to compile it with the current exynos_defconfig.
I've tested it on top of next-20200824, because it doesn't apply
on current linux-next.
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 00/16] drm/exynos: Convert driver to drm bridge
2020-09-04 8:31 ` Marek Szyprowski
@ 2020-09-04 12:20 ` Michael Tretter
0 siblings, 0 replies; 22+ messages in thread
From: Michael Tretter @ 2020-09-04 12:20 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Krzysztof Kozlowski, Bartłomiej Żołnierkiewicz,
Sylwester Nawrocki, Andrzej Hajda, Inki Dae, Joonyoung Shim,
Seung-Woo Kim, dri-devel, linux-samsung-soc@vger.kernel.org,
kernel, Laurent.pinchart, narmstrong
Hi Marek,
On Fri, 04 Sep 2020 10:31:12 +0200, Marek Szyprowski wrote:
> Hi Krzysztof,
>
> On 03.09.2020 22:08, Krzysztof Kozlowski wrote:
> > On Thu, 3 Sep 2020 at 18:57, Michael Tretter <m.tretter@pengutronix.de> wrote:
> >> the Exynos MIPI DSI Phy is also found on the i.MX8M Mini. However, on the
> >> i.MX8M Mini, the bridge is driven by an LCDIF display controller instead of
> >> the Exynos Decon. The driver for the LCDIF does not use the component
> >> framework, but uses drm bridges.
> >>
> >> This series converts the Exynos MIPI DSI into a drm bridge and makes it usable
> >> with such drivers. Although the driver is converted, it still supports the
> >> component framework API to stay compliant with the Exynos DRM driver.
> >>
> >> Unfortunately, I don't have any Exynos SoC to actually test the series. I
> >> tested the driver with a few additional unfinished patches on the i.MX8M Mini
> >> EVK, but somebody should definitely verify that the driver is still working on
> >> Exynos hardware.
> > Hi Michael,
> >
> > +Cc maintainers and folks in Samsung.
> >
> > Please follow the script/get_maintainers.pl to get the list of
> > maintainers of the Exynos DRM drivers. First they could provide you
> > with testing, second they might be the people merging the driver.
> >
> > Unfortunately I cannot provide proper testing as none of my boards
> > have a display attached. :)
>
> Thanks for adding cc to me. Sadly this patchset crashed badly on Samsung
> Exnyos based boards. Here is the log from Exynos3250-based Rinato:
Thanks for testing.
>
> exynos4-fb 11c00000.fimd: Adding to iommu group 0
> OF: graph: no port node found in /soc/fimd@11c00000
> [drm] Exynos DRM: using 11c00000.fimd device for DMA mapping operations
> exynos-drm exynos-drm: bound 11c00000.fimd (ops fimd_component_ops)
> OF: graph: no port node found in /soc/dsi@11c80000
> 8<--- cut here ---
> Unable to handle kernel NULL pointer dereference at virtual address 00000650
> pgd = (ptrval)
> [00000650] *pgd=00000000
> Internal error: Oops: 5 [#1] PREEMPT SMP ARM
> Modules linked in:
> CPU: 1 PID: 1 Comm: swapper/0 Not tainted
> 5.9.0-rc2-next-20200824-00017-g3e9b20f7eb0d #1576
> Hardware name: Samsung Exynos (Flattened Device Tree)
> PC is at samsung_dsim_resume+0x18/0x120
> LR is at genpd_runtime_resume+0x160/0x278
> ...
> [<c064f590>] (samsung_dsim_resume) from [<c0685020>]
> (genpd_runtime_resume+0x160/0x278)
> [<c0685020>] (genpd_runtime_resume) from [<c0677e84>]
> (__rpm_callback+0xbc/0x124)
> [<c0677e84>] (__rpm_callback) from [<c0677f0c>] (rpm_callback+0x20/0x80)
> [<c0677f0c>] (rpm_callback) from [<c0676aec>] (rpm_resume+0x388/0x714)
> [<c0676aec>] (rpm_resume) from [<c0676edc>] (__pm_runtime_resume+0x64/0x9c)
> [<c0676edc>] (__pm_runtime_resume) from [<c0669e10>]
> (__device_attach+0xcc/0x17c)
> [<c0669e10>] (__device_attach) from [<c0668ee8>]
> (bus_probe_device+0x88/0x90)
> [<c0668ee8>] (bus_probe_device) from [<c06660a0>] (device_add+0x4e8/0x79c)
> [<c06660a0>] (device_add) from [<c063dc1c>]
> (mipi_dsi_device_register_full+0xc8/0x148)
> [<c063dc1c>] (mipi_dsi_device_register_full) from [<c063dcec>]
> (mipi_dsi_host_register+0x50/0x168)
> [<c063dcec>] (mipi_dsi_host_register) from [<c064d90c>]
> (samsung_dsim_bind+0x368/0x40c)
> [<c064d90c>] (samsung_dsim_bind) from [<c06449f8>]
> (exynos_dsi_bind+0x78/0x88)
> [<c06449f8>] (exynos_dsi_bind) from [<c0661ef0>]
> (component_bind_all+0xfc/0x290)
> [<c0661ef0>] (component_bind_all) from [<c06413d0>]
> (exynos_drm_bind+0xe4/0x19c)
> [<c06413d0>] (exynos_drm_bind) from [<c0662464>]
> (try_to_bring_up_master+0x1e4/0x2c4)
> [<c0662464>] (try_to_bring_up_master) from [<c06629a4>]
> (component_master_add_with_match+0xd4/0x108)
> [<c06629a4>] (component_master_add_with_match) from [<c06410f8>]
> (exynos_drm_platform_probe+0xe4/0x110)
> [<c06410f8>] (exynos_drm_platform_probe) from [<c066cb8c>]
> (platform_drv_probe+0x6c/0xa4)
> [<c066cb8c>] (platform_drv_probe) from [<c066a0c8>]
> (really_probe+0x200/0x4fc)
> [<c066a0c8>] (really_probe) from [<c066a58c>]
> (driver_probe_device+0x78/0x1fc)
> [<c066a58c>] (driver_probe_device) from [<c066a974>]
> (device_driver_attach+0x58/0x60)
> [<c066a974>] (device_driver_attach) from [<c066aa58>]
> (__driver_attach+0xdc/0x174)
> [<c066aa58>] (__driver_attach) from [<c0667e50>]
> (bus_for_each_dev+0x68/0xb4)
> [<c0667e50>] (bus_for_each_dev) from [<c0669184>]
> (bus_add_driver+0x158/0x214)
> [<c0669184>] (bus_add_driver) from [<c066b93c>] (driver_register+0x78/0x110)
> [<c066b93c>] (driver_register) from [<c06412b8>]
> (exynos_drm_init+0xe4/0x118)
> [<c06412b8>] (exynos_drm_init) from [<c01023f4>]
> (do_one_initcall+0x8c/0x424)
> [<c01023f4>] (do_one_initcall) from [<c10011a8>]
> (kernel_init_freeable+0x190/0x1dc)
> [<c10011a8>] (kernel_init_freeable) from [<c0ae8e5c>]
> (kernel_init+0x8/0x118)
> [<c0ae8e5c>] (kernel_init) from [<c0100114>] (ret_from_fork+0x14/0x20)
> Exception stack(0xd94a5fb0 to 0xd94a5ff8)
> ...
> ---[ end trace 1a053145d15f23dc ]---
> Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
> CPU0: stopping
> CPU: 0 PID: 0 Comm: swapper/0 Tainted: G D
> 5.9.0-rc2-next-20200824-00017-g3e9b20f7eb0d #1576
> Hardware name: Samsung Exynos (Flattened Device Tree)
> [<c011160c>] (unwind_backtrace) from [<c010cfc0>] (show_stack+0x10/0x14)
> [<c010cfc0>] (show_stack) from [<c0533c3c>] (dump_stack+0xbc/0xe8)
> [<c0533c3c>] (dump_stack) from [<c01104e0>] (handle_IPI+0x3e0/0x428)
> [<c01104e0>] (handle_IPI) from [<c05511dc>] (gic_handle_irq+0x98/0x9c)
> [<c05511dc>] (gic_handle_irq) from [<c0100af0>] (__irq_svc+0x70/0xb0)
> Exception stack(0xc1101f08 to 0xc1101f50)
> ...
> [<c0100af0>] (__irq_svc) from [<c01095dc>] (arch_cpu_idle+0x24/0x44)
> [<c01095dc>] (arch_cpu_idle) from [<c01635dc>] (do_idle+0x1bc/0x2bc)
> [<c01635dc>] (do_idle) from [<c0163a90>] (cpu_startup_entry+0x18/0x1c)
> [<c0163a90>] (cpu_startup_entry) from [<c1000f88>]
> (start_kernel+0x628/0x664)
> [<c1000f88>] (start_kernel) from [<00000000>] (0x0)
> ---[ end Kernel panic - not syncing: Attempted to kill init!
> exitcode=0x0000000b ]---
This and the other null pointer dereference look like two different problems.
I will look into both of them and send an update.
I will also try to come up with something to at least test the bind/unbind
interface and reduce the code that I cannot test.
>
> I've didn't check the code yet, but the conversion also lacks "select
> DRM_SAMSUNG_DSIM" in the Exynos DSI driver's Kconfig, as I wasn't even
> able to compile it with the current exynos_defconfig.
Dang, of course. I will fix it.
Michael
^ permalink raw reply [flat|nested] 22+ messages in thread