* [PATCH v4 00/12] drm: bridge: Add Samsung MIPI DSIM bridge @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki This series supports common bridge support for Samsung MIPI DSIM which is used in Exynos and i.MX8MM SoC's. Previous v2 can be available here [1]. The final bridge supports both the Exynos and i.MX8MM DSI devices. On, summary this patch-set break the entire DSIM driver into - platform specific glue code for platform ops, component_ops. - common bridge driver which handle platform glue init and invoke. Changes for v3: * fix the mult-arch build * fix dsi host init * updated commit messages Changes for v2: * fix bridge handling * fix dsi host init * correct the commit messages Patch 0001: Restore proper bridge chain in exynos_dsi Patch 0002: Samsung DSIM bridge Patch 0003: Common lookup code for OF-graph or child Patch 0004: plat_data quirk flag via driver_data Patch 0005/10: bridge fixes, atomic API's Patch 0011: document fsl,imx8mm-mipi-dsim Patch 0012: add i.MX8MM DSIM support Tested in Engicam i.Core MX8M Mini SoM. Anyone interested, please have a look on this repo [2] and boot log [3]. [3] https://gist.github.com/openedev/22b2d63b30ade0ba55ab414a2f47aaf0 [2] https://github.com/openedev/kernel/tree/imx8mm-dsi-v4 [1] https://patchwork.kernel.org/project/dri-devel/cover/20220720155210.365977-1-jagan@amarulasolutions.com/ Any inputs? Jagan. Jagan Teki (11): drm: bridge: Add Samsung DSIM bridge driver drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices drm: bridge: samsung-dsim: Handle platform init via driver_data drm: bridge: samsung-dsim: Mark PHY as optional drm: bridge: samsung-dsim: Handle proper DSI host initialization drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset drm: bridge: samsung-dsim: Add atomic_check drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts drm: bridge: samsung-dsim: Add input_bus_flags dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support drm: bridge: samsung-dsim: Add i.MX8MM support Marek Szyprowski (1): drm: exynos: dsi: Restore proper bridge chain order .../bindings/display/exynos/exynos_dsim.txt | 1 + MAINTAINERS | 9 + drivers/gpu/drm/bridge/Kconfig | 12 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/samsung-dsim.c | 1833 +++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1717 +-------------- include/drm/bridge/samsung-dsim.h | 107 + 10 files changed, 2027 insertions(+), 1658 deletions(-) create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c create mode 100644 include/drm/bridge/samsung-dsim.h -- 2.25.1 ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v4 00/12] drm: bridge: Add Samsung MIPI DSIM bridge @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki This series supports common bridge support for Samsung MIPI DSIM which is used in Exynos and i.MX8MM SoC's. Previous v2 can be available here [1]. The final bridge supports both the Exynos and i.MX8MM DSI devices. On, summary this patch-set break the entire DSIM driver into - platform specific glue code for platform ops, component_ops. - common bridge driver which handle platform glue init and invoke. Changes for v3: * fix the mult-arch build * fix dsi host init * updated commit messages Changes for v2: * fix bridge handling * fix dsi host init * correct the commit messages Patch 0001: Restore proper bridge chain in exynos_dsi Patch 0002: Samsung DSIM bridge Patch 0003: Common lookup code for OF-graph or child Patch 0004: plat_data quirk flag via driver_data Patch 0005/10: bridge fixes, atomic API's Patch 0011: document fsl,imx8mm-mipi-dsim Patch 0012: add i.MX8MM DSIM support Tested in Engicam i.Core MX8M Mini SoM. Anyone interested, please have a look on this repo [2] and boot log [3]. [3] https://gist.github.com/openedev/22b2d63b30ade0ba55ab414a2f47aaf0 [2] https://github.com/openedev/kernel/tree/imx8mm-dsi-v4 [1] https://patchwork.kernel.org/project/dri-devel/cover/20220720155210.365977-1-jagan@amarulasolutions.com/ Any inputs? Jagan. Jagan Teki (11): drm: bridge: Add Samsung DSIM bridge driver drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices drm: bridge: samsung-dsim: Handle platform init via driver_data drm: bridge: samsung-dsim: Mark PHY as optional drm: bridge: samsung-dsim: Handle proper DSI host initialization drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset drm: bridge: samsung-dsim: Add atomic_check drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts drm: bridge: samsung-dsim: Add input_bus_flags dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support drm: bridge: samsung-dsim: Add i.MX8MM support Marek Szyprowski (1): drm: exynos: dsi: Restore proper bridge chain order .../bindings/display/exynos/exynos_dsim.txt | 1 + MAINTAINERS | 9 + drivers/gpu/drm/bridge/Kconfig | 12 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/samsung-dsim.c | 1833 +++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1717 +-------------- include/drm/bridge/samsung-dsim.h | 107 + 10 files changed, 2027 insertions(+), 1658 deletions(-) create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c create mode 100644 include/drm/bridge/samsung-dsim.h -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v4 00/12] drm: bridge: Add Samsung MIPI DSIM bridge @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki This series supports common bridge support for Samsung MIPI DSIM which is used in Exynos and i.MX8MM SoC's. Previous v2 can be available here [1]. The final bridge supports both the Exynos and i.MX8MM DSI devices. On, summary this patch-set break the entire DSIM driver into - platform specific glue code for platform ops, component_ops. - common bridge driver which handle platform glue init and invoke. Changes for v3: * fix the mult-arch build * fix dsi host init * updated commit messages Changes for v2: * fix bridge handling * fix dsi host init * correct the commit messages Patch 0001: Restore proper bridge chain in exynos_dsi Patch 0002: Samsung DSIM bridge Patch 0003: Common lookup code for OF-graph or child Patch 0004: plat_data quirk flag via driver_data Patch 0005/10: bridge fixes, atomic API's Patch 0011: document fsl,imx8mm-mipi-dsim Patch 0012: add i.MX8MM DSIM support Tested in Engicam i.Core MX8M Mini SoM. Anyone interested, please have a look on this repo [2] and boot log [3]. [3] https://gist.github.com/openedev/22b2d63b30ade0ba55ab414a2f47aaf0 [2] https://github.com/openedev/kernel/tree/imx8mm-dsi-v4 [1] https://patchwork.kernel.org/project/dri-devel/cover/20220720155210.365977-1-jagan@amarulasolutions.com/ Any inputs? Jagan. Jagan Teki (11): drm: bridge: Add Samsung DSIM bridge driver drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices drm: bridge: samsung-dsim: Handle platform init via driver_data drm: bridge: samsung-dsim: Mark PHY as optional drm: bridge: samsung-dsim: Handle proper DSI host initialization drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset drm: bridge: samsung-dsim: Add atomic_check drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts drm: bridge: samsung-dsim: Add input_bus_flags dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support drm: bridge: samsung-dsim: Add i.MX8MM support Marek Szyprowski (1): drm: exynos: dsi: Restore proper bridge chain order .../bindings/display/exynos/exynos_dsim.txt | 1 + MAINTAINERS | 9 + drivers/gpu/drm/bridge/Kconfig | 12 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/samsung-dsim.c | 1833 +++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1717 +-------------- include/drm/bridge/samsung-dsim.h | 107 + 10 files changed, 2027 insertions(+), 1658 deletions(-) create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c create mode 100644 include/drm/bridge/samsung-dsim.h -- 2.25.1 ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v4 01/12] drm: exynos: dsi: Restore proper bridge chain order 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki From: Marek Szyprowski <m.szyprowski@samsung.com> Restore the proper bridge chain by finding the previous bridge in the chain instead of passing NULL. This establishes a proper bridge chain while attaching downstream bridges. v4: * none v3: * new patch Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index ec673223d6b7..e5b1540c4ae4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1428,7 +1428,8 @@ static int exynos_dsi_attach(struct drm_bridge *bridge, { struct exynos_dsi *dsi = bridge_to_dsi(bridge); - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, NULL, flags); + return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, + flags); } static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = { @@ -1474,7 +1475,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, drm_bridge_add(&dsi->bridge); - drm_bridge_attach(encoder, &dsi->bridge, NULL, 0); + drm_bridge_attach(encoder, &dsi->bridge, + list_first_entry_or_null(&encoder->bridge_chain, + struct drm_bridge, + chain_node), 0); /* * This is a temporary solution and should be made by more generic way. -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 01/12] drm: exynos: dsi: Restore proper bridge chain order @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki From: Marek Szyprowski <m.szyprowski@samsung.com> Restore the proper bridge chain by finding the previous bridge in the chain instead of passing NULL. This establishes a proper bridge chain while attaching downstream bridges. v4: * none v3: * new patch Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index ec673223d6b7..e5b1540c4ae4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1428,7 +1428,8 @@ static int exynos_dsi_attach(struct drm_bridge *bridge, { struct exynos_dsi *dsi = bridge_to_dsi(bridge); - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, NULL, flags); + return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, + flags); } static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = { @@ -1474,7 +1475,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, drm_bridge_add(&dsi->bridge); - drm_bridge_attach(encoder, &dsi->bridge, NULL, 0); + drm_bridge_attach(encoder, &dsi->bridge, + list_first_entry_or_null(&encoder->bridge_chain, + struct drm_bridge, + chain_node), 0); /* * This is a temporary solution and should be made by more generic way. -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 01/12] drm: exynos: dsi: Restore proper bridge chain order @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki From: Marek Szyprowski <m.szyprowski@samsung.com> Restore the proper bridge chain by finding the previous bridge in the chain instead of passing NULL. This establishes a proper bridge chain while attaching downstream bridges. v4: * none v3: * new patch Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index ec673223d6b7..e5b1540c4ae4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1428,7 +1428,8 @@ static int exynos_dsi_attach(struct drm_bridge *bridge, { struct exynos_dsi *dsi = bridge_to_dsi(bridge); - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, NULL, flags); + return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, + flags); } static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = { @@ -1474,7 +1475,10 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, drm_bridge_add(&dsi->bridge); - drm_bridge_attach(encoder, &dsi->bridge, NULL, 0); + drm_bridge_attach(encoder, &dsi->bridge, + list_first_entry_or_null(&encoder->bridge_chain, + struct drm_bridge, + chain_node), 0); /* * This is a temporary solution and should be made by more generic way. -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-08-29 18:40 ` Jagan Teki ` (2 preceding siblings ...) (?) @ 2022-08-29 18:40 ` Jagan Teki 2022-09-02 10:47 ` Marek Szyprowski -1 siblings, 1 reply; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki Samsung MIPI DSIM controller is common DSI IP that can be used in various SoCs like Exynos, i.MX8M Mini/Nano. In order to access this DSI controller between various platform SoCs, the ideal way to incorporate this in the drm stack is via the drm bridge driver. This patch is trying to differentiate platform-specific and bridge driver code and keep maintaining the exynos_drm_dsi.c code as platform-specific glue code and samsung-dsim.c as a common bridge driver code. - Exynos specific glue code is exynos specific te_irq, host_attach, and detach code along with conventional component_ops. - Samsung DSIM is a bridge driver which is common across all platforms and the respective platform-specific glue will initialize at the end of the probe. The platform-specific operations and other glue calls will invoke on associate code areas. v4: * include Inki Dae in MAINTAINERS * remove dsi_driver probe in exynos_drm_drv to support multi-arch build v3: * restore gpio related fixes * restore proper bridge chain * rework initialization issue * fix header includes in proper way v2: * fixed exynos dsi driver conversion (Marek Szyprowski) * updated commit message * updated MAINTAINERS file v1: * don't maintain component_ops in bridge driver * don't maintain platform glue code in bridge driver * add platform-specific glue code and make a common bridge Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- MAINTAINERS | 9 + drivers/gpu/drm/bridge/Kconfig | 12 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- include/drm/bridge/samsung-dsim.h | 99 ++ 9 files changed, 1868 insertions(+), 1659 deletions(-) create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c create mode 100644 include/drm/bridge/samsung-dsim.h diff --git a/MAINTAINERS b/MAINTAINERS index 589517372408..301478f70b41 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6624,6 +6624,15 @@ T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml F: drivers/gpu/drm/panel/panel-samsung-db7430.c +DRM DRIVER FOR SAMSUNG MIPI DSIM BRIDGE +M: Jagan Teki <jagan@amarulasolutions.com> +M: Marek Szyprowski <m.szyprowski@samsung.com> +M: Inki Dae <inki.dae@samsung.com +S: Maintained +T: git git://anongit.freedesktop.org/drm/drm-misc +F: drivers/gpu/drm/bridge/samsung-dsim.c +F: include/drm/bridge/samsung-dsim.h + DRM DRIVER FOR SAMSUNG S6D27A1 PANELS M: Markuss Broks <markuss.broks@gmail.com> S: Maintained diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 57946d80b02d..8e85dac9f53e 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -231,6 +231,18 @@ config DRM_PARADE_PS8640 The PS8640 is a high-performance and low-power MIPI DSI to eDP converter +config DRM_SAMSUNG_DSIM + tristate "Samsung MIPI DSIM bridge driver" + depends on COMMON_CLK + depends on OF && HAS_IOMEM + select DRM_KMS_HELPER + select DRM_MIPI_DSI + select DRM_PANEL_BRIDGE + help + The Samsung MIPI DSIM bridge controller driver. + This MIPI DSIM bridge can be found it on Exynos SoCs and + NXP's i.MX8M Mini/Nano. + config DRM_SIL_SII8620 tristate "Silicon Image SII8620 HDMI/MHL bridge" depends on OF diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index 1884803c6860..dae843723991 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW) += megachips-stdpxxxx-ge-b850v obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o obj-$(CONFIG_DRM_PARADE_PS8640) += parade-ps8640.o +obj-$(CONFIG_DRM_SAMSUNG_DSIM) += samsung-dsim.o obj-$(CONFIG_DRM_SIL_SII8620) += sil-sii8620.o obj-$(CONFIG_DRM_SII902X) += sii902x.o obj-$(CONFIG_DRM_SII9234) += sii9234.o diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c new file mode 100644 index 000000000000..ab2fa0f42f40 --- /dev/null +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -0,0 +1,1686 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Samsung MIPI DSIM bridge driver. + * + * Copyright (C) 2021 Amarula Solutions(India) + * Copyright (c) 2014 Samsung Electronics Co., Ltd + * Author: Jagan Teki <jagan@amarulasolutions.com> + * + * Based on exynos_drm_dsi from + * Tomasz Figa <t.figa@samsung.com> + */ + +#include <asm/unaligned.h> + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/irq.h> +#include <linux/of_device.h> +#include <linux/phy/phy.h> + +#include <video/mipi_display.h> + +#include <drm/bridge/samsung-dsim.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> + +/* returns true iff both arguments logically differs */ +#define NEQV(a, b) (!(a) ^ !(b)) + +/* DSIM_STATUS */ +#define DSIM_STOP_STATE_DAT(x) (((x) & 0xf) << 0) +#define DSIM_STOP_STATE_CLK (1 << 8) +#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) + +/* DSIM_CLKCTRL */ +#define DSIM_ESC_PRESCALER(x) (((x) & 0xffff) << 0) +#define DSIM_ESC_PRESCALER_MASK (0xffff << 0) +#define DSIM_LANE_ESC_CLK_EN_CLK (1 << 19) +#define DSIM_LANE_ESC_CLK_EN_DATA(x) (((x) & 0xf) << 20) +#define DSIM_LANE_ESC_CLK_EN_DATA_MASK (0xf << 20) +#define DSIM_BYTE_CLKEN (1 << 24) +#define DSIM_BYTE_CLK_SRC(x) (((x) & 0x3) << 25) +#define DSIM_BYTE_CLK_SRC_MASK (0x3 << 25) +#define DSIM_PLL_BYPASS (1 << 27) +#define DSIM_ESC_CLKEN (1 << 28) +#define DSIM_TX_REQUEST_HSCLK (1 << 31) + +/* DSIM_CONFIG */ +#define DSIM_LANE_EN_CLK (1 << 0) +#define DSIM_LANE_EN(x) (((x) & 0xf) << 1) +#define DSIM_NUM_OF_DATA_LANE(x) (((x) & 0x3) << 5) +#define DSIM_SUB_PIX_FORMAT(x) (((x) & 0x7) << 8) +#define DSIM_MAIN_PIX_FORMAT_MASK (0x7 << 12) +#define DSIM_MAIN_PIX_FORMAT_RGB888 (0x7 << 12) +#define DSIM_MAIN_PIX_FORMAT_RGB666 (0x6 << 12) +#define DSIM_MAIN_PIX_FORMAT_RGB666_P (0x5 << 12) +#define DSIM_MAIN_PIX_FORMAT_RGB565 (0x4 << 12) +#define DSIM_SUB_VC (((x) & 0x3) << 16) +#define DSIM_MAIN_VC (((x) & 0x3) << 18) +#define DSIM_HSA_MODE (1 << 20) +#define DSIM_HBP_MODE (1 << 21) +#define DSIM_HFP_MODE (1 << 22) +#define DSIM_HSE_MODE (1 << 23) +#define DSIM_AUTO_MODE (1 << 24) +#define DSIM_VIDEO_MODE (1 << 25) +#define DSIM_BURST_MODE (1 << 26) +#define DSIM_SYNC_INFORM (1 << 27) +#define DSIM_EOT_DISABLE (1 << 28) +#define DSIM_MFLUSH_VS (1 << 29) +/* This flag is valid only for exynos3250/3472/5260/5430 */ +#define DSIM_CLKLANE_STOP (1 << 30) + +/* DSIM_ESCMODE */ +#define DSIM_TX_TRIGGER_RST (1 << 4) +#define DSIM_TX_LPDT_LP (1 << 6) +#define DSIM_CMD_LPDT_LP (1 << 7) +#define DSIM_FORCE_BTA (1 << 16) +#define DSIM_FORCE_STOP_STATE (1 << 20) +#define DSIM_STOP_STATE_CNT(x) (((x) & 0x7ff) << 21) +#define DSIM_STOP_STATE_CNT_MASK (0x7ff << 21) + +/* DSIM_MDRESOL */ +#define DSIM_MAIN_STAND_BY (1 << 31) +#define DSIM_MAIN_VRESOL(x, num_bits) (((x) & ((1 << (num_bits)) - 1)) << 16) +#define DSIM_MAIN_HRESOL(x, num_bits) (((x) & ((1 << (num_bits)) - 1)) << 0) + +/* DSIM_MVPORCH */ +#define DSIM_CMD_ALLOW(x) ((x) << 28) +#define DSIM_STABLE_VFP(x) ((x) << 16) +#define DSIM_MAIN_VBP(x) ((x) << 0) +#define DSIM_CMD_ALLOW_MASK (0xf << 28) +#define DSIM_STABLE_VFP_MASK (0x7ff << 16) +#define DSIM_MAIN_VBP_MASK (0x7ff << 0) + +/* DSIM_MHPORCH */ +#define DSIM_MAIN_HFP(x) ((x) << 16) +#define DSIM_MAIN_HBP(x) ((x) << 0) +#define DSIM_MAIN_HFP_MASK ((0xffff) << 16) +#define DSIM_MAIN_HBP_MASK ((0xffff) << 0) + +/* DSIM_MSYNC */ +#define DSIM_MAIN_VSA(x) ((x) << 22) +#define DSIM_MAIN_HSA(x) ((x) << 0) +#define DSIM_MAIN_VSA_MASK ((0x3ff) << 22) +#define DSIM_MAIN_HSA_MASK ((0xffff) << 0) + +/* DSIM_SDRESOL */ +#define DSIM_SUB_STANDY(x) ((x) << 31) +#define DSIM_SUB_VRESOL(x) ((x) << 16) +#define DSIM_SUB_HRESOL(x) ((x) << 0) +#define DSIM_SUB_STANDY_MASK ((0x1) << 31) +#define DSIM_SUB_VRESOL_MASK ((0x7ff) << 16) +#define DSIM_SUB_HRESOL_MASK ((0x7ff) << 0) + +/* DSIM_INTSRC */ +#define DSIM_INT_PLL_STABLE (1 << 31) +#define DSIM_INT_SW_RST_RELEASE (1 << 30) +#define DSIM_INT_SFR_FIFO_EMPTY (1 << 29) +#define DSIM_INT_SFR_HDR_FIFO_EMPTY (1 << 28) +#define DSIM_INT_BTA (1 << 25) +#define DSIM_INT_FRAME_DONE (1 << 24) +#define DSIM_INT_RX_TIMEOUT (1 << 21) +#define DSIM_INT_BTA_TIMEOUT (1 << 20) +#define DSIM_INT_RX_DONE (1 << 18) +#define DSIM_INT_RX_TE (1 << 17) +#define DSIM_INT_RX_ACK (1 << 16) +#define DSIM_INT_RX_ECC_ERR (1 << 15) +#define DSIM_INT_RX_CRC_ERR (1 << 14) + +/* DSIM_FIFOCTRL */ +#define DSIM_RX_DATA_FULL (1 << 25) +#define DSIM_RX_DATA_EMPTY (1 << 24) +#define DSIM_SFR_HEADER_FULL (1 << 23) +#define DSIM_SFR_HEADER_EMPTY (1 << 22) +#define DSIM_SFR_PAYLOAD_FULL (1 << 21) +#define DSIM_SFR_PAYLOAD_EMPTY (1 << 20) +#define DSIM_I80_HEADER_FULL (1 << 19) +#define DSIM_I80_HEADER_EMPTY (1 << 18) +#define DSIM_I80_PAYLOAD_FULL (1 << 17) +#define DSIM_I80_PAYLOAD_EMPTY (1 << 16) +#define DSIM_SD_HEADER_FULL (1 << 15) +#define DSIM_SD_HEADER_EMPTY (1 << 14) +#define DSIM_SD_PAYLOAD_FULL (1 << 13) +#define DSIM_SD_PAYLOAD_EMPTY (1 << 12) +#define DSIM_MD_HEADER_FULL (1 << 11) +#define DSIM_MD_HEADER_EMPTY (1 << 10) +#define DSIM_MD_PAYLOAD_FULL (1 << 9) +#define DSIM_MD_PAYLOAD_EMPTY (1 << 8) +#define DSIM_RX_FIFO (1 << 4) +#define DSIM_SFR_FIFO (1 << 3) +#define DSIM_I80_FIFO (1 << 2) +#define DSIM_SD_FIFO (1 << 1) +#define DSIM_MD_FIFO (1 << 0) + +/* DSIM_PHYACCHR */ +#define DSIM_AFC_EN (1 << 14) +#define DSIM_AFC_CTL(x) (((x) & 0x7) << 5) + +/* DSIM_PLLCTRL */ +#define DSIM_FREQ_BAND(x) ((x) << 24) +#define DSIM_PLL_EN (1 << 23) +#define DSIM_PLL_P(x) ((x) << 13) +#define DSIM_PLL_M(x) ((x) << 4) +#define DSIM_PLL_S(x) ((x) << 1) + +/* DSIM_PHYCTRL */ +#define DSIM_PHYCTRL_ULPS_EXIT(x) (((x) & 0x1ff) << 0) +#define DSIM_PHYCTRL_B_DPHYCTL_VREG_LP (1 << 30) +#define DSIM_PHYCTRL_B_DPHYCTL_SLEW_UP (1 << 14) + +/* DSIM_PHYTIMING */ +#define DSIM_PHYTIMING_LPX(x) ((x) << 8) +#define DSIM_PHYTIMING_HS_EXIT(x) ((x) << 0) + +/* DSIM_PHYTIMING1 */ +#define DSIM_PHYTIMING1_CLK_PREPARE(x) ((x) << 24) +#define DSIM_PHYTIMING1_CLK_ZERO(x) ((x) << 16) +#define DSIM_PHYTIMING1_CLK_POST(x) ((x) << 8) +#define DSIM_PHYTIMING1_CLK_TRAIL(x) ((x) << 0) + +/* DSIM_PHYTIMING2 */ +#define DSIM_PHYTIMING2_HS_PREPARE(x) ((x) << 16) +#define DSIM_PHYTIMING2_HS_ZERO(x) ((x) << 8) +#define DSIM_PHYTIMING2_HS_TRAIL(x) ((x) << 0) + +#define DSI_MAX_BUS_WIDTH 4 +#define DSI_NUM_VIRTUAL_CHANNELS 4 +#define DSI_TX_FIFO_SIZE 2048 +#define DSI_RX_FIFO_SIZE 256 +#define DSI_XFER_TIMEOUT_MS 100 +#define DSI_RX_FIFO_EMPTY 0x30800002 + +#define OLD_SCLK_MIPI_CLK_NAME "pll_clk" + +static const char *const clk_names[5] = { + "bus_clk", + "sclk_mipi", + "phyclk_mipidphy0_bitclkdiv8", + "phyclk_mipidphy0_rxclkesc0", + "sclk_rgb_vclk_to_dsim0" +}; + +enum samsung_dsim_transfer_type { + EXYNOS_DSI_TX, + EXYNOS_DSI_RX, +}; + +enum reg_idx { + DSIM_STATUS_REG, /* Status register */ + DSIM_SWRST_REG, /* Software reset register */ + DSIM_CLKCTRL_REG, /* Clock control register */ + DSIM_TIMEOUT_REG, /* Time out register */ + DSIM_CONFIG_REG, /* Configuration register */ + DSIM_ESCMODE_REG, /* Escape mode register */ + DSIM_MDRESOL_REG, + DSIM_MVPORCH_REG, /* Main display Vporch register */ + DSIM_MHPORCH_REG, /* Main display Hporch register */ + DSIM_MSYNC_REG, /* Main display sync area register */ + DSIM_INTSRC_REG, /* Interrupt source register */ + DSIM_INTMSK_REG, /* Interrupt mask register */ + DSIM_PKTHDR_REG, /* Packet Header FIFO register */ + DSIM_PAYLOAD_REG, /* Payload FIFO register */ + DSIM_RXFIFO_REG, /* Read FIFO register */ + DSIM_FIFOCTRL_REG, /* FIFO status and control register */ + DSIM_PLLCTRL_REG, /* PLL control register */ + DSIM_PHYCTRL_REG, + DSIM_PHYTIMING_REG, + DSIM_PHYTIMING1_REG, + DSIM_PHYTIMING2_REG, + NUM_REGS +}; + +static const unsigned int exynos_reg_ofs[] = { + [DSIM_STATUS_REG] = 0x00, + [DSIM_SWRST_REG] = 0x04, + [DSIM_CLKCTRL_REG] = 0x08, + [DSIM_TIMEOUT_REG] = 0x0c, + [DSIM_CONFIG_REG] = 0x10, + [DSIM_ESCMODE_REG] = 0x14, + [DSIM_MDRESOL_REG] = 0x18, + [DSIM_MVPORCH_REG] = 0x1c, + [DSIM_MHPORCH_REG] = 0x20, + [DSIM_MSYNC_REG] = 0x24, + [DSIM_INTSRC_REG] = 0x2c, + [DSIM_INTMSK_REG] = 0x30, + [DSIM_PKTHDR_REG] = 0x34, + [DSIM_PAYLOAD_REG] = 0x38, + [DSIM_RXFIFO_REG] = 0x3c, + [DSIM_FIFOCTRL_REG] = 0x44, + [DSIM_PLLCTRL_REG] = 0x4c, + [DSIM_PHYCTRL_REG] = 0x5c, + [DSIM_PHYTIMING_REG] = 0x64, + [DSIM_PHYTIMING1_REG] = 0x68, + [DSIM_PHYTIMING2_REG] = 0x6c, +}; + +static const unsigned int exynos5433_reg_ofs[] = { + [DSIM_STATUS_REG] = 0x04, + [DSIM_SWRST_REG] = 0x0C, + [DSIM_CLKCTRL_REG] = 0x10, + [DSIM_TIMEOUT_REG] = 0x14, + [DSIM_CONFIG_REG] = 0x18, + [DSIM_ESCMODE_REG] = 0x1C, + [DSIM_MDRESOL_REG] = 0x20, + [DSIM_MVPORCH_REG] = 0x24, + [DSIM_MHPORCH_REG] = 0x28, + [DSIM_MSYNC_REG] = 0x2C, + [DSIM_INTSRC_REG] = 0x34, + [DSIM_INTMSK_REG] = 0x38, + [DSIM_PKTHDR_REG] = 0x3C, + [DSIM_PAYLOAD_REG] = 0x40, + [DSIM_RXFIFO_REG] = 0x44, + [DSIM_FIFOCTRL_REG] = 0x4C, + [DSIM_PLLCTRL_REG] = 0x94, + [DSIM_PHYCTRL_REG] = 0xA4, + [DSIM_PHYTIMING_REG] = 0xB4, + [DSIM_PHYTIMING1_REG] = 0xB8, + [DSIM_PHYTIMING2_REG] = 0xBC, +}; + +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] = DSIM_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), +}; + +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_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), +}; + +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), +}; + +static const struct samsung_dsim_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, +}; + +static const struct samsung_dsim_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, +}; + +static const struct samsung_dsim_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, +}; + +static const struct samsung_dsim_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, +}; + +static const struct samsung_dsim_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, +}; + +static const struct of_device_id samsung_dsim_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 + }, + { /* sentinel. */ } +}; + +static inline struct samsung_dsim *host_to_dsi(struct mipi_dsi_host *h) +{ + return container_of(h, struct samsung_dsim, dsi_host); +} + +static inline struct samsung_dsim *bridge_to_dsi(struct drm_bridge *b) +{ + return container_of(b, struct samsung_dsim, bridge); +} + +static inline void samsung_dsim_write(struct samsung_dsim *dsi, + enum reg_idx idx, u32 val) +{ + writel(val, dsi->reg_base + dsi->driver_data->reg_ofs[idx]); +} + +static inline u32 samsung_dsim_read(struct samsung_dsim *dsi, enum reg_idx idx) +{ + return readl(dsi->reg_base + dsi->driver_data->reg_ofs[idx]); +} + +static void samsung_dsim_wait_for_reset(struct samsung_dsim *dsi) +{ + if (wait_for_completion_timeout(&dsi->completed, msecs_to_jiffies(300))) + return; + + dev_err(dsi->dev, "timeout waiting for reset\n"); +} + +static void samsung_dsim_reset(struct samsung_dsim *dsi) +{ + u32 reset_val = dsi->driver_data->reg_values[RESET_TYPE]; + + reinit_completion(&dsi->completed); + samsung_dsim_write(dsi, DSIM_SWRST_REG, reset_val); +} + +#ifndef MHZ +#define MHZ (1000*1000) +#endif + +static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi, + unsigned long fin, + unsigned long fout, + u8 *p, u16 *m, u8 *s) +{ + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + unsigned long best_freq = 0; + u32 min_delta = 0xffffffff; + u8 p_min, p_max; + u8 _p, best_p; + u16 _m, best_m; + u8 _s, best_s; + + p_min = DIV_ROUND_UP(fin, (12 * MHZ)); + p_max = fin / (6 * MHZ); + + for (_p = p_min; _p <= p_max; ++_p) { + for (_s = 0; _s <= 5; ++_s) { + u64 tmp; + u32 delta; + + tmp = (u64)fout * (_p << _s); + do_div(tmp, fin); + _m = tmp; + if (_m < 41 || _m > 125) + continue; + + tmp = (u64)_m * fin; + do_div(tmp, _p); + if (tmp < 500 * MHZ || + tmp > driver_data->max_freq * MHZ) + continue; + + tmp = (u64)_m * fin; + do_div(tmp, _p << _s); + + delta = abs(fout - tmp); + if (delta < min_delta) { + best_p = _p; + best_m = _m; + best_s = _s; + min_delta = delta; + best_freq = tmp; + } + } + } + + if (best_freq) { + *p = best_p; + *m = best_m; + *s = best_s; + } + + return best_freq; +} + +static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, + unsigned long freq) +{ + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + unsigned long fin, fout; + int timeout; + u8 p, s; + u16 m; + u32 reg; + + fin = dsi->pll_clk_rate; + fout = samsung_dsim_pll_find_pms(dsi, fin, freq, &p, &m, &s); + if (!fout) { + dev_err(dsi->dev, + "failed to find PLL PMS for requested frequency\n"); + return 0; + } + dev_dbg(dsi->dev, "PLL freq %lu, (p %d, m %d, s %d)\n", fout, p, m, s); + + writel(driver_data->reg_values[PLL_TIMER], + dsi->reg_base + driver_data->plltmr_reg); + + reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); + + if (driver_data->has_freqband) { + static const unsigned long freq_bands[] = { + 100 * MHZ, 120 * MHZ, 160 * MHZ, 200 * MHZ, + 270 * MHZ, 320 * MHZ, 390 * MHZ, 450 * MHZ, + 510 * MHZ, 560 * MHZ, 640 * MHZ, 690 * MHZ, + 770 * MHZ, 870 * MHZ, 950 * MHZ, + }; + int band; + + for (band = 0; band < ARRAY_SIZE(freq_bands); ++band) + if (fout < freq_bands[band]) + break; + + dev_dbg(dsi->dev, "band %d\n", band); + + reg |= DSIM_FREQ_BAND(band); + } + + samsung_dsim_write(dsi, DSIM_PLLCTRL_REG, reg); + + timeout = 1000; + do { + if (timeout-- == 0) { + dev_err(dsi->dev, "PLL failed to stabilize\n"); + return 0; + } + reg = samsung_dsim_read(dsi, DSIM_STATUS_REG); + } while ((reg & DSIM_PLL_STABLE) == 0); + + return fout; +} + +static int samsung_dsim_enable_clock(struct samsung_dsim *dsi) +{ + unsigned long hs_clk, byte_clk, esc_clk; + unsigned long esc_div; + u32 reg; + + hs_clk = samsung_dsim_set_pll(dsi, dsi->burst_clk_rate); + if (!hs_clk) { + dev_err(dsi->dev, "failed to configure DSI PLL\n"); + return -EFAULT; + } + + byte_clk = hs_clk / 8; + esc_div = DIV_ROUND_UP(byte_clk, dsi->esc_clk_rate); + esc_clk = byte_clk / esc_div; + + if (esc_clk > 20 * MHZ) { + ++esc_div; + esc_clk = byte_clk / esc_div; + } + + dev_dbg(dsi->dev, "hs_clk = %lu, byte_clk = %lu, esc_clk = %lu\n", + hs_clk, byte_clk, esc_clk); + + reg = samsung_dsim_read(dsi, DSIM_CLKCTRL_REG); + reg &= ~(DSIM_ESC_PRESCALER_MASK | DSIM_LANE_ESC_CLK_EN_CLK + | DSIM_LANE_ESC_CLK_EN_DATA_MASK | DSIM_PLL_BYPASS + | DSIM_BYTE_CLK_SRC_MASK); + reg |= DSIM_ESC_CLKEN | DSIM_BYTE_CLKEN + | DSIM_ESC_PRESCALER(esc_div) + | DSIM_LANE_ESC_CLK_EN_CLK + | DSIM_LANE_ESC_CLK_EN_DATA(BIT(dsi->lanes) - 1) + | DSIM_BYTE_CLK_SRC(0) + | DSIM_TX_REQUEST_HSCLK; + samsung_dsim_write(dsi, DSIM_CLKCTRL_REG, reg); + + return 0; +} + +static void samsung_dsim_set_phy_ctrl(struct samsung_dsim *dsi) +{ + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + const unsigned int *reg_values = driver_data->reg_values; + u32 reg; + + if (driver_data->has_freqband) + 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]; + samsung_dsim_write(dsi, DSIM_PHYCTRL_REG, reg); + + /* + * T LPX: Transmitted length of any Low-Power state period + * T HS-EXIT: Time that the transmitter drives LP-11 following a HS + * burst + */ + reg = reg_values[PHYTIMING_LPX] | reg_values[PHYTIMING_HS_EXIT]; + samsung_dsim_write(dsi, DSIM_PHYTIMING_REG, reg); + + /* + * T CLK-PREPARE: Time that the transmitter drives the Clock Lane LP-00 + * Line state immediately before the HS-0 Line state starting the + * HS transmission + * T CLK-ZERO: Time that the transmitter drives the HS-0 state prior to + * transmitting the Clock. + * T CLK_POST: Time that the transmitter continues to send HS clock + * after the last associated Data Lane has transitioned to LP Mode + * Interval is defined as the period from the end of T HS-TRAIL to + * the beginning of T CLK-TRAIL + * 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]; + + samsung_dsim_write(dsi, DSIM_PHYTIMING1_REG, reg); + + /* + * T HS-PREPARE: Time that the transmitter drives the Data Lane LP-00 + * Line state immediately before the HS-0 Line state starting the + * HS transmission + * T HS-ZERO: Time that the transmitter drives the HS-0 state prior to + * transmitting the Sync sequence. + * 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]; + samsung_dsim_write(dsi, DSIM_PHYTIMING2_REG, reg); +} + +static void samsung_dsim_disable_clock(struct samsung_dsim *dsi) +{ + u32 reg; + + reg = samsung_dsim_read(dsi, DSIM_CLKCTRL_REG); + reg &= ~(DSIM_LANE_ESC_CLK_EN_CLK | DSIM_LANE_ESC_CLK_EN_DATA_MASK + | DSIM_ESC_CLKEN | DSIM_BYTE_CLKEN); + samsung_dsim_write(dsi, DSIM_CLKCTRL_REG, reg); + + reg = samsung_dsim_read(dsi, DSIM_PLLCTRL_REG); + reg &= ~DSIM_PLL_EN; + samsung_dsim_write(dsi, DSIM_PLLCTRL_REG, reg); +} + +static void samsung_dsim_enable_lane(struct samsung_dsim *dsi, u32 lane) +{ + u32 reg = samsung_dsim_read(dsi, DSIM_CONFIG_REG); + + reg |= (DSIM_NUM_OF_DATA_LANE(dsi->lanes - 1) | DSIM_LANE_EN_CLK | + DSIM_LANE_EN(lane)); + samsung_dsim_write(dsi, DSIM_CONFIG_REG, reg); +} + +static int samsung_dsim_init_link(struct samsung_dsim *dsi) +{ + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + int timeout; + u32 reg; + u32 lanes_mask; + + /* Initialize FIFO pointers */ + reg = samsung_dsim_read(dsi, DSIM_FIFOCTRL_REG); + reg &= ~0x1f; + samsung_dsim_write(dsi, DSIM_FIFOCTRL_REG, reg); + + usleep_range(9000, 11000); + + reg |= 0x1f; + samsung_dsim_write(dsi, DSIM_FIFOCTRL_REG, reg); + usleep_range(9000, 11000); + + /* DSI configuration */ + reg = 0; + + /* + * The first bit of mode_flags specifies display configuration. + * If this bit is set[= MIPI_DSI_MODE_VIDEO], dsi will support video + * mode, otherwise it will support command mode. + */ + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) { + reg |= DSIM_VIDEO_MODE; + + /* + * The user manual describes that following bits are ignored in + * command mode. + */ + if (!(dsi->mode_flags & MIPI_DSI_MODE_VSYNC_FLUSH)) + reg |= DSIM_MFLUSH_VS; + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) + reg |= DSIM_SYNC_INFORM; + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) + reg |= DSIM_BURST_MODE; + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_AUTO_VERT) + reg |= DSIM_AUTO_MODE; + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HSE) + reg |= DSIM_HSE_MODE; + if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HFP)) + reg |= DSIM_HFP_MODE; + if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HBP)) + reg |= DSIM_HBP_MODE; + if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HSA)) + reg |= DSIM_HSA_MODE; + } + + if (!(dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET)) + reg |= DSIM_EOT_DISABLE; + + switch (dsi->format) { + case MIPI_DSI_FMT_RGB888: + reg |= DSIM_MAIN_PIX_FORMAT_RGB888; + break; + case MIPI_DSI_FMT_RGB666: + reg |= DSIM_MAIN_PIX_FORMAT_RGB666; + break; + case MIPI_DSI_FMT_RGB666_PACKED: + reg |= DSIM_MAIN_PIX_FORMAT_RGB666_P; + break; + case MIPI_DSI_FMT_RGB565: + reg |= DSIM_MAIN_PIX_FORMAT_RGB565; + break; + default: + dev_err(dsi->dev, "invalid pixel format\n"); + return -EINVAL; + } + + /* + * Use non-continuous clock mode if the periparal wants and + * host controller supports + * + * In non-continous clock mode, host controller will turn off + * the HS clock between high-speed transmissions to reduce + * power consumption. + */ + if (driver_data->has_clklane_stop && + dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) { + reg |= DSIM_CLKLANE_STOP; + } + samsung_dsim_write(dsi, DSIM_CONFIG_REG, reg); + + lanes_mask = BIT(dsi->lanes) - 1; + samsung_dsim_enable_lane(dsi, lanes_mask); + + /* Check clock and data lane state are stop state */ + timeout = 100; + do { + if (timeout-- == 0) { + dev_err(dsi->dev, "waiting for bus lanes timed out\n"); + return -EFAULT; + } + + reg = samsung_dsim_read(dsi, DSIM_STATUS_REG); + if ((reg & DSIM_STOP_STATE_DAT(lanes_mask)) + != DSIM_STOP_STATE_DAT(lanes_mask)) + continue; + } while (!(reg & (DSIM_STOP_STATE_CLK | DSIM_TX_READY_HS_CLK))); + + reg = samsung_dsim_read(dsi, DSIM_ESCMODE_REG); + reg &= ~DSIM_STOP_STATE_CNT_MASK; + reg |= DSIM_STOP_STATE_CNT(driver_data->reg_values[STOP_STATE_CNT]); + samsung_dsim_write(dsi, DSIM_ESCMODE_REG, reg); + + reg = DSIM_BTA_TIMEOUT(0xff) | DSIM_LPDR_TIMEOUT(0xffff); + samsung_dsim_write(dsi, DSIM_TIMEOUT_REG, reg); + + return 0; +} + +static void samsung_dsim_set_display_mode(struct samsung_dsim *dsi) +{ + struct drm_display_mode *m = &dsi->mode; + unsigned int num_bits_resol = dsi->driver_data->num_bits_resol; + u32 reg; + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) { + reg = DSIM_CMD_ALLOW(0xf) + | DSIM_STABLE_VFP(m->vsync_start - m->vdisplay) + | DSIM_MAIN_VBP(m->vtotal - m->vsync_end); + samsung_dsim_write(dsi, DSIM_MVPORCH_REG, reg); + + reg = DSIM_MAIN_HFP(m->hsync_start - m->hdisplay) + | DSIM_MAIN_HBP(m->htotal - m->hsync_end); + samsung_dsim_write(dsi, DSIM_MHPORCH_REG, reg); + + reg = DSIM_MAIN_VSA(m->vsync_end - m->vsync_start) + | DSIM_MAIN_HSA(m->hsync_end - m->hsync_start); + samsung_dsim_write(dsi, DSIM_MSYNC_REG, reg); + } + reg = DSIM_MAIN_HRESOL(m->hdisplay, num_bits_resol) | + DSIM_MAIN_VRESOL(m->vdisplay, num_bits_resol); + + samsung_dsim_write(dsi, DSIM_MDRESOL_REG, reg); + + dev_dbg(dsi->dev, "LCD size = %dx%d\n", m->hdisplay, m->vdisplay); +} + +static void samsung_dsim_set_display_enable(struct samsung_dsim *dsi, bool enable) +{ + u32 reg; + + reg = samsung_dsim_read(dsi, DSIM_MDRESOL_REG); + if (enable) + reg |= DSIM_MAIN_STAND_BY; + else + reg &= ~DSIM_MAIN_STAND_BY; + samsung_dsim_write(dsi, DSIM_MDRESOL_REG, reg); +} + +static int samsung_dsim_wait_for_hdr_fifo(struct samsung_dsim *dsi) +{ + int timeout = 2000; + + do { + u32 reg = samsung_dsim_read(dsi, DSIM_FIFOCTRL_REG); + + if (!(reg & DSIM_SFR_HEADER_FULL)) + return 0; + + if (!cond_resched()) + usleep_range(950, 1050); + } while (--timeout); + + return -ETIMEDOUT; +} + +static void samsung_dsim_set_cmd_lpm(struct samsung_dsim *dsi, bool lpm) +{ + u32 v = samsung_dsim_read(dsi, DSIM_ESCMODE_REG); + + if (lpm) + v |= DSIM_CMD_LPDT_LP; + else + v &= ~DSIM_CMD_LPDT_LP; + + samsung_dsim_write(dsi, DSIM_ESCMODE_REG, v); +} + +static void samsung_dsim_force_bta(struct samsung_dsim *dsi) +{ + u32 v = samsung_dsim_read(dsi, DSIM_ESCMODE_REG); + + v |= DSIM_FORCE_BTA; + samsung_dsim_write(dsi, DSIM_ESCMODE_REG, v); +} + +static void samsung_dsim_send_to_fifo(struct samsung_dsim *dsi, + struct samsung_dsim_transfer *xfer) +{ + struct device *dev = dsi->dev; + struct mipi_dsi_packet *pkt = &xfer->packet; + const u8 *payload = pkt->payload + xfer->tx_done; + u16 length = pkt->payload_length - xfer->tx_done; + bool first = !xfer->tx_done; + u32 reg; + + dev_dbg(dev, "< xfer %pK: tx len %u, done %u, rx len %u, done %u\n", + xfer, length, xfer->tx_done, xfer->rx_len, xfer->rx_done); + + if (length > DSI_TX_FIFO_SIZE) + length = DSI_TX_FIFO_SIZE; + + xfer->tx_done += length; + + /* Send payload */ + while (length >= 4) { + reg = get_unaligned_le32(payload); + samsung_dsim_write(dsi, DSIM_PAYLOAD_REG, reg); + payload += 4; + length -= 4; + } + + reg = 0; + switch (length) { + case 3: + reg |= payload[2] << 16; + fallthrough; + case 2: + reg |= payload[1] << 8; + fallthrough; + case 1: + reg |= payload[0]; + samsung_dsim_write(dsi, DSIM_PAYLOAD_REG, reg); + break; + } + + /* Send packet header */ + if (!first) + return; + + reg = get_unaligned_le32(pkt->header); + if (samsung_dsim_wait_for_hdr_fifo(dsi)) { + dev_err(dev, "waiting for header FIFO timed out\n"); + return; + } + + if (NEQV(xfer->flags & MIPI_DSI_MSG_USE_LPM, + dsi->state & DSIM_STATE_CMD_LPM)) { + samsung_dsim_set_cmd_lpm(dsi, xfer->flags & MIPI_DSI_MSG_USE_LPM); + dsi->state ^= DSIM_STATE_CMD_LPM; + } + + samsung_dsim_write(dsi, DSIM_PKTHDR_REG, reg); + + if (xfer->flags & MIPI_DSI_MSG_REQ_ACK) + samsung_dsim_force_bta(dsi); +} + +static void samsung_dsim_read_from_fifo(struct samsung_dsim *dsi, + struct samsung_dsim_transfer *xfer) +{ + u8 *payload = xfer->rx_payload + xfer->rx_done; + bool first = !xfer->rx_done; + struct device *dev = dsi->dev; + u16 length; + u32 reg; + + if (first) { + reg = samsung_dsim_read(dsi, DSIM_RXFIFO_REG); + + switch (reg & 0x3f) { + case MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_2BYTE: + case MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_2BYTE: + if (xfer->rx_len >= 2) { + payload[1] = reg >> 16; + ++xfer->rx_done; + } + fallthrough; + case MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_1BYTE: + case MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_1BYTE: + payload[0] = reg >> 8; + ++xfer->rx_done; + xfer->rx_len = xfer->rx_done; + xfer->result = 0; + goto clear_fifo; + case MIPI_DSI_RX_ACKNOWLEDGE_AND_ERROR_REPORT: + dev_err(dev, "DSI Error Report: 0x%04x\n", (reg >> 8) & 0xffff); + xfer->result = 0; + goto clear_fifo; + } + + length = (reg >> 8) & 0xffff; + if (length > xfer->rx_len) { + dev_err(dev, + "response too long (%u > %u bytes), stripping\n", + xfer->rx_len, length); + length = xfer->rx_len; + } else if (length < xfer->rx_len) + xfer->rx_len = length; + } + + length = xfer->rx_len - xfer->rx_done; + xfer->rx_done += length; + + /* Receive payload */ + while (length >= 4) { + reg = samsung_dsim_read(dsi, DSIM_RXFIFO_REG); + payload[0] = (reg >> 0) & 0xff; + payload[1] = (reg >> 8) & 0xff; + payload[2] = (reg >> 16) & 0xff; + payload[3] = (reg >> 24) & 0xff; + payload += 4; + length -= 4; + } + + if (length) { + reg = samsung_dsim_read(dsi, DSIM_RXFIFO_REG); + switch (length) { + case 3: + payload[2] = (reg >> 16) & 0xff; + fallthrough; + case 2: + payload[1] = (reg >> 8) & 0xff; + fallthrough; + case 1: + payload[0] = reg & 0xff; + } + } + + if (xfer->rx_done == xfer->rx_len) + xfer->result = 0; + +clear_fifo: + length = DSI_RX_FIFO_SIZE / 4; + do { + reg = samsung_dsim_read(dsi, DSIM_RXFIFO_REG); + if (reg == DSI_RX_FIFO_EMPTY) + break; + } while (--length); +} + +static void samsung_dsim_transfer_start(struct samsung_dsim *dsi) +{ + unsigned long flags; + struct samsung_dsim_transfer *xfer; + bool start = false; + +again: + spin_lock_irqsave(&dsi->transfer_lock, flags); + + if (list_empty(&dsi->transfer_list)) { + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + return; + } + + xfer = list_first_entry(&dsi->transfer_list, + struct samsung_dsim_transfer, list); + + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + + if (xfer->packet.payload_length && + xfer->tx_done == xfer->packet.payload_length) + /* waiting for RX */ + return; + + samsung_dsim_send_to_fifo(dsi, xfer); + + if (xfer->packet.payload_length || xfer->rx_len) + return; + + xfer->result = 0; + complete(&xfer->completed); + + spin_lock_irqsave(&dsi->transfer_lock, flags); + + list_del_init(&xfer->list); + start = !list_empty(&dsi->transfer_list); + + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + + if (start) + goto again; +} + +static bool samsung_dsim_transfer_finish(struct samsung_dsim *dsi) +{ + struct samsung_dsim_transfer *xfer; + unsigned long flags; + bool start = true; + + spin_lock_irqsave(&dsi->transfer_lock, flags); + + if (list_empty(&dsi->transfer_list)) { + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + return false; + } + + xfer = list_first_entry(&dsi->transfer_list, + struct samsung_dsim_transfer, list); + + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + + dev_dbg(dsi->dev, + "> xfer %pK, tx_len %zu, tx_done %u, rx_len %u, rx_done %u\n", + xfer, xfer->packet.payload_length, xfer->tx_done, xfer->rx_len, + xfer->rx_done); + + if (xfer->tx_done != xfer->packet.payload_length) + return true; + + if (xfer->rx_done != xfer->rx_len) + samsung_dsim_read_from_fifo(dsi, xfer); + + if (xfer->rx_done != xfer->rx_len) + return true; + + spin_lock_irqsave(&dsi->transfer_lock, flags); + + list_del_init(&xfer->list); + start = !list_empty(&dsi->transfer_list); + + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + + if (!xfer->rx_len) + xfer->result = 0; + complete(&xfer->completed); + + return start; +} + +static void samsung_dsim_remove_transfer(struct samsung_dsim *dsi, + struct samsung_dsim_transfer *xfer) +{ + unsigned long flags; + bool start; + + spin_lock_irqsave(&dsi->transfer_lock, flags); + + if (!list_empty(&dsi->transfer_list) && + xfer == list_first_entry(&dsi->transfer_list, + struct samsung_dsim_transfer, list)) { + list_del_init(&xfer->list); + start = !list_empty(&dsi->transfer_list); + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + if (start) + samsung_dsim_transfer_start(dsi); + return; + } + + list_del_init(&xfer->list); + + spin_unlock_irqrestore(&dsi->transfer_lock, flags); +} + +static int samsung_dsim_transfer(struct samsung_dsim *dsi, + struct samsung_dsim_transfer *xfer) +{ + unsigned long flags; + bool stopped; + + xfer->tx_done = 0; + xfer->rx_done = 0; + xfer->result = -ETIMEDOUT; + init_completion(&xfer->completed); + + spin_lock_irqsave(&dsi->transfer_lock, flags); + + stopped = list_empty(&dsi->transfer_list); + list_add_tail(&xfer->list, &dsi->transfer_list); + + spin_unlock_irqrestore(&dsi->transfer_lock, flags); + + if (stopped) + samsung_dsim_transfer_start(dsi); + + wait_for_completion_timeout(&xfer->completed, + msecs_to_jiffies(DSI_XFER_TIMEOUT_MS)); + if (xfer->result == -ETIMEDOUT) { + struct mipi_dsi_packet *pkt = &xfer->packet; + + samsung_dsim_remove_transfer(dsi, xfer); + dev_err(dsi->dev, "xfer timed out: %*ph %*ph\n", 4, pkt->header, + (int)pkt->payload_length, pkt->payload); + return -ETIMEDOUT; + } + + /* Also covers hardware timeout condition */ + return xfer->result; +} + +static irqreturn_t samsung_dsim_irq(int irq, void *dev_id) +{ + struct samsung_dsim *dsi = dev_id; + u32 status; + + status = samsung_dsim_read(dsi, DSIM_INTSRC_REG); + if (!status) { + static unsigned long j; + + if (printk_timed_ratelimit(&j, 500)) + dev_warn(dsi->dev, "spurious interrupt\n"); + return IRQ_HANDLED; + } + samsung_dsim_write(dsi, DSIM_INTSRC_REG, status); + + if (status & DSIM_INT_SW_RST_RELEASE) { + u32 mask = ~(DSIM_INT_RX_DONE | DSIM_INT_SFR_FIFO_EMPTY | + DSIM_INT_SFR_HDR_FIFO_EMPTY | DSIM_INT_RX_ECC_ERR | + DSIM_INT_SW_RST_RELEASE); + samsung_dsim_write(dsi, DSIM_INTMSK_REG, mask); + complete(&dsi->completed); + return IRQ_HANDLED; + } + + if (!(status & (DSIM_INT_RX_DONE | DSIM_INT_SFR_FIFO_EMPTY | + DSIM_INT_PLL_STABLE))) + return IRQ_HANDLED; + + if (samsung_dsim_transfer_finish(dsi)) + samsung_dsim_transfer_start(dsi); + + return IRQ_HANDLED; +} + +static void samsung_dsim_enable_irq(struct samsung_dsim *dsi) +{ + const struct samsung_dsim_plat_data *pdata = dsi->plat_data; + + enable_irq(dsi->irq); + + if (pdata && pdata->irq_ops && pdata->irq_ops->enable) + pdata->irq_ops->enable(dsi); +} + +static void samsung_dsim_disable_irq(struct samsung_dsim *dsi) +{ + const struct samsung_dsim_plat_data *pdata = dsi->plat_data; + + if (pdata && pdata->irq_ops && pdata->irq_ops->disable) + pdata->irq_ops->disable(dsi); + + disable_irq(dsi->irq); +} + +static int samsung_dsim_init(struct samsung_dsim *dsi) +{ + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + + samsung_dsim_reset(dsi); + samsung_dsim_enable_irq(dsi); + + if (driver_data->reg_values[RESET_TYPE] == DSIM_FUNCRST) + samsung_dsim_enable_lane(dsi, BIT(dsi->lanes) - 1); + + samsung_dsim_enable_clock(dsi); + if (driver_data->wait_for_reset) + samsung_dsim_wait_for_reset(dsi); + samsung_dsim_set_phy_ctrl(dsi); + samsung_dsim_init_link(dsi); + + return 0; +} + +static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + int ret; + + if (dsi->state & DSIM_STATE_ENABLED) + return; + + ret = pm_runtime_resume_and_get(dsi->dev); + if (ret < 0) { + dev_err(dsi->dev, "failed to enable DSI device.\n"); + return; + } + + dsi->state |= DSIM_STATE_ENABLED; +} + +static void samsung_dsim_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + + samsung_dsim_set_display_mode(dsi); + samsung_dsim_set_display_enable(dsi, true); + + dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE; +} + +static void samsung_dsim_atomic_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + + if (!(dsi->state & DSIM_STATE_ENABLED)) + return; + + dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE; +} + +static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + + samsung_dsim_set_display_enable(dsi, false); + + dsi->state &= ~DSIM_STATE_ENABLED; + pm_runtime_put_sync(dsi->dev); +} + +static void samsung_dsim_mode_set(struct drm_bridge *bridge, + const struct drm_display_mode *mode, + const struct drm_display_mode *adjusted_mode) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + + drm_mode_copy(&dsi->mode, adjusted_mode); +} + +static int samsung_dsim_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + + return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, + flags); +} + +static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_pre_enable = samsung_dsim_atomic_pre_enable, + .atomic_enable = samsung_dsim_atomic_enable, + .atomic_disable = samsung_dsim_atomic_disable, + .atomic_post_disable = samsung_dsim_atomic_post_disable, + .mode_set = samsung_dsim_mode_set, + .attach = samsung_dsim_attach, +}; + +MODULE_DEVICE_TABLE(of, samsung_dsim_of_match); + +static int samsung_dsim_host_attach(struct mipi_dsi_host *host, + struct mipi_dsi_device *device) +{ + struct samsung_dsim *dsi = host_to_dsi(host); + const struct samsung_dsim_plat_data *pdata = dsi->plat_data; + struct device *dev = dsi->dev; + struct drm_panel *panel; + int ret; + + panel = of_drm_find_panel(device->dev.of_node); + if (!IS_ERR(panel)) { + dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel); + } else { + dsi->out_bridge = of_drm_find_bridge(device->dev.of_node); + if (!dsi->out_bridge) + dsi->out_bridge = ERR_PTR(-EINVAL); + } + + if (IS_ERR(dsi->out_bridge)) { + ret = PTR_ERR(dsi->out_bridge); + DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret); + return ret; + } + + DRM_DEV_INFO(dev, "Attached %s device\n", device->name); + + drm_bridge_add(&dsi->bridge); + + if (pdata && pdata->host_ops && pdata->host_ops->attach) { + ret = pdata->host_ops->attach(dsi, device); + if (ret < 0) + return ret; + } + + dsi->lanes = device->lanes; + dsi->format = device->format; + dsi->mode_flags = device->mode_flags; + + return 0; +} + +static int samsung_dsim_host_detach(struct mipi_dsi_host *host, + struct mipi_dsi_device *device) +{ + struct samsung_dsim *dsi = host_to_dsi(host); + const struct samsung_dsim_plat_data *pdata = dsi->plat_data; + int ret; + + if (dsi->out_bridge->funcs->detach) + dsi->out_bridge->funcs->detach(dsi->out_bridge); + + dsi->out_bridge = NULL; + + if (pdata && pdata->host_ops && pdata->host_ops->detach) { + ret = pdata->host_ops->detach(dsi, device); + if (ret < 0) + return ret; + } + + drm_bridge_remove(&dsi->bridge); + + return 0; +} + +static ssize_t samsung_dsim_host_transfer(struct mipi_dsi_host *host, + const struct mipi_dsi_msg *msg) +{ + struct samsung_dsim *dsi = host_to_dsi(host); + struct samsung_dsim_transfer xfer; + int ret; + + if (!(dsi->state & DSIM_STATE_ENABLED)) + return -EINVAL; + + if (!(dsi->state & DSIM_STATE_INITIALIZED)) { + ret = samsung_dsim_init(dsi); + if (ret) + return ret; + dsi->state |= DSIM_STATE_INITIALIZED; + } + + ret = mipi_dsi_create_packet(&xfer.packet, msg); + if (ret < 0) + return ret; + + xfer.rx_len = msg->rx_len; + xfer.rx_payload = msg->rx_buf; + xfer.flags = msg->flags; + + ret = samsung_dsim_transfer(dsi, &xfer); + return (ret < 0) ? ret : xfer.rx_done; +} + +static const struct mipi_dsi_host_ops samsung_dsim_ops = { + .attach = samsung_dsim_host_attach, + .detach = samsung_dsim_host_detach, + .transfer = samsung_dsim_host_transfer, +}; + +static int samsung_dsim_of_read_u32(const struct device_node *np, + const char *propname, u32 *out_value) +{ + int ret = of_property_read_u32(np, propname, out_value); + + if (ret < 0) + pr_err("%pOF: failed to get '%s' property\n", np, propname); + + return ret; +} + +static int samsung_dsim_parse_dt(struct samsung_dsim *dsi) +{ + struct device *dev = dsi->dev; + struct device_node *node = dev->of_node; + int ret; + + ret = samsung_dsim_of_read_u32(node, "samsung,pll-clock-frequency", + &dsi->pll_clk_rate); + if (ret < 0) + return ret; + + ret = samsung_dsim_of_read_u32(node, "samsung,burst-clock-frequency", + &dsi->burst_clk_rate); + if (ret < 0) + return ret; + + ret = samsung_dsim_of_read_u32(node, "samsung,esc-clock-frequency", + &dsi->esc_clk_rate); + if (ret < 0) + return ret; + + return 0; +} + +__weak int samsung_dsim_plat_probe(struct samsung_dsim *priv) +{ + return 0; +} + +__weak void samsung_dsim_plat_remove(struct samsung_dsim *priv) +{ +} + +static int samsung_dsim_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct samsung_dsim *dsi; + int ret, i; + + dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL); + if (!dsi) + return -ENOMEM; + + init_completion(&dsi->completed); + spin_lock_init(&dsi->transfer_lock); + INIT_LIST_HEAD(&dsi->transfer_list); + + dsi->dsi_host.ops = &samsung_dsim_ops; + dsi->dsi_host.dev = dev; + + dsi->dev = dev; + dsi->driver_data = of_device_get_match_data(dev); + + dsi->supplies[0].supply = "vddcore"; + dsi->supplies[1].supply = "vddio"; + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies), + dsi->supplies); + if (ret) + return dev_err_probe(dev, ret, "failed to get regulators\n"); + + dsi->clks = devm_kcalloc(dev, dsi->driver_data->num_clks, + sizeof(*dsi->clks), GFP_KERNEL); + if (!dsi->clks) + return -ENOMEM; + + for (i = 0; i < dsi->driver_data->num_clks; i++) { + dsi->clks[i] = devm_clk_get(dev, clk_names[i]); + if (IS_ERR(dsi->clks[i])) { + if (strcmp(clk_names[i], "sclk_mipi") == 0) { + dsi->clks[i] = devm_clk_get(dev, OLD_SCLK_MIPI_CLK_NAME); + if (!IS_ERR(dsi->clks[i])) + continue; + } + + dev_info(dev, "failed to get the clock: %s\n", clk_names[i]); + return PTR_ERR(dsi->clks[i]); + } + } + + dsi->reg_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(dsi->reg_base)) + return PTR_ERR(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); + } + + dsi->irq = platform_get_irq(pdev, 0); + if (dsi->irq < 0) + return dsi->irq; + + ret = devm_request_threaded_irq(dev, dsi->irq, NULL, + samsung_dsim_irq, + IRQF_ONESHOT | IRQF_NO_AUTOEN, + dev_name(dev), dsi); + if (ret) { + dev_err(dev, "failed to request dsi irq\n"); + return ret; + } + + ret = samsung_dsim_parse_dt(dsi); + if (ret) + return ret; + + platform_set_drvdata(pdev, dsi); + + pm_runtime_enable(dev); + + dsi->bridge.funcs = &samsung_dsim_bridge_funcs; + dsi->bridge.of_node = dev->of_node; + dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; + + ret = samsung_dsim_plat_probe(dsi); + if (ret) + goto err_disable_runtime; + + return 0; + +err_disable_runtime: + pm_runtime_disable(dev); + + return ret; +} + +static int samsung_dsim_remove(struct platform_device *pdev) +{ + struct samsung_dsim *dsi = platform_get_drvdata(pdev); + + pm_runtime_disable(&pdev->dev); + + samsung_dsim_plat_remove(dsi); + + return 0; +} + +static int __maybe_unused samsung_dsim_suspend(struct device *dev) +{ + struct samsung_dsim *dsi = dev_get_drvdata(dev); + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + int ret, i; + + usleep_range(10000, 20000); + + if (dsi->state & DSIM_STATE_INITIALIZED) { + dsi->state &= ~DSIM_STATE_INITIALIZED; + + samsung_dsim_disable_clock(dsi); + + samsung_dsim_disable_irq(dsi); + } + + dsi->state &= ~DSIM_STATE_CMD_LPM; + + phy_power_off(dsi->phy); + + for (i = driver_data->num_clks - 1; i > -1; i--) + clk_disable_unprepare(dsi->clks[i]); + + ret = regulator_bulk_disable(ARRAY_SIZE(dsi->supplies), dsi->supplies); + if (ret < 0) + dev_err(dsi->dev, "cannot disable regulators %d\n", ret); + + return 0; +} + +static int __maybe_unused samsung_dsim_resume(struct device *dev) +{ + struct samsung_dsim *dsi = dev_get_drvdata(dev); + const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + int ret, i; + + ret = regulator_bulk_enable(ARRAY_SIZE(dsi->supplies), dsi->supplies); + if (ret < 0) { + dev_err(dsi->dev, "cannot enable regulators %d\n", ret); + return ret; + } + + for (i = 0; i < driver_data->num_clks; i++) { + ret = clk_prepare_enable(dsi->clks[i]); + if (ret < 0) + goto err_clk; + } + + ret = phy_power_on(dsi->phy); + if (ret < 0) { + dev_err(dsi->dev, "cannot enable phy %d\n", ret); + goto err_clk; + } + + return 0; + +err_clk: + while (--i > -1) + clk_disable_unprepare(dsi->clks[i]); + regulator_bulk_disable(ARRAY_SIZE(dsi->supplies), dsi->supplies); + + return ret; +} + +static const struct dev_pm_ops samsung_dsim_pm_ops = { + SET_RUNTIME_PM_OPS(samsung_dsim_suspend, samsung_dsim_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +}; + +struct platform_driver samsung_dsim_driver = { + .probe = samsung_dsim_probe, + .remove = samsung_dsim_remove, + .driver = { + .name = "samsung-dsim", + .owner = THIS_MODULE, + .pm = &samsung_dsim_pm_ops, + .of_match_table = samsung_dsim_of_match, + }, +}; + +module_platform_driver(samsung_dsim_driver); + +MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>"); +MODULE_DESCRIPTION("Samsung MIPI DSIM controller bridge"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 3d2f025d4fd4..a65acfed15b9 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -59,6 +59,7 @@ config DRM_EXYNOS_DSI depends on DRM_EXYNOS_FIMD || DRM_EXYNOS5433_DECON || DRM_EXYNOS7_DECON select DRM_MIPI_DSI select DRM_PANEL + select DRM_SAMSUNG_DSIM default n help This enables support for Exynos MIPI-DSI device. diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 16c539657f73..9e3a0c8c7fdb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -179,9 +179,6 @@ static struct exynos_drm_driver_info exynos_drm_drivers[] = { }, { DRV_PTR(dp_driver, CONFIG_DRM_EXYNOS_DP), DRM_COMPONENT_DRIVER - }, { - DRV_PTR(dsi_driver, CONFIG_DRM_EXYNOS_DSI), - DRM_COMPONENT_DRIVER }, { DRV_PTR(mic_driver, CONFIG_DRM_EXYNOS_MIC), DRM_COMPONENT_DRIVER diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index 6ae9056e7a18..f005b9c8265e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -264,7 +264,6 @@ extern struct platform_driver fimd_driver; extern struct platform_driver exynos5433_decon_driver; extern struct platform_driver decon_driver; extern struct platform_driver dp_driver; -extern struct platform_driver dsi_driver; extern struct platform_driver mixer_driver; extern struct platform_driver hdmi_driver; extern struct platform_driver vidi_driver; diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index e5b1540c4ae4..bd443d3eedbe 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1,1341 +1,82 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Samsung SoC MIPI DSI Master driver. + * Samsung MIPI DSIM glue for Exynos SoCs. * * 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_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_mipi_dsi.h> -#include <drm/drm_panel.h> -#include <drm/drm_print.h> +#include <drm/bridge/samsung-dsim.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> #include "exynos_drm_crtc.h" #include "exynos_drm_drv.h" -/* returns true iff both arguments logically differs */ -#define NEQV(a, b) (!(a) ^ !(b)) - -/* DSIM_STATUS */ -#define DSIM_STOP_STATE_DAT(x) (((x) & 0xf) << 0) -#define DSIM_STOP_STATE_CLK (1 << 8) -#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) - -/* DSIM_CLKCTRL */ -#define DSIM_ESC_PRESCALER(x) (((x) & 0xffff) << 0) -#define DSIM_ESC_PRESCALER_MASK (0xffff << 0) -#define DSIM_LANE_ESC_CLK_EN_CLK (1 << 19) -#define DSIM_LANE_ESC_CLK_EN_DATA(x) (((x) & 0xf) << 20) -#define DSIM_LANE_ESC_CLK_EN_DATA_MASK (0xf << 20) -#define DSIM_BYTE_CLKEN (1 << 24) -#define DSIM_BYTE_CLK_SRC(x) (((x) & 0x3) << 25) -#define DSIM_BYTE_CLK_SRC_MASK (0x3 << 25) -#define DSIM_PLL_BYPASS (1 << 27) -#define DSIM_ESC_CLKEN (1 << 28) -#define DSIM_TX_REQUEST_HSCLK (1 << 31) - -/* DSIM_CONFIG */ -#define DSIM_LANE_EN_CLK (1 << 0) -#define DSIM_LANE_EN(x) (((x) & 0xf) << 1) -#define DSIM_NUM_OF_DATA_LANE(x) (((x) & 0x3) << 5) -#define DSIM_SUB_PIX_FORMAT(x) (((x) & 0x7) << 8) -#define DSIM_MAIN_PIX_FORMAT_MASK (0x7 << 12) -#define DSIM_MAIN_PIX_FORMAT_RGB888 (0x7 << 12) -#define DSIM_MAIN_PIX_FORMAT_RGB666 (0x6 << 12) -#define DSIM_MAIN_PIX_FORMAT_RGB666_P (0x5 << 12) -#define DSIM_MAIN_PIX_FORMAT_RGB565 (0x4 << 12) -#define DSIM_SUB_VC (((x) & 0x3) << 16) -#define DSIM_MAIN_VC (((x) & 0x3) << 18) -#define DSIM_HSA_MODE (1 << 20) -#define DSIM_HBP_MODE (1 << 21) -#define DSIM_HFP_MODE (1 << 22) -#define DSIM_HSE_MODE (1 << 23) -#define DSIM_AUTO_MODE (1 << 24) -#define DSIM_VIDEO_MODE (1 << 25) -#define DSIM_BURST_MODE (1 << 26) -#define DSIM_SYNC_INFORM (1 << 27) -#define DSIM_EOT_DISABLE (1 << 28) -#define DSIM_MFLUSH_VS (1 << 29) -/* This flag is valid only for exynos3250/3472/5260/5430 */ -#define DSIM_CLKLANE_STOP (1 << 30) - -/* DSIM_ESCMODE */ -#define DSIM_TX_TRIGGER_RST (1 << 4) -#define DSIM_TX_LPDT_LP (1 << 6) -#define DSIM_CMD_LPDT_LP (1 << 7) -#define DSIM_FORCE_BTA (1 << 16) -#define DSIM_FORCE_STOP_STATE (1 << 20) -#define DSIM_STOP_STATE_CNT(x) (((x) & 0x7ff) << 21) -#define DSIM_STOP_STATE_CNT_MASK (0x7ff << 21) - -/* DSIM_MDRESOL */ -#define DSIM_MAIN_STAND_BY (1 << 31) -#define DSIM_MAIN_VRESOL(x, num_bits) (((x) & ((1 << (num_bits)) - 1)) << 16) -#define DSIM_MAIN_HRESOL(x, num_bits) (((x) & ((1 << (num_bits)) - 1)) << 0) - -/* DSIM_MVPORCH */ -#define DSIM_CMD_ALLOW(x) ((x) << 28) -#define DSIM_STABLE_VFP(x) ((x) << 16) -#define DSIM_MAIN_VBP(x) ((x) << 0) -#define DSIM_CMD_ALLOW_MASK (0xf << 28) -#define DSIM_STABLE_VFP_MASK (0x7ff << 16) -#define DSIM_MAIN_VBP_MASK (0x7ff << 0) - -/* DSIM_MHPORCH */ -#define DSIM_MAIN_HFP(x) ((x) << 16) -#define DSIM_MAIN_HBP(x) ((x) << 0) -#define DSIM_MAIN_HFP_MASK ((0xffff) << 16) -#define DSIM_MAIN_HBP_MASK ((0xffff) << 0) - -/* DSIM_MSYNC */ -#define DSIM_MAIN_VSA(x) ((x) << 22) -#define DSIM_MAIN_HSA(x) ((x) << 0) -#define DSIM_MAIN_VSA_MASK ((0x3ff) << 22) -#define DSIM_MAIN_HSA_MASK ((0xffff) << 0) - -/* DSIM_SDRESOL */ -#define DSIM_SUB_STANDY(x) ((x) << 31) -#define DSIM_SUB_VRESOL(x) ((x) << 16) -#define DSIM_SUB_HRESOL(x) ((x) << 0) -#define DSIM_SUB_STANDY_MASK ((0x1) << 31) -#define DSIM_SUB_VRESOL_MASK ((0x7ff) << 16) -#define DSIM_SUB_HRESOL_MASK ((0x7ff) << 0) - -/* DSIM_INTSRC */ -#define DSIM_INT_PLL_STABLE (1 << 31) -#define DSIM_INT_SW_RST_RELEASE (1 << 30) -#define DSIM_INT_SFR_FIFO_EMPTY (1 << 29) -#define DSIM_INT_SFR_HDR_FIFO_EMPTY (1 << 28) -#define DSIM_INT_BTA (1 << 25) -#define DSIM_INT_FRAME_DONE (1 << 24) -#define DSIM_INT_RX_TIMEOUT (1 << 21) -#define DSIM_INT_BTA_TIMEOUT (1 << 20) -#define DSIM_INT_RX_DONE (1 << 18) -#define DSIM_INT_RX_TE (1 << 17) -#define DSIM_INT_RX_ACK (1 << 16) -#define DSIM_INT_RX_ECC_ERR (1 << 15) -#define DSIM_INT_RX_CRC_ERR (1 << 14) - -/* DSIM_FIFOCTRL */ -#define DSIM_RX_DATA_FULL (1 << 25) -#define DSIM_RX_DATA_EMPTY (1 << 24) -#define DSIM_SFR_HEADER_FULL (1 << 23) -#define DSIM_SFR_HEADER_EMPTY (1 << 22) -#define DSIM_SFR_PAYLOAD_FULL (1 << 21) -#define DSIM_SFR_PAYLOAD_EMPTY (1 << 20) -#define DSIM_I80_HEADER_FULL (1 << 19) -#define DSIM_I80_HEADER_EMPTY (1 << 18) -#define DSIM_I80_PAYLOAD_FULL (1 << 17) -#define DSIM_I80_PAYLOAD_EMPTY (1 << 16) -#define DSIM_SD_HEADER_FULL (1 << 15) -#define DSIM_SD_HEADER_EMPTY (1 << 14) -#define DSIM_SD_PAYLOAD_FULL (1 << 13) -#define DSIM_SD_PAYLOAD_EMPTY (1 << 12) -#define DSIM_MD_HEADER_FULL (1 << 11) -#define DSIM_MD_HEADER_EMPTY (1 << 10) -#define DSIM_MD_PAYLOAD_FULL (1 << 9) -#define DSIM_MD_PAYLOAD_EMPTY (1 << 8) -#define DSIM_RX_FIFO (1 << 4) -#define DSIM_SFR_FIFO (1 << 3) -#define DSIM_I80_FIFO (1 << 2) -#define DSIM_SD_FIFO (1 << 1) -#define DSIM_MD_FIFO (1 << 0) - -/* DSIM_PHYACCHR */ -#define DSIM_AFC_EN (1 << 14) -#define DSIM_AFC_CTL(x) (((x) & 0x7) << 5) - -/* DSIM_PLLCTRL */ -#define DSIM_FREQ_BAND(x) ((x) << 24) -#define DSIM_PLL_EN (1 << 23) -#define DSIM_PLL_P(x) ((x) << 13) -#define DSIM_PLL_M(x) ((x) << 4) -#define DSIM_PLL_S(x) ((x) << 1) - -/* DSIM_PHYCTRL */ -#define DSIM_PHYCTRL_ULPS_EXIT(x) (((x) & 0x1ff) << 0) -#define DSIM_PHYCTRL_B_DPHYCTL_VREG_LP (1 << 30) -#define DSIM_PHYCTRL_B_DPHYCTL_SLEW_UP (1 << 14) - -/* DSIM_PHYTIMING */ -#define DSIM_PHYTIMING_LPX(x) ((x) << 8) -#define DSIM_PHYTIMING_HS_EXIT(x) ((x) << 0) - -/* DSIM_PHYTIMING1 */ -#define DSIM_PHYTIMING1_CLK_PREPARE(x) ((x) << 24) -#define DSIM_PHYTIMING1_CLK_ZERO(x) ((x) << 16) -#define DSIM_PHYTIMING1_CLK_POST(x) ((x) << 8) -#define DSIM_PHYTIMING1_CLK_TRAIL(x) ((x) << 0) - -/* DSIM_PHYTIMING2 */ -#define DSIM_PHYTIMING2_HS_PREPARE(x) ((x) << 16) -#define DSIM_PHYTIMING2_HS_ZERO(x) ((x) << 8) -#define DSIM_PHYTIMING2_HS_TRAIL(x) ((x) << 0) - -#define DSI_MAX_BUS_WIDTH 4 -#define DSI_NUM_VIRTUAL_CHANNELS 4 -#define DSI_TX_FIFO_SIZE 2048 -#define DSI_RX_FIFO_SIZE 256 -#define DSI_XFER_TIMEOUT_MS 100 -#define DSI_RX_FIFO_EMPTY 0x30800002 - -#define OLD_SCLK_MIPI_CLK_NAME "pll_clk" - -static const char *const clk_names[5] = { "bus_clk", "sclk_mipi", - "phyclk_mipidphy0_bitclkdiv8", "phyclk_mipidphy0_rxclkesc0", - "sclk_rgb_vclk_to_dsim0" }; - -enum exynos_dsi_transfer_type { - EXYNOS_DSI_TX, - EXYNOS_DSI_RX, -}; - -struct exynos_dsi_transfer { - struct list_head list; - struct completion completed; - int result; - struct mipi_dsi_packet packet; - u16 flags; - u16 tx_done; - - u8 *rx_payload; - u16 rx_len; - u16 rx_done; -}; - -#define DSIM_STATE_ENABLED BIT(0) -#define DSIM_STATE_INITIALIZED BIT(1) -#define DSIM_STATE_CMD_LPM BIT(2) -#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3) - -struct exynos_dsi_driver_data { - const unsigned int *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; -}; - struct exynos_dsi { struct drm_encoder encoder; - struct mipi_dsi_host dsi_host; - struct drm_bridge bridge; - struct drm_bridge *out_bridge; - struct device *dev; - struct drm_display_mode mode; + struct samsung_dsim *priv; - void __iomem *reg_base; - struct phy *phy; - struct clk **clks; - struct regulator_bulk_data supplies[2]; - int irq; struct gpio_desc *te_gpio; - u32 pll_clk_rate; - u32 burst_clk_rate; - u32 esc_clk_rate; - u32 lanes; - u32 mode_flags; - u32 format; - - int state; - struct drm_property *brightness; - struct completion completed; - - spinlock_t transfer_lock; /* protects transfer_list */ - struct list_head transfer_list; - - const struct exynos_dsi_driver_data *driver_data; + struct samsung_dsim_plat_data pdata; }; -#define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host) - -static inline struct exynos_dsi *bridge_to_dsi(struct drm_bridge *b) +static inline struct exynos_dsi *pdata_to_dsi(const struct samsung_dsim_plat_data *p) { - return container_of(b, struct exynos_dsi, bridge); -} - -enum reg_idx { - DSIM_STATUS_REG, /* Status register */ - DSIM_SWRST_REG, /* Software reset register */ - DSIM_CLKCTRL_REG, /* Clock control register */ - DSIM_TIMEOUT_REG, /* Time out register */ - DSIM_CONFIG_REG, /* Configuration register */ - DSIM_ESCMODE_REG, /* Escape mode register */ - DSIM_MDRESOL_REG, - DSIM_MVPORCH_REG, /* Main display Vporch register */ - DSIM_MHPORCH_REG, /* Main display Hporch register */ - DSIM_MSYNC_REG, /* Main display sync area register */ - DSIM_INTSRC_REG, /* Interrupt source register */ - DSIM_INTMSK_REG, /* Interrupt mask register */ - DSIM_PKTHDR_REG, /* Packet Header FIFO register */ - DSIM_PAYLOAD_REG, /* Payload FIFO register */ - DSIM_RXFIFO_REG, /* Read FIFO register */ - DSIM_FIFOCTRL_REG, /* FIFO status and control register */ - DSIM_PLLCTRL_REG, /* PLL control register */ - DSIM_PHYCTRL_REG, - DSIM_PHYTIMING_REG, - DSIM_PHYTIMING1_REG, - DSIM_PHYTIMING2_REG, - 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]); + return container_of(p, struct exynos_dsi, pdata); } -static inline u32 exynos_dsi_read(struct exynos_dsi *dsi, enum reg_idx idx) +static void exynos_dsi_enable_irq(struct samsung_dsim *priv) { - 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, - [DSIM_CLKCTRL_REG] = 0x08, - [DSIM_TIMEOUT_REG] = 0x0c, - [DSIM_CONFIG_REG] = 0x10, - [DSIM_ESCMODE_REG] = 0x14, - [DSIM_MDRESOL_REG] = 0x18, - [DSIM_MVPORCH_REG] = 0x1c, - [DSIM_MHPORCH_REG] = 0x20, - [DSIM_MSYNC_REG] = 0x24, - [DSIM_INTSRC_REG] = 0x2c, - [DSIM_INTMSK_REG] = 0x30, - [DSIM_PKTHDR_REG] = 0x34, - [DSIM_PAYLOAD_REG] = 0x38, - [DSIM_RXFIFO_REG] = 0x3c, - [DSIM_FIFOCTRL_REG] = 0x44, - [DSIM_PLLCTRL_REG] = 0x4c, - [DSIM_PHYCTRL_REG] = 0x5c, - [DSIM_PHYTIMING_REG] = 0x64, - [DSIM_PHYTIMING1_REG] = 0x68, - [DSIM_PHYTIMING2_REG] = 0x6c, -}; - -static const unsigned int exynos5433_reg_ofs[] = { - [DSIM_STATUS_REG] = 0x04, - [DSIM_SWRST_REG] = 0x0C, - [DSIM_CLKCTRL_REG] = 0x10, - [DSIM_TIMEOUT_REG] = 0x14, - [DSIM_CONFIG_REG] = 0x18, - [DSIM_ESCMODE_REG] = 0x1C, - [DSIM_MDRESOL_REG] = 0x20, - [DSIM_MVPORCH_REG] = 0x24, - [DSIM_MHPORCH_REG] = 0x28, - [DSIM_MSYNC_REG] = 0x2C, - [DSIM_INTSRC_REG] = 0x34, - [DSIM_INTMSK_REG] = 0x38, - [DSIM_PKTHDR_REG] = 0x3C, - [DSIM_PAYLOAD_REG] = 0x40, - [DSIM_RXFIFO_REG] = 0x44, - [DSIM_FIFOCTRL_REG] = 0x4C, - [DSIM_PLLCTRL_REG] = 0x94, - [DSIM_PHYCTRL_REG] = 0xA4, - [DSIM_PHYTIMING_REG] = 0xB4, - [DSIM_PHYTIMING1_REG] = 0xB8, - [DSIM_PHYTIMING2_REG] = 0xBC, -}; - -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] = DSIM_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), -}; - -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_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), -}; - -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), -}; - -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, -}; - -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, -}; - -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, -}; - -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, -}; - -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, -}; - -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))) - return; - - dev_err(dsi->dev, "timeout waiting for reset\n"); -} - -static void exynos_dsi_reset(struct exynos_dsi *dsi) -{ - u32 reset_val = dsi->driver_data->reg_values[RESET_TYPE]; - - reinit_completion(&dsi->completed); - exynos_dsi_write(dsi, DSIM_SWRST_REG, reset_val); -} - -#ifndef MHZ -#define MHZ (1000*1000) -#endif - -static unsigned long exynos_dsi_pll_find_pms(struct exynos_dsi *dsi, - unsigned long fin, unsigned long fout, u8 *p, u16 *m, u8 *s) -{ - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - unsigned long best_freq = 0; - u32 min_delta = 0xffffffff; - u8 p_min, p_max; - u8 _p, best_p; - u16 _m, best_m; - u8 _s, best_s; - - p_min = DIV_ROUND_UP(fin, (12 * MHZ)); - p_max = fin / (6 * MHZ); - - for (_p = p_min; _p <= p_max; ++_p) { - for (_s = 0; _s <= 5; ++_s) { - u64 tmp; - u32 delta; - - tmp = (u64)fout * (_p << _s); - do_div(tmp, fin); - _m = tmp; - if (_m < 41 || _m > 125) - continue; - - tmp = (u64)_m * fin; - do_div(tmp, _p); - if (tmp < 500 * MHZ || - tmp > driver_data->max_freq * MHZ) - continue; - - tmp = (u64)_m * fin; - do_div(tmp, _p << _s); - - delta = abs(fout - tmp); - if (delta < min_delta) { - best_p = _p; - best_m = _m; - best_s = _s; - min_delta = delta; - best_freq = tmp; - } - } - } - - if (best_freq) { - *p = best_p; - *m = best_m; - *s = best_s; - } - - return best_freq; -} - -static unsigned long exynos_dsi_set_pll(struct exynos_dsi *dsi, - unsigned long freq) -{ - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - unsigned long fin, fout; - int timeout; - u8 p, s; - u16 m; - u32 reg; - - fin = dsi->pll_clk_rate; - fout = exynos_dsi_pll_find_pms(dsi, fin, freq, &p, &m, &s); - if (!fout) { - dev_err(dsi->dev, - "failed to find PLL PMS for requested frequency\n"); - return 0; - } - dev_dbg(dsi->dev, "PLL freq %lu, (p %d, m %d, s %d)\n", fout, p, m, s); - - writel(driver_data->reg_values[PLL_TIMER], - dsi->reg_base + driver_data->plltmr_reg); - - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); - - if (driver_data->has_freqband) { - static const unsigned long freq_bands[] = { - 100 * MHZ, 120 * MHZ, 160 * MHZ, 200 * MHZ, - 270 * MHZ, 320 * MHZ, 390 * MHZ, 450 * MHZ, - 510 * MHZ, 560 * MHZ, 640 * MHZ, 690 * MHZ, - 770 * MHZ, 870 * MHZ, 950 * MHZ, - }; - int band; - - for (band = 0; band < ARRAY_SIZE(freq_bands); ++band) - if (fout < freq_bands[band]) - break; - - dev_dbg(dsi->dev, "band %d\n", band); - - reg |= DSIM_FREQ_BAND(band); - } - - exynos_dsi_write(dsi, DSIM_PLLCTRL_REG, reg); - - timeout = 1000; - do { - if (timeout-- == 0) { - dev_err(dsi->dev, "PLL failed to stabilize\n"); - return 0; - } - reg = exynos_dsi_read(dsi, DSIM_STATUS_REG); - } while ((reg & DSIM_PLL_STABLE) == 0); - - return fout; -} - -static int exynos_dsi_enable_clock(struct exynos_dsi *dsi) -{ - unsigned long hs_clk, byte_clk, esc_clk; - unsigned long esc_div; - u32 reg; - - hs_clk = exynos_dsi_set_pll(dsi, dsi->burst_clk_rate); - if (!hs_clk) { - dev_err(dsi->dev, "failed to configure DSI PLL\n"); - return -EFAULT; - } - - byte_clk = hs_clk / 8; - esc_div = DIV_ROUND_UP(byte_clk, dsi->esc_clk_rate); - esc_clk = byte_clk / esc_div; - - if (esc_clk > 20 * MHZ) { - ++esc_div; - esc_clk = byte_clk / esc_div; - } - - dev_dbg(dsi->dev, "hs_clk = %lu, byte_clk = %lu, esc_clk = %lu\n", - hs_clk, byte_clk, esc_clk); - - reg = exynos_dsi_read(dsi, DSIM_CLKCTRL_REG); - reg &= ~(DSIM_ESC_PRESCALER_MASK | DSIM_LANE_ESC_CLK_EN_CLK - | DSIM_LANE_ESC_CLK_EN_DATA_MASK | DSIM_PLL_BYPASS - | DSIM_BYTE_CLK_SRC_MASK); - reg |= DSIM_ESC_CLKEN | DSIM_BYTE_CLKEN - | DSIM_ESC_PRESCALER(esc_div) - | DSIM_LANE_ESC_CLK_EN_CLK - | DSIM_LANE_ESC_CLK_EN_DATA(BIT(dsi->lanes) - 1) - | DSIM_BYTE_CLK_SRC(0) - | DSIM_TX_REQUEST_HSCLK; - exynos_dsi_write(dsi, DSIM_CLKCTRL_REG, reg); - - return 0; -} - -static void exynos_dsi_set_phy_ctrl(struct exynos_dsi *dsi) -{ - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - const unsigned int *reg_values = driver_data->reg_values; - u32 reg; - - if (driver_data->has_freqband) - 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]; - exynos_dsi_write(dsi, DSIM_PHYCTRL_REG, reg); - - /* - * T LPX: Transmitted length of any Low-Power state period - * T HS-EXIT: Time that the transmitter drives LP-11 following a HS - * burst - */ - reg = reg_values[PHYTIMING_LPX] | reg_values[PHYTIMING_HS_EXIT]; - exynos_dsi_write(dsi, DSIM_PHYTIMING_REG, reg); - - /* - * T CLK-PREPARE: Time that the transmitter drives the Clock Lane LP-00 - * Line state immediately before the HS-0 Line state starting the - * HS transmission - * T CLK-ZERO: Time that the transmitter drives the HS-0 state prior to - * transmitting the Clock. - * T CLK_POST: Time that the transmitter continues to send HS clock - * after the last associated Data Lane has transitioned to LP Mode - * Interval is defined as the period from the end of T HS-TRAIL to - * the beginning of T CLK-TRAIL - * 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]; - - exynos_dsi_write(dsi, DSIM_PHYTIMING1_REG, reg); - - /* - * T HS-PREPARE: Time that the transmitter drives the Data Lane LP-00 - * Line state immediately before the HS-0 Line state starting the - * HS transmission - * T HS-ZERO: Time that the transmitter drives the HS-0 state prior to - * transmitting the Sync sequence. - * 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]; - exynos_dsi_write(dsi, DSIM_PHYTIMING2_REG, reg); -} - -static void exynos_dsi_disable_clock(struct exynos_dsi *dsi) -{ - u32 reg; - - reg = exynos_dsi_read(dsi, DSIM_CLKCTRL_REG); - reg &= ~(DSIM_LANE_ESC_CLK_EN_CLK | DSIM_LANE_ESC_CLK_EN_DATA_MASK - | DSIM_ESC_CLKEN | DSIM_BYTE_CLKEN); - exynos_dsi_write(dsi, DSIM_CLKCTRL_REG, reg); - - reg = exynos_dsi_read(dsi, DSIM_PLLCTRL_REG); - reg &= ~DSIM_PLL_EN; - exynos_dsi_write(dsi, DSIM_PLLCTRL_REG, reg); -} - -static void exynos_dsi_enable_lane(struct exynos_dsi *dsi, u32 lane) -{ - u32 reg = exynos_dsi_read(dsi, DSIM_CONFIG_REG); - reg |= (DSIM_NUM_OF_DATA_LANE(dsi->lanes - 1) | DSIM_LANE_EN_CLK | - DSIM_LANE_EN(lane)); - exynos_dsi_write(dsi, DSIM_CONFIG_REG, reg); -} - -static int exynos_dsi_init_link(struct exynos_dsi *dsi) -{ - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - int timeout; - u32 reg; - u32 lanes_mask; - - /* Initialize FIFO pointers */ - reg = exynos_dsi_read(dsi, DSIM_FIFOCTRL_REG); - reg &= ~0x1f; - exynos_dsi_write(dsi, DSIM_FIFOCTRL_REG, reg); - - usleep_range(9000, 11000); - - reg |= 0x1f; - exynos_dsi_write(dsi, DSIM_FIFOCTRL_REG, reg); - usleep_range(9000, 11000); - - /* DSI configuration */ - reg = 0; - - /* - * The first bit of mode_flags specifies display configuration. - * If this bit is set[= MIPI_DSI_MODE_VIDEO], dsi will support video - * mode, otherwise it will support command mode. - */ - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) { - reg |= DSIM_VIDEO_MODE; - - /* - * The user manual describes that following bits are ignored in - * command mode. - */ - if (!(dsi->mode_flags & MIPI_DSI_MODE_VSYNC_FLUSH)) - reg |= DSIM_MFLUSH_VS; - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) - reg |= DSIM_SYNC_INFORM; - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) - reg |= DSIM_BURST_MODE; - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_AUTO_VERT) - reg |= DSIM_AUTO_MODE; - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HSE) - reg |= DSIM_HSE_MODE; - if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HFP)) - reg |= DSIM_HFP_MODE; - if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HBP)) - reg |= DSIM_HBP_MODE; - if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HSA)) - reg |= DSIM_HSA_MODE; - } - - if (!(dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET)) - reg |= DSIM_EOT_DISABLE; - - switch (dsi->format) { - case MIPI_DSI_FMT_RGB888: - reg |= DSIM_MAIN_PIX_FORMAT_RGB888; - break; - case MIPI_DSI_FMT_RGB666: - reg |= DSIM_MAIN_PIX_FORMAT_RGB666; - break; - case MIPI_DSI_FMT_RGB666_PACKED: - reg |= DSIM_MAIN_PIX_FORMAT_RGB666_P; - break; - case MIPI_DSI_FMT_RGB565: - reg |= DSIM_MAIN_PIX_FORMAT_RGB565; - break; - default: - dev_err(dsi->dev, "invalid pixel format\n"); - return -EINVAL; - } - - /* - * Use non-continuous clock mode if the periparal wants and - * host controller supports - * - * In non-continous clock mode, host controller will turn off - * the HS clock between high-speed transmissions to reduce - * power consumption. - */ - if (driver_data->has_clklane_stop && - dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) { - reg |= DSIM_CLKLANE_STOP; - } - exynos_dsi_write(dsi, DSIM_CONFIG_REG, reg); - - lanes_mask = BIT(dsi->lanes) - 1; - exynos_dsi_enable_lane(dsi, lanes_mask); - - /* Check clock and data lane state are stop state */ - timeout = 100; - do { - if (timeout-- == 0) { - dev_err(dsi->dev, "waiting for bus lanes timed out\n"); - return -EFAULT; - } - - reg = exynos_dsi_read(dsi, DSIM_STATUS_REG); - if ((reg & DSIM_STOP_STATE_DAT(lanes_mask)) - != DSIM_STOP_STATE_DAT(lanes_mask)) - continue; - } while (!(reg & (DSIM_STOP_STATE_CLK | DSIM_TX_READY_HS_CLK))); - - reg = exynos_dsi_read(dsi, DSIM_ESCMODE_REG); - reg &= ~DSIM_STOP_STATE_CNT_MASK; - reg |= DSIM_STOP_STATE_CNT(driver_data->reg_values[STOP_STATE_CNT]); - exynos_dsi_write(dsi, DSIM_ESCMODE_REG, reg); - - reg = DSIM_BTA_TIMEOUT(0xff) | DSIM_LPDR_TIMEOUT(0xffff); - exynos_dsi_write(dsi, DSIM_TIMEOUT_REG, reg); - - return 0; -} - -static void exynos_dsi_set_display_mode(struct exynos_dsi *dsi) -{ - struct drm_display_mode *m = &dsi->mode; - unsigned int num_bits_resol = dsi->driver_data->num_bits_resol; - u32 reg; - - if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) { - reg = DSIM_CMD_ALLOW(0xf) - | DSIM_STABLE_VFP(m->vsync_start - m->vdisplay) - | DSIM_MAIN_VBP(m->vtotal - m->vsync_end); - exynos_dsi_write(dsi, DSIM_MVPORCH_REG, reg); - - reg = DSIM_MAIN_HFP(m->hsync_start - m->hdisplay) - | DSIM_MAIN_HBP(m->htotal - m->hsync_end); - exynos_dsi_write(dsi, DSIM_MHPORCH_REG, reg); - - reg = DSIM_MAIN_VSA(m->vsync_end - m->vsync_start) - | DSIM_MAIN_HSA(m->hsync_end - m->hsync_start); - exynos_dsi_write(dsi, DSIM_MSYNC_REG, reg); - } - reg = DSIM_MAIN_HRESOL(m->hdisplay, num_bits_resol) | - DSIM_MAIN_VRESOL(m->vdisplay, num_bits_resol); - - exynos_dsi_write(dsi, DSIM_MDRESOL_REG, reg); - - dev_dbg(dsi->dev, "LCD size = %dx%d\n", m->hdisplay, m->vdisplay); -} - -static void exynos_dsi_set_display_enable(struct exynos_dsi *dsi, bool enable) -{ - u32 reg; - - reg = exynos_dsi_read(dsi, DSIM_MDRESOL_REG); - if (enable) - reg |= DSIM_MAIN_STAND_BY; - else - reg &= ~DSIM_MAIN_STAND_BY; - exynos_dsi_write(dsi, DSIM_MDRESOL_REG, reg); -} - -static int exynos_dsi_wait_for_hdr_fifo(struct exynos_dsi *dsi) -{ - int timeout = 2000; - - do { - u32 reg = exynos_dsi_read(dsi, DSIM_FIFOCTRL_REG); - - if (!(reg & DSIM_SFR_HEADER_FULL)) - return 0; - - if (!cond_resched()) - usleep_range(950, 1050); - } while (--timeout); - - return -ETIMEDOUT; -} - -static void exynos_dsi_set_cmd_lpm(struct exynos_dsi *dsi, bool lpm) -{ - u32 v = exynos_dsi_read(dsi, DSIM_ESCMODE_REG); - - if (lpm) - v |= DSIM_CMD_LPDT_LP; - else - v &= ~DSIM_CMD_LPDT_LP; - - exynos_dsi_write(dsi, DSIM_ESCMODE_REG, v); -} - -static void exynos_dsi_force_bta(struct exynos_dsi *dsi) -{ - u32 v = exynos_dsi_read(dsi, DSIM_ESCMODE_REG); - v |= DSIM_FORCE_BTA; - exynos_dsi_write(dsi, DSIM_ESCMODE_REG, v); -} - -static void exynos_dsi_send_to_fifo(struct exynos_dsi *dsi, - struct exynos_dsi_transfer *xfer) -{ - struct device *dev = dsi->dev; - struct mipi_dsi_packet *pkt = &xfer->packet; - const u8 *payload = pkt->payload + xfer->tx_done; - u16 length = pkt->payload_length - xfer->tx_done; - bool first = !xfer->tx_done; - u32 reg; - - dev_dbg(dev, "< xfer %pK: tx len %u, done %u, rx len %u, done %u\n", - xfer, length, xfer->tx_done, xfer->rx_len, xfer->rx_done); - - if (length > DSI_TX_FIFO_SIZE) - length = DSI_TX_FIFO_SIZE; - - xfer->tx_done += length; - - /* Send payload */ - while (length >= 4) { - reg = get_unaligned_le32(payload); - exynos_dsi_write(dsi, DSIM_PAYLOAD_REG, reg); - payload += 4; - length -= 4; - } - - reg = 0; - switch (length) { - case 3: - reg |= payload[2] << 16; - fallthrough; - case 2: - reg |= payload[1] << 8; - fallthrough; - case 1: - reg |= payload[0]; - exynos_dsi_write(dsi, DSIM_PAYLOAD_REG, reg); - break; - } - - /* Send packet header */ - if (!first) - return; - - reg = get_unaligned_le32(pkt->header); - if (exynos_dsi_wait_for_hdr_fifo(dsi)) { - dev_err(dev, "waiting for header FIFO timed out\n"); - return; - } - - if (NEQV(xfer->flags & MIPI_DSI_MSG_USE_LPM, - dsi->state & DSIM_STATE_CMD_LPM)) { - exynos_dsi_set_cmd_lpm(dsi, xfer->flags & MIPI_DSI_MSG_USE_LPM); - dsi->state ^= DSIM_STATE_CMD_LPM; - } - - exynos_dsi_write(dsi, DSIM_PKTHDR_REG, reg); - - if (xfer->flags & MIPI_DSI_MSG_REQ_ACK) - exynos_dsi_force_bta(dsi); -} - -static void exynos_dsi_read_from_fifo(struct exynos_dsi *dsi, - struct exynos_dsi_transfer *xfer) -{ - u8 *payload = xfer->rx_payload + xfer->rx_done; - bool first = !xfer->rx_done; - struct device *dev = dsi->dev; - u16 length; - u32 reg; - - if (first) { - reg = exynos_dsi_read(dsi, DSIM_RXFIFO_REG); - - switch (reg & 0x3f) { - case MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_2BYTE: - case MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_2BYTE: - if (xfer->rx_len >= 2) { - payload[1] = reg >> 16; - ++xfer->rx_done; - } - fallthrough; - case MIPI_DSI_RX_GENERIC_SHORT_READ_RESPONSE_1BYTE: - case MIPI_DSI_RX_DCS_SHORT_READ_RESPONSE_1BYTE: - payload[0] = reg >> 8; - ++xfer->rx_done; - xfer->rx_len = xfer->rx_done; - xfer->result = 0; - goto clear_fifo; - case MIPI_DSI_RX_ACKNOWLEDGE_AND_ERROR_REPORT: - dev_err(dev, "DSI Error Report: 0x%04x\n", - (reg >> 8) & 0xffff); - xfer->result = 0; - goto clear_fifo; - } - - length = (reg >> 8) & 0xffff; - if (length > xfer->rx_len) { - dev_err(dev, - "response too long (%u > %u bytes), stripping\n", - xfer->rx_len, length); - length = xfer->rx_len; - } else if (length < xfer->rx_len) - xfer->rx_len = length; - } - - length = xfer->rx_len - xfer->rx_done; - xfer->rx_done += length; - - /* Receive payload */ - while (length >= 4) { - reg = exynos_dsi_read(dsi, DSIM_RXFIFO_REG); - payload[0] = (reg >> 0) & 0xff; - payload[1] = (reg >> 8) & 0xff; - payload[2] = (reg >> 16) & 0xff; - payload[3] = (reg >> 24) & 0xff; - payload += 4; - length -= 4; - } - - if (length) { - reg = exynos_dsi_read(dsi, DSIM_RXFIFO_REG); - switch (length) { - case 3: - payload[2] = (reg >> 16) & 0xff; - fallthrough; - case 2: - payload[1] = (reg >> 8) & 0xff; - fallthrough; - case 1: - payload[0] = reg & 0xff; - } - } - - if (xfer->rx_done == xfer->rx_len) - xfer->result = 0; + const struct samsung_dsim_plat_data *pdata = priv->plat_data; + struct exynos_dsi *dsi = pdata_to_dsi(pdata); -clear_fifo: - length = DSI_RX_FIFO_SIZE / 4; - do { - reg = exynos_dsi_read(dsi, DSIM_RXFIFO_REG); - if (reg == DSI_RX_FIFO_EMPTY) - break; - } while (--length); -} - -static void exynos_dsi_transfer_start(struct exynos_dsi *dsi) -{ - unsigned long flags; - struct exynos_dsi_transfer *xfer; - bool start = false; - -again: - spin_lock_irqsave(&dsi->transfer_lock, flags); - - if (list_empty(&dsi->transfer_list)) { - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - return; - } - - xfer = list_first_entry(&dsi->transfer_list, - struct exynos_dsi_transfer, list); - - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - - if (xfer->packet.payload_length && - xfer->tx_done == xfer->packet.payload_length) - /* waiting for RX */ - return; - - exynos_dsi_send_to_fifo(dsi, xfer); - - if (xfer->packet.payload_length || xfer->rx_len) - return; - - xfer->result = 0; - complete(&xfer->completed); - - spin_lock_irqsave(&dsi->transfer_lock, flags); - - list_del_init(&xfer->list); - start = !list_empty(&dsi->transfer_list); - - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - - if (start) - goto again; -} - -static bool exynos_dsi_transfer_finish(struct exynos_dsi *dsi) -{ - struct exynos_dsi_transfer *xfer; - unsigned long flags; - bool start = true; - - spin_lock_irqsave(&dsi->transfer_lock, flags); - - if (list_empty(&dsi->transfer_list)) { - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - return false; - } - - xfer = list_first_entry(&dsi->transfer_list, - struct exynos_dsi_transfer, list); - - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - - dev_dbg(dsi->dev, - "> xfer %pK, tx_len %zu, tx_done %u, rx_len %u, rx_done %u\n", - xfer, xfer->packet.payload_length, xfer->tx_done, xfer->rx_len, - xfer->rx_done); - - if (xfer->tx_done != xfer->packet.payload_length) - return true; - - if (xfer->rx_done != xfer->rx_len) - exynos_dsi_read_from_fifo(dsi, xfer); - - if (xfer->rx_done != xfer->rx_len) - return true; - - spin_lock_irqsave(&dsi->transfer_lock, flags); - - list_del_init(&xfer->list); - start = !list_empty(&dsi->transfer_list); - - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - - if (!xfer->rx_len) - xfer->result = 0; - complete(&xfer->completed); - - return start; -} - -static void exynos_dsi_remove_transfer(struct exynos_dsi *dsi, - struct exynos_dsi_transfer *xfer) -{ - unsigned long flags; - bool start; - - spin_lock_irqsave(&dsi->transfer_lock, flags); - - if (!list_empty(&dsi->transfer_list) && - xfer == list_first_entry(&dsi->transfer_list, - struct exynos_dsi_transfer, list)) { - list_del_init(&xfer->list); - start = !list_empty(&dsi->transfer_list); - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - if (start) - exynos_dsi_transfer_start(dsi); - return; - } - - list_del_init(&xfer->list); - - spin_unlock_irqrestore(&dsi->transfer_lock, flags); + if (dsi->te_gpio) + enable_irq(gpiod_to_irq(dsi->te_gpio)); } -static int exynos_dsi_transfer(struct exynos_dsi *dsi, - struct exynos_dsi_transfer *xfer) +static void exynos_dsi_disable_irq(struct samsung_dsim *priv) { - unsigned long flags; - bool stopped; - - xfer->tx_done = 0; - xfer->rx_done = 0; - xfer->result = -ETIMEDOUT; - init_completion(&xfer->completed); - - spin_lock_irqsave(&dsi->transfer_lock, flags); - - stopped = list_empty(&dsi->transfer_list); - list_add_tail(&xfer->list, &dsi->transfer_list); - - spin_unlock_irqrestore(&dsi->transfer_lock, flags); - - if (stopped) - exynos_dsi_transfer_start(dsi); - - wait_for_completion_timeout(&xfer->completed, - msecs_to_jiffies(DSI_XFER_TIMEOUT_MS)); - if (xfer->result == -ETIMEDOUT) { - struct mipi_dsi_packet *pkt = &xfer->packet; - exynos_dsi_remove_transfer(dsi, xfer); - dev_err(dsi->dev, "xfer timed out: %*ph %*ph\n", 4, pkt->header, - (int)pkt->payload_length, pkt->payload); - return -ETIMEDOUT; - } + const struct samsung_dsim_plat_data *pdata = priv->plat_data; + struct exynos_dsi *dsi = pdata_to_dsi(pdata); - /* Also covers hardware timeout condition */ - return xfer->result; + if (dsi->te_gpio) + disable_irq(gpiod_to_irq(dsi->te_gpio)); } -static irqreturn_t exynos_dsi_irq(int irq, void *dev_id) -{ - struct exynos_dsi *dsi = dev_id; - u32 status; - - status = exynos_dsi_read(dsi, DSIM_INTSRC_REG); - if (!status) { - static unsigned long int j; - if (printk_timed_ratelimit(&j, 500)) - dev_warn(dsi->dev, "spurious interrupt\n"); - return IRQ_HANDLED; - } - exynos_dsi_write(dsi, DSIM_INTSRC_REG, status); - - if (status & DSIM_INT_SW_RST_RELEASE) { - u32 mask = ~(DSIM_INT_RX_DONE | DSIM_INT_SFR_FIFO_EMPTY | - DSIM_INT_SFR_HDR_FIFO_EMPTY | DSIM_INT_RX_ECC_ERR | - DSIM_INT_SW_RST_RELEASE); - exynos_dsi_write(dsi, DSIM_INTMSK_REG, mask); - complete(&dsi->completed); - return IRQ_HANDLED; - } - - if (!(status & (DSIM_INT_RX_DONE | DSIM_INT_SFR_FIFO_EMPTY | - DSIM_INT_PLL_STABLE))) - return IRQ_HANDLED; - - if (exynos_dsi_transfer_finish(dsi)) - exynos_dsi_transfer_start(dsi); - - return IRQ_HANDLED; -} +static const struct samsung_dsim_irq_ops samsung_dsim_exynos_host_irq = { + .enable = exynos_dsi_enable_irq, + .disable = exynos_dsi_disable_irq, +}; static irqreturn_t exynos_dsi_te_irq_handler(int irq, void *dev_id) { struct exynos_dsi *dsi = (struct exynos_dsi *)dev_id; + struct samsung_dsim *priv = dsi->priv; struct drm_encoder *encoder = &dsi->encoder; - if (dsi->state & DSIM_STATE_VIDOUT_AVAILABLE) + if (priv->state & DSIM_STATE_VIDOUT_AVAILABLE) exynos_drm_crtc_te_handler(encoder->crtc); return IRQ_HANDLED; } -static void exynos_dsi_enable_irq(struct exynos_dsi *dsi) -{ - enable_irq(dsi->irq); - - if (dsi->te_gpio) - enable_irq(gpiod_to_irq(dsi->te_gpio)); -} - -static void exynos_dsi_disable_irq(struct exynos_dsi *dsi) -{ - if (dsi->te_gpio) - disable_irq(gpiod_to_irq(dsi->te_gpio)); - - disable_irq(dsi->irq); -} - -static int exynos_dsi_init(struct exynos_dsi *dsi) -{ - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - - exynos_dsi_reset(dsi); - exynos_dsi_enable_irq(dsi); - - if (driver_data->reg_values[RESET_TYPE] == DSIM_FUNCRST) - exynos_dsi_enable_lane(dsi, BIT(dsi->lanes) - 1); - - exynos_dsi_enable_clock(dsi); - if (driver_data->wait_for_reset) - exynos_dsi_wait_for_reset(dsi); - exynos_dsi_set_phy_ctrl(dsi); - exynos_dsi_init_link(dsi); - - return 0; -} - -static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, - struct device *panel) +static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, struct device *panel) { - int ret; + struct samsung_dsim *priv = dsi->priv; int te_gpio_irq; + int ret; - dsi->te_gpio = gpiod_get_optional(panel, "te", GPIOD_IN); + dsi->te_gpio = devm_gpiod_get_optional(panel, "te", GPIOD_IN); if (!dsi->te_gpio) { return 0; } else if (IS_ERR(dsi->te_gpio)) { - dev_err(dsi->dev, "gpio request failed with %ld\n", + dev_err(priv->dev, "gpio request failed with %ld\n", PTR_ERR(dsi->te_gpio)); return PTR_ERR(dsi->te_gpio); } @@ -1345,7 +86,7 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, ret = request_threaded_irq(te_gpio_irq, exynos_dsi_te_irq_handler, NULL, IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN, "TE", dsi); if (ret) { - dev_err(dsi->dev, "request interrupt failed with %d\n", ret); + dev_err(priv->dev, "request interrupt failed with %d\n", ret); gpiod_put(dsi->te_gpio); return ret; } @@ -1361,121 +102,15 @@ static void exynos_dsi_unregister_te_irq(struct exynos_dsi *dsi) } } -static void exynos_dsi_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) -{ - struct exynos_dsi *dsi = bridge_to_dsi(bridge); - int ret; - - if (dsi->state & DSIM_STATE_ENABLED) - return; - - ret = pm_runtime_resume_and_get(dsi->dev); - if (ret < 0) { - dev_err(dsi->dev, "failed to enable DSI device.\n"); - return; - } - - dsi->state |= DSIM_STATE_ENABLED; -} - -static void exynos_dsi_atomic_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) -{ - struct exynos_dsi *dsi = bridge_to_dsi(bridge); - - exynos_dsi_set_display_mode(dsi); - exynos_dsi_set_display_enable(dsi, true); - - dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE; - - return; -} - -static void exynos_dsi_atomic_disable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) -{ - struct exynos_dsi *dsi = bridge_to_dsi(bridge); - - if (!(dsi->state & DSIM_STATE_ENABLED)) - return; - - dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE; -} - -static void exynos_dsi_atomic_post_disable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) -{ - struct exynos_dsi *dsi = bridge_to_dsi(bridge); - - exynos_dsi_set_display_enable(dsi, false); - - dsi->state &= ~DSIM_STATE_ENABLED; - pm_runtime_put_sync(dsi->dev); -} - -static void exynos_dsi_mode_set(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode) -{ - struct exynos_dsi *dsi = bridge_to_dsi(bridge); - - drm_mode_copy(&dsi->mode, adjusted_mode); -} - -static int exynos_dsi_attach(struct drm_bridge *bridge, - enum drm_bridge_attach_flags flags) -{ - struct exynos_dsi *dsi = bridge_to_dsi(bridge); - - return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, - flags); -} - -static const struct drm_bridge_funcs exynos_dsi_bridge_funcs = { - .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, - .atomic_reset = drm_atomic_helper_bridge_reset, - .atomic_pre_enable = exynos_dsi_atomic_pre_enable, - .atomic_enable = exynos_dsi_atomic_enable, - .atomic_disable = exynos_dsi_atomic_disable, - .atomic_post_disable = exynos_dsi_atomic_post_disable, - .mode_set = exynos_dsi_mode_set, - .attach = exynos_dsi_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) +static int exynos_dsi_host_attach(struct samsung_dsim *priv, struct mipi_dsi_device *device) { - struct exynos_dsi *dsi = host_to_dsi(host); - struct device *dev = dsi->dev; + const struct samsung_dsim_plat_data *pdata = priv->plat_data; + struct exynos_dsi *dsi = pdata_to_dsi(pdata); struct drm_encoder *encoder = &dsi->encoder; struct drm_device *drm = encoder->dev; - struct drm_panel *panel; int ret; - panel = of_drm_find_panel(device->dev.of_node); - if (!IS_ERR(panel)) { - dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel); - } else { - dsi->out_bridge = of_drm_find_bridge(device->dev.of_node); - if (!dsi->out_bridge) - dsi->out_bridge = ERR_PTR(-EINVAL); - } - - if (IS_ERR(dsi->out_bridge)) { - ret = PTR_ERR(dsi->out_bridge); - DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret); - return ret; - } - - DRM_DEV_INFO(dev, "Attached %s device\n", device->name); - - drm_bridge_add(&dsi->bridge); - - drm_bridge_attach(encoder, &dsi->bridge, + drm_bridge_attach(encoder, &priv->bridge, list_first_entry_or_null(&encoder->bridge_chain, struct drm_bridge, chain_node), 0); @@ -1494,11 +129,11 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, mutex_lock(&drm->mode_config.mutex); - dsi->lanes = device->lanes; - dsi->format = device->format; - dsi->mode_flags = device->mode_flags; + priv->lanes = device->lanes; + priv->format = device->format; + priv->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); + !(priv->mode_flags & MIPI_DSI_MODE_VIDEO); mutex_unlock(&drm->mode_config.mutex); @@ -1508,100 +143,30 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, return 0; } -static int exynos_dsi_host_detach(struct mipi_dsi_host *host, - struct mipi_dsi_device *device) +static int exynos_dsi_host_detach(struct samsung_dsim *priv, struct mipi_dsi_device *device) { - struct exynos_dsi *dsi = host_to_dsi(host); + const struct samsung_dsim_plat_data *pdata = priv->plat_data; + struct exynos_dsi *dsi = pdata_to_dsi(pdata); struct drm_device *drm = dsi->encoder.dev; - if (dsi->out_bridge->funcs->detach) - dsi->out_bridge->funcs->detach(dsi->out_bridge); - dsi->out_bridge = NULL; - if (drm->mode_config.poll_enabled) drm_kms_helper_hotplug_event(drm); exynos_dsi_unregister_te_irq(dsi); - drm_bridge_remove(&dsi->bridge); - return 0; } -static ssize_t exynos_dsi_host_transfer(struct mipi_dsi_host *host, - const struct mipi_dsi_msg *msg) -{ - struct exynos_dsi *dsi = host_to_dsi(host); - struct exynos_dsi_transfer xfer; - int ret; - - if (!(dsi->state & DSIM_STATE_ENABLED)) - return -EINVAL; - - if (!(dsi->state & DSIM_STATE_INITIALIZED)) { - ret = exynos_dsi_init(dsi); - if (ret) - return ret; - dsi->state |= DSIM_STATE_INITIALIZED; - } - - ret = mipi_dsi_create_packet(&xfer.packet, msg); - if (ret < 0) - return ret; - - xfer.rx_len = msg->rx_len; - xfer.rx_payload = msg->rx_buf; - xfer.flags = msg->flags; - - ret = exynos_dsi_transfer(dsi, &xfer); - return (ret < 0) ? ret : xfer.rx_done; -} - -static const struct mipi_dsi_host_ops exynos_dsi_ops = { +static const struct samsung_dsim_host_ops samsung_dsim_exynos_host_ops = { .attach = exynos_dsi_host_attach, .detach = exynos_dsi_host_detach, - .transfer = exynos_dsi_host_transfer, }; -static int exynos_dsi_of_read_u32(const struct device_node *np, - const char *propname, u32 *out_value) -{ - int ret = of_property_read_u32(np, propname, out_value); - - if (ret < 0) - pr_err("%pOF: failed to get '%s' property\n", np, propname); - - return ret; -} - -static int exynos_dsi_parse_dt(struct exynos_dsi *dsi) -{ - struct device *dev = dsi->dev; - struct device_node *node = dev->of_node; - int ret; - - ret = exynos_dsi_of_read_u32(node, "samsung,pll-clock-frequency", - &dsi->pll_clk_rate); - if (ret < 0) - return ret; - - ret = exynos_dsi_of_read_u32(node, "samsung,burst-clock-frequency", - &dsi->burst_clk_rate); - if (ret < 0) - return ret; - - ret = exynos_dsi_of_read_u32(node, "samsung,esc-clock-frequency", - &dsi->esc_clk_rate); - if (ret < 0) - return ret; - - return 0; -} - -static int exynos_dsi_bind(struct device *dev, struct device *master, - void *data) +static int exynos_dsi_bind(struct device *dev, struct device *master, void *data) { - struct exynos_dsi *dsi = dev_get_drvdata(dev); + struct samsung_dsim *priv = dev_get_drvdata(dev); + const struct samsung_dsim_plat_data *pdata = priv->plat_data; + struct exynos_dsi *dsi = pdata_to_dsi(pdata); struct drm_encoder *encoder = &dsi->encoder; struct drm_device *drm_dev = data; int ret; @@ -1612,17 +177,16 @@ static int exynos_dsi_bind(struct device *dev, struct device *master, if (ret < 0) return ret; - return mipi_dsi_host_register(&dsi->dsi_host); + return mipi_dsi_host_register(&priv->dsi_host); } -static void exynos_dsi_unbind(struct device *dev, struct device *master, - void *data) +static void exynos_dsi_unbind(struct device *dev, struct device *master, void *data) { - struct exynos_dsi *dsi = dev_get_drvdata(dev); + struct samsung_dsim *priv = dev_get_drvdata(dev); - exynos_dsi_atomic_disable(&dsi->bridge, NULL); + priv->bridge.funcs->atomic_disable(&priv->bridge, NULL); - mipi_dsi_host_unregister(&dsi->dsi_host); + mipi_dsi_host_unregister(&priv->dsi_host); } static const struct component_ops exynos_dsi_component_ops = { @@ -1630,192 +194,33 @@ static const struct component_ops exynos_dsi_component_ops = { .unbind = exynos_dsi_unbind, }; -static int exynos_dsi_probe(struct platform_device *pdev) +int samsung_dsim_plat_probe(struct samsung_dsim *priv) { - struct device *dev = &pdev->dev; struct exynos_dsi *dsi; - int ret, i; + int ret; - dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL); + dsi = devm_kzalloc(priv->dev, sizeof(*dsi), GFP_KERNEL); if (!dsi) return -ENOMEM; - init_completion(&dsi->completed); - spin_lock_init(&dsi->transfer_lock); - INIT_LIST_HEAD(&dsi->transfer_list); - - dsi->dsi_host.ops = &exynos_dsi_ops; - dsi->dsi_host.dev = dev; - - dsi->dev = dev; - dsi->driver_data = of_device_get_match_data(dev); - - dsi->supplies[0].supply = "vddcore"; - dsi->supplies[1].supply = "vddio"; - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(dsi->supplies), - dsi->supplies); - if (ret) - return dev_err_probe(dev, ret, "failed to get regulators\n"); - - dsi->clks = devm_kcalloc(dev, - dsi->driver_data->num_clks, sizeof(*dsi->clks), - GFP_KERNEL); - if (!dsi->clks) - return -ENOMEM; - - for (i = 0; i < dsi->driver_data->num_clks; i++) { - dsi->clks[i] = devm_clk_get(dev, clk_names[i]); - if (IS_ERR(dsi->clks[i])) { - if (strcmp(clk_names[i], "sclk_mipi") == 0) { - dsi->clks[i] = devm_clk_get(dev, - OLD_SCLK_MIPI_CLK_NAME); - if (!IS_ERR(dsi->clks[i])) - continue; - } - - dev_info(dev, "failed to get the clock: %s\n", - clk_names[i]); - return PTR_ERR(dsi->clks[i]); - } - } - - dsi->reg_base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(dsi->reg_base)) - return PTR_ERR(dsi->reg_base); + dsi->pdata.host_ops = &samsung_dsim_exynos_host_ops; + dsi->pdata.irq_ops = &samsung_dsim_exynos_host_irq; + dsi->priv = priv; - 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); - } - - dsi->irq = platform_get_irq(pdev, 0); - if (dsi->irq < 0) - return dsi->irq; + priv->plat_data = &dsi->pdata; - ret = devm_request_threaded_irq(dev, dsi->irq, NULL, - exynos_dsi_irq, - IRQF_ONESHOT | IRQF_NO_AUTOEN, - dev_name(dev), dsi); - if (ret) { - dev_err(dev, "failed to request dsi irq\n"); - return ret; - } - - ret = exynos_dsi_parse_dt(dsi); + ret = component_add(priv->dev, &exynos_dsi_component_ops); if (ret) return ret; - platform_set_drvdata(pdev, dsi); - - pm_runtime_enable(dev); - - dsi->bridge.funcs = &exynos_dsi_bridge_funcs; - dsi->bridge.of_node = dev->of_node; - dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; - - ret = component_add(dev, &exynos_dsi_component_ops); - if (ret) - goto err_disable_runtime; - - return 0; - -err_disable_runtime: - pm_runtime_disable(dev); - - return ret; -} - -static int exynos_dsi_remove(struct platform_device *pdev) -{ - pm_runtime_disable(&pdev->dev); - - component_del(&pdev->dev, &exynos_dsi_component_ops); - - return 0; -} - -static int __maybe_unused exynos_dsi_suspend(struct device *dev) -{ - struct exynos_dsi *dsi = dev_get_drvdata(dev); - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - int ret, i; - - usleep_range(10000, 20000); - - if (dsi->state & DSIM_STATE_INITIALIZED) { - dsi->state &= ~DSIM_STATE_INITIALIZED; - - exynos_dsi_disable_clock(dsi); - - exynos_dsi_disable_irq(dsi); - } - - dsi->state &= ~DSIM_STATE_CMD_LPM; - - phy_power_off(dsi->phy); - - for (i = driver_data->num_clks - 1; i > -1; i--) - clk_disable_unprepare(dsi->clks[i]); - - ret = regulator_bulk_disable(ARRAY_SIZE(dsi->supplies), dsi->supplies); - if (ret < 0) - dev_err(dsi->dev, "cannot disable regulators %d\n", ret); - return 0; } -static int __maybe_unused exynos_dsi_resume(struct device *dev) +void samsung_dsim_plat_remove(struct samsung_dsim *priv) { - struct exynos_dsi *dsi = dev_get_drvdata(dev); - const struct exynos_dsi_driver_data *driver_data = dsi->driver_data; - int ret, i; - - ret = regulator_bulk_enable(ARRAY_SIZE(dsi->supplies), dsi->supplies); - if (ret < 0) { - dev_err(dsi->dev, "cannot enable regulators %d\n", ret); - return ret; - } - - for (i = 0; i < driver_data->num_clks; i++) { - ret = clk_prepare_enable(dsi->clks[i]); - if (ret < 0) - goto err_clk; - } - - ret = phy_power_on(dsi->phy); - if (ret < 0) { - dev_err(dsi->dev, "cannot enable phy %d\n", ret); - goto err_clk; - } - - return 0; - -err_clk: - while (--i > -1) - clk_disable_unprepare(dsi->clks[i]); - regulator_bulk_disable(ARRAY_SIZE(dsi->supplies), dsi->supplies); - - return ret; + component_del(priv->dev, &exynos_dsi_component_ops); } -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/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h new file mode 100644 index 000000000000..2e245bffd1b6 --- /dev/null +++ b/include/drm/bridge/samsung-dsim.h @@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2022 Amarula Solutions(India) + * Author: Jagan Teki <jagan@amarulasolutions.com> + */ + +#ifndef __SAMSUNG_DSIM__ +#define __SAMSUNG_DSIM__ + +#include <linux/regulator/consumer.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_mipi_dsi.h> + +struct samsung_dsim; + +#define DSIM_STATE_ENABLED BIT(0) +#define DSIM_STATE_INITIALIZED BIT(1) +#define DSIM_STATE_CMD_LPM BIT(2) +#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3) + +struct samsung_dsim_transfer { + struct list_head list; + struct completion completed; + int result; + struct mipi_dsi_packet packet; + u16 flags; + u16 tx_done; + + u8 *rx_payload; + u16 rx_len; + u16 rx_done; +}; + +struct samsung_dsim_driver_data { + const unsigned int *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; +}; + +struct samsung_dsim_host_ops { + int (*attach)(struct samsung_dsim *priv, struct mipi_dsi_device *device); + int (*detach)(struct samsung_dsim *priv, struct mipi_dsi_device *device); +}; + +struct samsung_dsim_irq_ops { + void (*enable)(struct samsung_dsim *priv); + void (*disable)(struct samsung_dsim *priv); +}; + +struct samsung_dsim_plat_data { + const struct samsung_dsim_host_ops *host_ops; + const struct samsung_dsim_irq_ops *irq_ops; + + void *priv; +}; + +struct samsung_dsim { + struct mipi_dsi_host dsi_host; + struct drm_bridge bridge; + struct drm_bridge *out_bridge; + struct device *dev; + struct drm_display_mode mode; + + void __iomem *reg_base; + struct phy *phy; + struct clk **clks; + struct regulator_bulk_data supplies[2]; + int irq; + + u32 pll_clk_rate; + u32 burst_clk_rate; + u32 esc_clk_rate; + u32 lanes; + u32 mode_flags; + u32 format; + + int state; + struct drm_property *brightness; + struct completion completed; + + spinlock_t transfer_lock; /* protects transfer_list */ + struct list_head transfer_list; + + const struct samsung_dsim_driver_data *driver_data; + const struct samsung_dsim_plat_data *plat_data; +}; + +int samsung_dsim_plat_probe(struct samsung_dsim *priv); +void samsung_dsim_plat_remove(struct samsung_dsim *priv); + +#endif /* __SAMSUNG_DSIM__ */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-08-29 18:40 ` [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki 2022-09-02 10:47 ` Marek Szyprowski @ 2022-09-02 10:47 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-02 10:47 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula On 29.08.2022 20:40, Jagan Teki wrote: > Samsung MIPI DSIM controller is common DSI IP that can be used in various > SoCs like Exynos, i.MX8M Mini/Nano. > > In order to access this DSI controller between various platform SoCs, > the ideal way to incorporate this in the drm stack is via the drm bridge > driver. > > This patch is trying to differentiate platform-specific and bridge driver > code and keep maintaining the exynos_drm_dsi.c code as platform-specific > glue code and samsung-dsim.c as a common bridge driver code. > > - Exynos specific glue code is exynos specific te_irq, host_attach, and > detach code along with conventional component_ops. > > - Samsung DSIM is a bridge driver which is common across all platforms and > the respective platform-specific glue will initialize at the end of the > probe. The platform-specific operations and other glue calls will invoke > on associate code areas. > > v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build This breaks Exynos DRM completely as the Exynos DRM driver is not able to wait until the DSI driver is probed and registered as component. I will show how to rework this the way it is done in drivers/gpu/drm/exynos/exynos_dp.c and drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > v3: > * restore gpio related fixes > * restore proper bridge chain > * rework initialization issue > * fix header includes in proper way > > v2: > * fixed exynos dsi driver conversion (Marek Szyprowski) > * updated commit message > * updated MAINTAINERS file > > v1: > * don't maintain component_ops in bridge driver > * don't maintain platform glue code in bridge driver > * add platform-specific glue code and make a common bridge > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > MAINTAINERS | 9 + > drivers/gpu/drm/bridge/Kconfig | 12 + > drivers/gpu/drm/bridge/Makefile | 1 + > drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - > drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- > include/drm/bridge/samsung-dsim.h | 99 ++ > 9 files changed, 1868 insertions(+), 1659 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h > > ... Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-02 10:47 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-02 10:47 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 29.08.2022 20:40, Jagan Teki wrote: > Samsung MIPI DSIM controller is common DSI IP that can be used in various > SoCs like Exynos, i.MX8M Mini/Nano. > > In order to access this DSI controller between various platform SoCs, > the ideal way to incorporate this in the drm stack is via the drm bridge > driver. > > This patch is trying to differentiate platform-specific and bridge driver > code and keep maintaining the exynos_drm_dsi.c code as platform-specific > glue code and samsung-dsim.c as a common bridge driver code. > > - Exynos specific glue code is exynos specific te_irq, host_attach, and > detach code along with conventional component_ops. > > - Samsung DSIM is a bridge driver which is common across all platforms and > the respective platform-specific glue will initialize at the end of the > probe. The platform-specific operations and other glue calls will invoke > on associate code areas. > > v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build This breaks Exynos DRM completely as the Exynos DRM driver is not able to wait until the DSI driver is probed and registered as component. I will show how to rework this the way it is done in drivers/gpu/drm/exynos/exynos_dp.c and drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > v3: > * restore gpio related fixes > * restore proper bridge chain > * rework initialization issue > * fix header includes in proper way > > v2: > * fixed exynos dsi driver conversion (Marek Szyprowski) > * updated commit message > * updated MAINTAINERS file > > v1: > * don't maintain component_ops in bridge driver > * don't maintain platform glue code in bridge driver > * add platform-specific glue code and make a common bridge > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > MAINTAINERS | 9 + > drivers/gpu/drm/bridge/Kconfig | 12 + > drivers/gpu/drm/bridge/Makefile | 1 + > drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - > drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- > include/drm/bridge/samsung-dsim.h | 99 ++ > 9 files changed, 1868 insertions(+), 1659 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h > > ... Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-02 10:47 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-02 10:47 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula On 29.08.2022 20:40, Jagan Teki wrote: > Samsung MIPI DSIM controller is common DSI IP that can be used in various > SoCs like Exynos, i.MX8M Mini/Nano. > > In order to access this DSI controller between various platform SoCs, > the ideal way to incorporate this in the drm stack is via the drm bridge > driver. > > This patch is trying to differentiate platform-specific and bridge driver > code and keep maintaining the exynos_drm_dsi.c code as platform-specific > glue code and samsung-dsim.c as a common bridge driver code. > > - Exynos specific glue code is exynos specific te_irq, host_attach, and > detach code along with conventional component_ops. > > - Samsung DSIM is a bridge driver which is common across all platforms and > the respective platform-specific glue will initialize at the end of the > probe. The platform-specific operations and other glue calls will invoke > on associate code areas. > > v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build This breaks Exynos DRM completely as the Exynos DRM driver is not able to wait until the DSI driver is probed and registered as component. I will show how to rework this the way it is done in drivers/gpu/drm/exynos/exynos_dp.c and drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > v3: > * restore gpio related fixes > * restore proper bridge chain > * rework initialization issue > * fix header includes in proper way > > v2: > * fixed exynos dsi driver conversion (Marek Szyprowski) > * updated commit message > * updated MAINTAINERS file > > v1: > * don't maintain component_ops in bridge driver > * don't maintain platform glue code in bridge driver > * add platform-specific glue code and make a common bridge > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > MAINTAINERS | 9 + > drivers/gpu/drm/bridge/Kconfig | 12 + > drivers/gpu/drm/bridge/Makefile | 1 + > drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - > drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- > include/drm/bridge/samsung-dsim.h | 99 ++ > 9 files changed, 1868 insertions(+), 1659 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h > > ... Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-02 10:47 ` Marek Szyprowski (?) @ 2022-09-05 11:24 ` Marek Szyprowski -1 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-05 11:24 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula Hi All, On 02.09.2022 12:47, Marek Szyprowski wrote: > On 29.08.2022 20:40, Jagan Teki wrote: >> Samsung MIPI DSIM controller is common DSI IP that can be used in >> various >> SoCs like Exynos, i.MX8M Mini/Nano. >> >> In order to access this DSI controller between various platform SoCs, >> the ideal way to incorporate this in the drm stack is via the drm bridge >> driver. >> >> This patch is trying to differentiate platform-specific and bridge >> driver >> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >> glue code and samsung-dsim.c as a common bridge driver code. >> >> - Exynos specific glue code is exynos specific te_irq, host_attach, and >> detach code along with conventional component_ops. >> >> - Samsung DSIM is a bridge driver which is common across all >> platforms and >> the respective platform-specific glue will initialize at the end >> of the >> probe. The platform-specific operations and other glue calls will >> invoke >> on associate code areas. >> >> v4: >> * include Inki Dae in MAINTAINERS >> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > This breaks Exynos DRM completely as the Exynos DRM driver is not able > to wait until the DSI driver is probed and registered as component. > > I will show how to rework this the way it is done in > drivers/gpu/drm/exynos/exynos_dp.c and > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... I've finally had some time to implement such approach, see https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked If you want me to send the patches against your v4 patchset, let me know, but imho my changes are much more readable after squashing to the original patches. Now the driver is fully multi-arch safe and ready for further extensions. I've removed the weak functions, reworked the way the plat_data is used (dropped the patch related to it) and restored exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel free to resend the above as v5 after testing on your hardware. At least it properly works now on all Exynos boards I have, both compiled into the kernel or as modules. > >> v3: >> * restore gpio related fixes >> * restore proper bridge chain >> * rework initialization issue >> * fix header includes in proper way >> >> v2: >> * fixed exynos dsi driver conversion (Marek Szyprowski) >> * updated commit message >> * updated MAINTAINERS file >> >> v1: >> * don't maintain component_ops in bridge driver >> * don't maintain platform glue code in bridge driver >> * add platform-specific glue code and make a common bridge >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> >> --- >> MAINTAINERS | 9 + >> drivers/gpu/drm/bridge/Kconfig | 12 + >> drivers/gpu/drm/bridge/Makefile | 1 + >> drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ >> drivers/gpu/drm/exynos/Kconfig | 1 + >> drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - >> drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - >> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- >> include/drm/bridge/samsung-dsim.h | 99 ++ >> 9 files changed, 1868 insertions(+), 1659 deletions(-) >> create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c >> create mode 100644 include/drm/bridge/samsung-dsim.h >> >> ... > > Best regards Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-05 11:24 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-05 11:24 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula Hi All, On 02.09.2022 12:47, Marek Szyprowski wrote: > On 29.08.2022 20:40, Jagan Teki wrote: >> Samsung MIPI DSIM controller is common DSI IP that can be used in >> various >> SoCs like Exynos, i.MX8M Mini/Nano. >> >> In order to access this DSI controller between various platform SoCs, >> the ideal way to incorporate this in the drm stack is via the drm bridge >> driver. >> >> This patch is trying to differentiate platform-specific and bridge >> driver >> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >> glue code and samsung-dsim.c as a common bridge driver code. >> >> - Exynos specific glue code is exynos specific te_irq, host_attach, and >> detach code along with conventional component_ops. >> >> - Samsung DSIM is a bridge driver which is common across all >> platforms and >> the respective platform-specific glue will initialize at the end >> of the >> probe. The platform-specific operations and other glue calls will >> invoke >> on associate code areas. >> >> v4: >> * include Inki Dae in MAINTAINERS >> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > This breaks Exynos DRM completely as the Exynos DRM driver is not able > to wait until the DSI driver is probed and registered as component. > > I will show how to rework this the way it is done in > drivers/gpu/drm/exynos/exynos_dp.c and > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... I've finally had some time to implement such approach, see https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked If you want me to send the patches against your v4 patchset, let me know, but imho my changes are much more readable after squashing to the original patches. Now the driver is fully multi-arch safe and ready for further extensions. I've removed the weak functions, reworked the way the plat_data is used (dropped the patch related to it) and restored exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel free to resend the above as v5 after testing on your hardware. At least it properly works now on all Exynos boards I have, both compiled into the kernel or as modules. > >> v3: >> * restore gpio related fixes >> * restore proper bridge chain >> * rework initialization issue >> * fix header includes in proper way >> >> v2: >> * fixed exynos dsi driver conversion (Marek Szyprowski) >> * updated commit message >> * updated MAINTAINERS file >> >> v1: >> * don't maintain component_ops in bridge driver >> * don't maintain platform glue code in bridge driver >> * add platform-specific glue code and make a common bridge >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> >> --- >> MAINTAINERS | 9 + >> drivers/gpu/drm/bridge/Kconfig | 12 + >> drivers/gpu/drm/bridge/Makefile | 1 + >> drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ >> drivers/gpu/drm/exynos/Kconfig | 1 + >> drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - >> drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - >> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- >> include/drm/bridge/samsung-dsim.h | 99 ++ >> 9 files changed, 1868 insertions(+), 1659 deletions(-) >> create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c >> create mode 100644 include/drm/bridge/samsung-dsim.h >> >> ... > > Best regards Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-05 11:24 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-05 11:24 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel Hi All, On 02.09.2022 12:47, Marek Szyprowski wrote: > On 29.08.2022 20:40, Jagan Teki wrote: >> Samsung MIPI DSIM controller is common DSI IP that can be used in >> various >> SoCs like Exynos, i.MX8M Mini/Nano. >> >> In order to access this DSI controller between various platform SoCs, >> the ideal way to incorporate this in the drm stack is via the drm bridge >> driver. >> >> This patch is trying to differentiate platform-specific and bridge >> driver >> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >> glue code and samsung-dsim.c as a common bridge driver code. >> >> - Exynos specific glue code is exynos specific te_irq, host_attach, and >> detach code along with conventional component_ops. >> >> - Samsung DSIM is a bridge driver which is common across all >> platforms and >> the respective platform-specific glue will initialize at the end >> of the >> probe. The platform-specific operations and other glue calls will >> invoke >> on associate code areas. >> >> v4: >> * include Inki Dae in MAINTAINERS >> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > This breaks Exynos DRM completely as the Exynos DRM driver is not able > to wait until the DSI driver is probed and registered as component. > > I will show how to rework this the way it is done in > drivers/gpu/drm/exynos/exynos_dp.c and > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... I've finally had some time to implement such approach, see https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked If you want me to send the patches against your v4 patchset, let me know, but imho my changes are much more readable after squashing to the original patches. Now the driver is fully multi-arch safe and ready for further extensions. I've removed the weak functions, reworked the way the plat_data is used (dropped the patch related to it) and restored exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel free to resend the above as v5 after testing on your hardware. At least it properly works now on all Exynos boards I have, both compiled into the kernel or as modules. > >> v3: >> * restore gpio related fixes >> * restore proper bridge chain >> * rework initialization issue >> * fix header includes in proper way >> >> v2: >> * fixed exynos dsi driver conversion (Marek Szyprowski) >> * updated commit message >> * updated MAINTAINERS file >> >> v1: >> * don't maintain component_ops in bridge driver >> * don't maintain platform glue code in bridge driver >> * add platform-specific glue code and make a common bridge >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> >> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> >> --- >> MAINTAINERS | 9 + >> drivers/gpu/drm/bridge/Kconfig | 12 + >> drivers/gpu/drm/bridge/Makefile | 1 + >> drivers/gpu/drm/bridge/samsung-dsim.c | 1686 ++++++++++++++++++++++ >> drivers/gpu/drm/exynos/Kconfig | 1 + >> drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - >> drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - >> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1715 +---------------------- >> include/drm/bridge/samsung-dsim.h | 99 ++ >> 9 files changed, 1868 insertions(+), 1659 deletions(-) >> create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c >> create mode 100644 include/drm/bridge/samsung-dsim.h >> >> ... > > Best regards Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-05 11:24 ` Marek Szyprowski (?) @ 2022-09-06 19:07 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-06 19:07 UTC (permalink / raw) To: Marek Szyprowski Cc: Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi All, > > On 02.09.2022 12:47, Marek Szyprowski wrote: > > On 29.08.2022 20:40, Jagan Teki wrote: > >> Samsung MIPI DSIM controller is common DSI IP that can be used in > >> various > >> SoCs like Exynos, i.MX8M Mini/Nano. > >> > >> In order to access this DSI controller between various platform SoCs, > >> the ideal way to incorporate this in the drm stack is via the drm bridge > >> driver. > >> > >> This patch is trying to differentiate platform-specific and bridge > >> driver > >> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >> glue code and samsung-dsim.c as a common bridge driver code. > >> > >> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >> detach code along with conventional component_ops. > >> > >> - Samsung DSIM is a bridge driver which is common across all > >> platforms and > >> the respective platform-specific glue will initialize at the end > >> of the > >> probe. The platform-specific operations and other glue calls will > >> invoke > >> on associate code areas. > >> > >> v4: > >> * include Inki Dae in MAINTAINERS > >> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > > > This breaks Exynos DRM completely as the Exynos DRM driver is not able > > to wait until the DSI driver is probed and registered as component. > > > > I will show how to rework this the way it is done in > > drivers/gpu/drm/exynos/exynos_dp.c and > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > > I've finally had some time to implement such approach, see > https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked > > If you want me to send the patches against your v4 patchset, let me > know, but imho my changes are much more readable after squashing to the > original patches. > > Now the driver is fully multi-arch safe and ready for further > extensions. I've removed the weak functions, reworked the way the > plat_data is used (dropped the patch related to it) and restored > exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > free to resend the above as v5 after testing on your hardware. At least > it properly works now on all Exynos boards I have, both compiled into > the kernel or as modules. Thanks. I've seen the repo added on top of Dave patches - does it mean these depends on Dave changes as well? Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-06 19:07 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-06 19:07 UTC (permalink / raw) To: Marek Szyprowski Cc: Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi All, > > On 02.09.2022 12:47, Marek Szyprowski wrote: > > On 29.08.2022 20:40, Jagan Teki wrote: > >> Samsung MIPI DSIM controller is common DSI IP that can be used in > >> various > >> SoCs like Exynos, i.MX8M Mini/Nano. > >> > >> In order to access this DSI controller between various platform SoCs, > >> the ideal way to incorporate this in the drm stack is via the drm bridge > >> driver. > >> > >> This patch is trying to differentiate platform-specific and bridge > >> driver > >> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >> glue code and samsung-dsim.c as a common bridge driver code. > >> > >> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >> detach code along with conventional component_ops. > >> > >> - Samsung DSIM is a bridge driver which is common across all > >> platforms and > >> the respective platform-specific glue will initialize at the end > >> of the > >> probe. The platform-specific operations and other glue calls will > >> invoke > >> on associate code areas. > >> > >> v4: > >> * include Inki Dae in MAINTAINERS > >> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > > > This breaks Exynos DRM completely as the Exynos DRM driver is not able > > to wait until the DSI driver is probed and registered as component. > > > > I will show how to rework this the way it is done in > > drivers/gpu/drm/exynos/exynos_dp.c and > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > > I've finally had some time to implement such approach, see > https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked > > If you want me to send the patches against your v4 patchset, let me > know, but imho my changes are much more readable after squashing to the > original patches. > > Now the driver is fully multi-arch safe and ready for further > extensions. I've removed the weak functions, reworked the way the > plat_data is used (dropped the patch related to it) and restored > exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > free to resend the above as v5 after testing on your hardware. At least > it properly works now on all Exynos boards I have, both compiled into > the kernel or as modules. Thanks. I've seen the repo added on top of Dave patches - does it mean these depends on Dave changes as well? Jagan. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-06 19:07 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-06 19:07 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi All, > > On 02.09.2022 12:47, Marek Szyprowski wrote: > > On 29.08.2022 20:40, Jagan Teki wrote: > >> Samsung MIPI DSIM controller is common DSI IP that can be used in > >> various > >> SoCs like Exynos, i.MX8M Mini/Nano. > >> > >> In order to access this DSI controller between various platform SoCs, > >> the ideal way to incorporate this in the drm stack is via the drm bridge > >> driver. > >> > >> This patch is trying to differentiate platform-specific and bridge > >> driver > >> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >> glue code and samsung-dsim.c as a common bridge driver code. > >> > >> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >> detach code along with conventional component_ops. > >> > >> - Samsung DSIM is a bridge driver which is common across all > >> platforms and > >> the respective platform-specific glue will initialize at the end > >> of the > >> probe. The platform-specific operations and other glue calls will > >> invoke > >> on associate code areas. > >> > >> v4: > >> * include Inki Dae in MAINTAINERS > >> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > > > This breaks Exynos DRM completely as the Exynos DRM driver is not able > > to wait until the DSI driver is probed and registered as component. > > > > I will show how to rework this the way it is done in > > drivers/gpu/drm/exynos/exynos_dp.c and > > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > > I've finally had some time to implement such approach, see > https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked > > If you want me to send the patches against your v4 patchset, let me > know, but imho my changes are much more readable after squashing to the > original patches. > > Now the driver is fully multi-arch safe and ready for further > extensions. I've removed the weak functions, reworked the way the > plat_data is used (dropped the patch related to it) and restored > exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > free to resend the above as v5 after testing on your hardware. At least > it properly works now on all Exynos boards I have, both compiled into > the kernel or as modules. Thanks. I've seen the repo added on top of Dave patches - does it mean these depends on Dave changes as well? Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-06 19:07 ` Jagan Teki (?) @ 2022-09-07 10:04 ` Marek Szyprowski -1 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-07 10:04 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 06.09.2022 21:07, Jagan Teki wrote: > On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 02.09.2022 12:47, Marek Szyprowski wrote: >>> On 29.08.2022 20:40, Jagan Teki wrote: >>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>> various >>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>> >>>> In order to access this DSI controller between various platform SoCs, >>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>> driver. >>>> >>>> This patch is trying to differentiate platform-specific and bridge >>>> driver >>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>> glue code and samsung-dsim.c as a common bridge driver code. >>>> >>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>> detach code along with conventional component_ops. >>>> >>>> - Samsung DSIM is a bridge driver which is common across all >>>> platforms and >>>> the respective platform-specific glue will initialize at the end >>>> of the >>>> probe. The platform-specific operations and other glue calls will >>>> invoke >>>> on associate code areas. >>>> >>>> v4: >>>> * include Inki Dae in MAINTAINERS >>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>> to wait until the DSI driver is probed and registered as component. >>> >>> I will show how to rework this the way it is done in >>> drivers/gpu/drm/exynos/exynos_dp.c and >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >> I've finally had some time to implement such approach, see >> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >> >> If you want me to send the patches against your v4 patchset, let me >> know, but imho my changes are much more readable after squashing to the >> original patches. >> >> Now the driver is fully multi-arch safe and ready for further >> extensions. I've removed the weak functions, reworked the way the >> plat_data is used (dropped the patch related to it) and restored >> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >> free to resend the above as v5 after testing on your hardware. At least >> it properly works now on all Exynos boards I have, both compiled into >> the kernel or as modules. > Thanks. I've seen the repo added on top of Dave patches - does it mean > these depends on Dave changes as well? Yes and no. My rework doesn't change anything with this dependency. It comes from my patch "drm: exynos: dsi: Restore proper bridge chain order" already included in your series (patch #1). Without it exynos-dsi driver hacks the list of bridges to ensure the order of pre_enable calls needed for proper operation. This works somehow with DSI panels on my test systems, but it has been reported that it doesn't work with a bit more complex display pipelines. Only that patch depends on the Dave's patches. If you remove it, you would need to adjust the code in the exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be better to keep it and merge Dave's patches together with dsi changes, as they are the first real client of it. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-07 10:04 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-07 10:04 UTC (permalink / raw) To: Jagan Teki Cc: Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel Hi Jagan, On 06.09.2022 21:07, Jagan Teki wrote: > On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 02.09.2022 12:47, Marek Szyprowski wrote: >>> On 29.08.2022 20:40, Jagan Teki wrote: >>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>> various >>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>> >>>> In order to access this DSI controller between various platform SoCs, >>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>> driver. >>>> >>>> This patch is trying to differentiate platform-specific and bridge >>>> driver >>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>> glue code and samsung-dsim.c as a common bridge driver code. >>>> >>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>> detach code along with conventional component_ops. >>>> >>>> - Samsung DSIM is a bridge driver which is common across all >>>> platforms and >>>> the respective platform-specific glue will initialize at the end >>>> of the >>>> probe. The platform-specific operations and other glue calls will >>>> invoke >>>> on associate code areas. >>>> >>>> v4: >>>> * include Inki Dae in MAINTAINERS >>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>> to wait until the DSI driver is probed and registered as component. >>> >>> I will show how to rework this the way it is done in >>> drivers/gpu/drm/exynos/exynos_dp.c and >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >> I've finally had some time to implement such approach, see >> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >> >> If you want me to send the patches against your v4 patchset, let me >> know, but imho my changes are much more readable after squashing to the >> original patches. >> >> Now the driver is fully multi-arch safe and ready for further >> extensions. I've removed the weak functions, reworked the way the >> plat_data is used (dropped the patch related to it) and restored >> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >> free to resend the above as v5 after testing on your hardware. At least >> it properly works now on all Exynos boards I have, both compiled into >> the kernel or as modules. > Thanks. I've seen the repo added on top of Dave patches - does it mean > these depends on Dave changes as well? Yes and no. My rework doesn't change anything with this dependency. It comes from my patch "drm: exynos: dsi: Restore proper bridge chain order" already included in your series (patch #1). Without it exynos-dsi driver hacks the list of bridges to ensure the order of pre_enable calls needed for proper operation. This works somehow with DSI panels on my test systems, but it has been reported that it doesn't work with a bit more complex display pipelines. Only that patch depends on the Dave's patches. If you remove it, you would need to adjust the code in the exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be better to keep it and merge Dave's patches together with dsi changes, as they are the first real client of it. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-07 10:04 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-07 10:04 UTC (permalink / raw) To: Jagan Teki Cc: Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel Hi Jagan, On 06.09.2022 21:07, Jagan Teki wrote: > On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 02.09.2022 12:47, Marek Szyprowski wrote: >>> On 29.08.2022 20:40, Jagan Teki wrote: >>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>> various >>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>> >>>> In order to access this DSI controller between various platform SoCs, >>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>> driver. >>>> >>>> This patch is trying to differentiate platform-specific and bridge >>>> driver >>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>> glue code and samsung-dsim.c as a common bridge driver code. >>>> >>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>> detach code along with conventional component_ops. >>>> >>>> - Samsung DSIM is a bridge driver which is common across all >>>> platforms and >>>> the respective platform-specific glue will initialize at the end >>>> of the >>>> probe. The platform-specific operations and other glue calls will >>>> invoke >>>> on associate code areas. >>>> >>>> v4: >>>> * include Inki Dae in MAINTAINERS >>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>> to wait until the DSI driver is probed and registered as component. >>> >>> I will show how to rework this the way it is done in >>> drivers/gpu/drm/exynos/exynos_dp.c and >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >> I've finally had some time to implement such approach, see >> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >> >> If you want me to send the patches against your v4 patchset, let me >> know, but imho my changes are much more readable after squashing to the >> original patches. >> >> Now the driver is fully multi-arch safe and ready for further >> extensions. I've removed the weak functions, reworked the way the >> plat_data is used (dropped the patch related to it) and restored >> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >> free to resend the above as v5 after testing on your hardware. At least >> it properly works now on all Exynos boards I have, both compiled into >> the kernel or as modules. > Thanks. I've seen the repo added on top of Dave patches - does it mean > these depends on Dave changes as well? Yes and no. My rework doesn't change anything with this dependency. It comes from my patch "drm: exynos: dsi: Restore proper bridge chain order" already included in your series (patch #1). Without it exynos-dsi driver hacks the list of bridges to ensure the order of pre_enable calls needed for proper operation. This works somehow with DSI panels on my test systems, but it has been reported that it doesn't work with a bit more complex display pipelines. Only that patch depends on the Dave's patches. If you remove it, you would need to adjust the code in the exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be better to keep it and merge Dave's patches together with dsi changes, as they are the first real client of it. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-07 10:04 ` Marek Szyprowski (?) @ 2022-09-12 14:52 ` Frieder Schrempf -1 siblings, 0 replies; 76+ messages in thread From: Frieder Schrempf @ 2022-09-12 14:52 UTC (permalink / raw) To: Marek Szyprowski, Jagan Teki Cc: Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel Hi Jagan, Marek, Am 07.09.22 um 12:04 schrieb Marek Szyprowski: > Hi Jagan, > > On 06.09.2022 21:07, Jagan Teki wrote: >> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >> <m.szyprowski@samsung.com> wrote: >>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>> various >>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>> >>>>> In order to access this DSI controller between various platform SoCs, >>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>> driver. >>>>> >>>>> This patch is trying to differentiate platform-specific and bridge >>>>> driver >>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>> >>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>> detach code along with conventional component_ops. >>>>> >>>>> - Samsung DSIM is a bridge driver which is common across all >>>>> platforms and >>>>> the respective platform-specific glue will initialize at the end >>>>> of the >>>>> probe. The platform-specific operations and other glue calls will >>>>> invoke >>>>> on associate code areas. >>>>> >>>>> v4: >>>>> * include Inki Dae in MAINTAINERS >>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>> to wait until the DSI driver is probed and registered as component. >>>> >>>> I will show how to rework this the way it is done in >>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>> I've finally had some time to implement such approach, see >>> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fprotect2.fireeye.com%2Fv1%2Furl%3Fk%3Dc5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375%26q%3D1%26e%3D489b94d4-84fb-408e-b679-a8d27acf2930%26u%3Dhttps%253A%252F%252Fgithub.com%252Fmszyprow%252Flinux%252Ftree%252Fv6.0-dsi-v4-reworked&data=05%7C01%7Cfrieder.schrempf%40kontron.de%7C8ed9bd90703b48c9d43708da90b86876%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637981418959345104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=vLwOMBbdNo1C5x%2BESY3SU%2FwaYKBmAgIyafLOLmd3BlM%3D&reserved=0 >>> >>> If you want me to send the patches against your v4 patchset, let me >>> know, but imho my changes are much more readable after squashing to the >>> original patches. >>> >>> Now the driver is fully multi-arch safe and ready for further >>> extensions. I've removed the weak functions, reworked the way the >>> plat_data is used (dropped the patch related to it) and restored >>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>> free to resend the above as v5 after testing on your hardware. At least >>> it properly works now on all Exynos boards I have, both compiled into >>> the kernel or as modules. >> Thanks. I've seen the repo added on top of Dave patches - does it mean >> these depends on Dave changes as well? > > Yes and no. My rework doesn't change anything with this dependency. It > comes from my patch "drm: exynos: dsi: Restore proper bridge chain > order" already included in your series (patch #1). Without it exynos-dsi > driver hacks the list of bridges to ensure the order of pre_enable calls > needed for proper operation. This works somehow with DSI panels on my > test systems, but it has been reported that it doesn't work with a bit > more complex display pipelines. Only that patch depends on the Dave's > patches. If you remove it, you would need to adjust the code in the > exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > better to keep it and merge Dave's patches together with dsi changes, as > they are the first real client of it. I tried to test Jagan's v4 on our Kontron BL i.MX8MM with SN65DSI84 LVDS bridge and it didn't work due to driver dependency issues. Instead trying Marek's branch rebased to 6.0-rc4 and including the necessary DT changes from Jagan's v4 looks good and produces an image on the display. Only one thing caused problems: In Jagan's patch for the LCDIF node [1] there's a typo (missing 's') in the assigned-clock-rates property. Without fixing this the display doesn't work. Jagan, can you come up with a v5 including Marek's fixes? And if you like, I think you could also start sending the DT changes for i.MX8MM, so we can start reviewing/testing them? Thanks Frieder [1]: https://github.com/openedev/kernel/commit/89a6252cec47f3593d4f2b7ea3132f4745c4fdb3 ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-12 14:52 ` Frieder Schrempf 0 siblings, 0 replies; 76+ messages in thread From: Frieder Schrempf @ 2022-09-12 14:52 UTC (permalink / raw) To: Marek Szyprowski, Jagan Teki Cc: Andrzej Hajda, Inki Dae, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel Hi Jagan, Marek, Am 07.09.22 um 12:04 schrieb Marek Szyprowski: > Hi Jagan, > > On 06.09.2022 21:07, Jagan Teki wrote: >> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >> <m.szyprowski@samsung.com> wrote: >>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>> various >>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>> >>>>> In order to access this DSI controller between various platform SoCs, >>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>> driver. >>>>> >>>>> This patch is trying to differentiate platform-specific and bridge >>>>> driver >>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>> >>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>> detach code along with conventional component_ops. >>>>> >>>>> - Samsung DSIM is a bridge driver which is common across all >>>>> platforms and >>>>> the respective platform-specific glue will initialize at the end >>>>> of the >>>>> probe. The platform-specific operations and other glue calls will >>>>> invoke >>>>> on associate code areas. >>>>> >>>>> v4: >>>>> * include Inki Dae in MAINTAINERS >>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>> to wait until the DSI driver is probed and registered as component. >>>> >>>> I will show how to rework this the way it is done in >>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>> I've finally had some time to implement such approach, see >>> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fprotect2.fireeye.com%2Fv1%2Furl%3Fk%3Dc5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375%26q%3D1%26e%3D489b94d4-84fb-408e-b679-a8d27acf2930%26u%3Dhttps%253A%252F%252Fgithub.com%252Fmszyprow%252Flinux%252Ftree%252Fv6.0-dsi-v4-reworked&data=05%7C01%7Cfrieder.schrempf%40kontron.de%7C8ed9bd90703b48c9d43708da90b86876%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637981418959345104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=vLwOMBbdNo1C5x%2BESY3SU%2FwaYKBmAgIyafLOLmd3BlM%3D&reserved=0 >>> >>> If you want me to send the patches against your v4 patchset, let me >>> know, but imho my changes are much more readable after squashing to the >>> original patches. >>> >>> Now the driver is fully multi-arch safe and ready for further >>> extensions. I've removed the weak functions, reworked the way the >>> plat_data is used (dropped the patch related to it) and restored >>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>> free to resend the above as v5 after testing on your hardware. At least >>> it properly works now on all Exynos boards I have, both compiled into >>> the kernel or as modules. >> Thanks. I've seen the repo added on top of Dave patches - does it mean >> these depends on Dave changes as well? > > Yes and no. My rework doesn't change anything with this dependency. It > comes from my patch "drm: exynos: dsi: Restore proper bridge chain > order" already included in your series (patch #1). Without it exynos-dsi > driver hacks the list of bridges to ensure the order of pre_enable calls > needed for proper operation. This works somehow with DSI panels on my > test systems, but it has been reported that it doesn't work with a bit > more complex display pipelines. Only that patch depends on the Dave's > patches. If you remove it, you would need to adjust the code in the > exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > better to keep it and merge Dave's patches together with dsi changes, as > they are the first real client of it. I tried to test Jagan's v4 on our Kontron BL i.MX8MM with SN65DSI84 LVDS bridge and it didn't work due to driver dependency issues. Instead trying Marek's branch rebased to 6.0-rc4 and including the necessary DT changes from Jagan's v4 looks good and produces an image on the display. Only one thing caused problems: In Jagan's patch for the LCDIF node [1] there's a typo (missing 's') in the assigned-clock-rates property. Without fixing this the display doesn't work. Jagan, can you come up with a v5 including Marek's fixes? And if you like, I think you could also start sending the DT changes for i.MX8MM, so we can start reviewing/testing them? Thanks Frieder [1]: https://github.com/openedev/kernel/commit/89a6252cec47f3593d4f2b7ea3132f4745c4fdb3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-12 14:52 ` Frieder Schrempf 0 siblings, 0 replies; 76+ messages in thread From: Frieder Schrempf @ 2022-09-12 14:52 UTC (permalink / raw) To: Marek Szyprowski, Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Robert Foss, Kyungmin Park, Laurent Pinchart, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Matteo Lisi Hi Jagan, Marek, Am 07.09.22 um 12:04 schrieb Marek Szyprowski: > Hi Jagan, > > On 06.09.2022 21:07, Jagan Teki wrote: >> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >> <m.szyprowski@samsung.com> wrote: >>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>> various >>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>> >>>>> In order to access this DSI controller between various platform SoCs, >>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>> driver. >>>>> >>>>> This patch is trying to differentiate platform-specific and bridge >>>>> driver >>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>> >>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>> detach code along with conventional component_ops. >>>>> >>>>> - Samsung DSIM is a bridge driver which is common across all >>>>> platforms and >>>>> the respective platform-specific glue will initialize at the end >>>>> of the >>>>> probe. The platform-specific operations and other glue calls will >>>>> invoke >>>>> on associate code areas. >>>>> >>>>> v4: >>>>> * include Inki Dae in MAINTAINERS >>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>> to wait until the DSI driver is probed and registered as component. >>>> >>>> I will show how to rework this the way it is done in >>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>> I've finally had some time to implement such approach, see >>> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fprotect2.fireeye.com%2Fv1%2Furl%3Fk%3Dc5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375%26q%3D1%26e%3D489b94d4-84fb-408e-b679-a8d27acf2930%26u%3Dhttps%253A%252F%252Fgithub.com%252Fmszyprow%252Flinux%252Ftree%252Fv6.0-dsi-v4-reworked&data=05%7C01%7Cfrieder.schrempf%40kontron.de%7C8ed9bd90703b48c9d43708da90b86876%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637981418959345104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=vLwOMBbdNo1C5x%2BESY3SU%2FwaYKBmAgIyafLOLmd3BlM%3D&reserved=0 >>> >>> If you want me to send the patches against your v4 patchset, let me >>> know, but imho my changes are much more readable after squashing to the >>> original patches. >>> >>> Now the driver is fully multi-arch safe and ready for further >>> extensions. I've removed the weak functions, reworked the way the >>> plat_data is used (dropped the patch related to it) and restored >>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>> free to resend the above as v5 after testing on your hardware. At least >>> it properly works now on all Exynos boards I have, both compiled into >>> the kernel or as modules. >> Thanks. I've seen the repo added on top of Dave patches - does it mean >> these depends on Dave changes as well? > > Yes and no. My rework doesn't change anything with this dependency. It > comes from my patch "drm: exynos: dsi: Restore proper bridge chain > order" already included in your series (patch #1). Without it exynos-dsi > driver hacks the list of bridges to ensure the order of pre_enable calls > needed for proper operation. This works somehow with DSI panels on my > test systems, but it has been reported that it doesn't work with a bit > more complex display pipelines. Only that patch depends on the Dave's > patches. If you remove it, you would need to adjust the code in the > exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > better to keep it and merge Dave's patches together with dsi changes, as > they are the first real client of it. I tried to test Jagan's v4 on our Kontron BL i.MX8MM with SN65DSI84 LVDS bridge and it didn't work due to driver dependency issues. Instead trying Marek's branch rebased to 6.0-rc4 and including the necessary DT changes from Jagan's v4 looks good and produces an image on the display. Only one thing caused problems: In Jagan's patch for the LCDIF node [1] there's a typo (missing 's') in the assigned-clock-rates property. Without fixing this the display doesn't work. Jagan, can you come up with a v5 including Marek's fixes? And if you like, I think you could also start sending the DT changes for i.MX8MM, so we can start reviewing/testing them? Thanks Frieder [1]: https://github.com/openedev/kernel/commit/89a6252cec47f3593d4f2b7ea3132f4745c4fdb3 ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-07 10:04 ` Marek Szyprowski (?) @ 2022-09-13 17:29 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-13 17:29 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Neil Armstrong, Robert Foss, Seung-Woo Kim, Kyungmin Park, dri-devel, Tommaso Merciai, Frieder Schrempf, Andrzej Hajda, Adam Ford, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, linux-arm-kernel, Matteo Lisi On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 06.09.2022 21:07, Jagan Teki wrote: > > On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>> various > >>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>> > >>>> In order to access this DSI controller between various platform SoCs, > >>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>> driver. > >>>> > >>>> This patch is trying to differentiate platform-specific and bridge > >>>> driver > >>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>> > >>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>> detach code along with conventional component_ops. > >>>> > >>>> - Samsung DSIM is a bridge driver which is common across all > >>>> platforms and > >>>> the respective platform-specific glue will initialize at the end > >>>> of the > >>>> probe. The platform-specific operations and other glue calls will > >>>> invoke > >>>> on associate code areas. > >>>> > >>>> v4: > >>>> * include Inki Dae in MAINTAINERS > >>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>> to wait until the DSI driver is probed and registered as component. > >>> > >>> I will show how to rework this the way it is done in > >>> drivers/gpu/drm/exynos/exynos_dp.c and > >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >> I've finally had some time to implement such approach, see > >> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >> > >> If you want me to send the patches against your v4 patchset, let me > >> know, but imho my changes are much more readable after squashing to the > >> original patches. > >> > >> Now the driver is fully multi-arch safe and ready for further > >> extensions. I've removed the weak functions, reworked the way the > >> plat_data is used (dropped the patch related to it) and restored > >> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >> free to resend the above as v5 after testing on your hardware. At least > >> it properly works now on all Exynos boards I have, both compiled into > >> the kernel or as modules. > > Thanks. I've seen the repo added on top of Dave patches - does it mean > > these depends on Dave changes as well? > > Yes and no. My rework doesn't change anything with this dependency. It > comes from my patch "drm: exynos: dsi: Restore proper bridge chain > order" already included in your series (patch #1). Without it exynos-dsi > driver hacks the list of bridges to ensure the order of pre_enable calls > needed for proper operation. This works somehow with DSI panels on my > test systems, but it has been reported that it doesn't work with a bit > more complex display pipelines. Only that patch depends on the Dave's > patches. If you remove it, you would need to adjust the code in the > exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > better to keep it and merge Dave's patches together with dsi changes, as > they are the first real client of it. I think the Dave patches especially "drm/bridge: Introduce pre_enable_upstream_first to alter bridge init order" seems not 100% relevant to this series as they affect bridge chain call flow globally. Having a separate series for that makes sense to me. I'm sending v5 by excluding those parts. Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-13 17:29 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-13 17:29 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 06.09.2022 21:07, Jagan Teki wrote: > > On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>> various > >>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>> > >>>> In order to access this DSI controller between various platform SoCs, > >>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>> driver. > >>>> > >>>> This patch is trying to differentiate platform-specific and bridge > >>>> driver > >>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>> > >>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>> detach code along with conventional component_ops. > >>>> > >>>> - Samsung DSIM is a bridge driver which is common across all > >>>> platforms and > >>>> the respective platform-specific glue will initialize at the end > >>>> of the > >>>> probe. The platform-specific operations and other glue calls will > >>>> invoke > >>>> on associate code areas. > >>>> > >>>> v4: > >>>> * include Inki Dae in MAINTAINERS > >>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>> to wait until the DSI driver is probed and registered as component. > >>> > >>> I will show how to rework this the way it is done in > >>> drivers/gpu/drm/exynos/exynos_dp.c and > >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >> I've finally had some time to implement such approach, see > >> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >> > >> If you want me to send the patches against your v4 patchset, let me > >> know, but imho my changes are much more readable after squashing to the > >> original patches. > >> > >> Now the driver is fully multi-arch safe and ready for further > >> extensions. I've removed the weak functions, reworked the way the > >> plat_data is used (dropped the patch related to it) and restored > >> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >> free to resend the above as v5 after testing on your hardware. At least > >> it properly works now on all Exynos boards I have, both compiled into > >> the kernel or as modules. > > Thanks. I've seen the repo added on top of Dave patches - does it mean > > these depends on Dave changes as well? > > Yes and no. My rework doesn't change anything with this dependency. It > comes from my patch "drm: exynos: dsi: Restore proper bridge chain > order" already included in your series (patch #1). Without it exynos-dsi > driver hacks the list of bridges to ensure the order of pre_enable calls > needed for proper operation. This works somehow with DSI panels on my > test systems, but it has been reported that it doesn't work with a bit > more complex display pipelines. Only that patch depends on the Dave's > patches. If you remove it, you would need to adjust the code in the > exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > better to keep it and merge Dave's patches together with dsi changes, as > they are the first real client of it. I think the Dave patches especially "drm/bridge: Introduce pre_enable_upstream_first to alter bridge init order" seems not 100% relevant to this series as they affect bridge chain call flow globally. Having a separate series for that makes sense to me. I'm sending v5 by excluding those parts. Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-13 17:29 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-13 17:29 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 06.09.2022 21:07, Jagan Teki wrote: > > On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>> various > >>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>> > >>>> In order to access this DSI controller between various platform SoCs, > >>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>> driver. > >>>> > >>>> This patch is trying to differentiate platform-specific and bridge > >>>> driver > >>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>> > >>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>> detach code along with conventional component_ops. > >>>> > >>>> - Samsung DSIM is a bridge driver which is common across all > >>>> platforms and > >>>> the respective platform-specific glue will initialize at the end > >>>> of the > >>>> probe. The platform-specific operations and other glue calls will > >>>> invoke > >>>> on associate code areas. > >>>> > >>>> v4: > >>>> * include Inki Dae in MAINTAINERS > >>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>> to wait until the DSI driver is probed and registered as component. > >>> > >>> I will show how to rework this the way it is done in > >>> drivers/gpu/drm/exynos/exynos_dp.c and > >>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >> I've finally had some time to implement such approach, see > >> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >> > >> If you want me to send the patches against your v4 patchset, let me > >> know, but imho my changes are much more readable after squashing to the > >> original patches. > >> > >> Now the driver is fully multi-arch safe and ready for further > >> extensions. I've removed the weak functions, reworked the way the > >> plat_data is used (dropped the patch related to it) and restored > >> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >> free to resend the above as v5 after testing on your hardware. At least > >> it properly works now on all Exynos boards I have, both compiled into > >> the kernel or as modules. > > Thanks. I've seen the repo added on top of Dave patches - does it mean > > these depends on Dave changes as well? > > Yes and no. My rework doesn't change anything with this dependency. It > comes from my patch "drm: exynos: dsi: Restore proper bridge chain > order" already included in your series (patch #1). Without it exynos-dsi > driver hacks the list of bridges to ensure the order of pre_enable calls > needed for proper operation. This works somehow with DSI panels on my > test systems, but it has been reported that it doesn't work with a bit > more complex display pipelines. Only that patch depends on the Dave's > patches. If you remove it, you would need to adjust the code in the > exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > better to keep it and merge Dave's patches together with dsi changes, as > they are the first real client of it. I think the Dave patches especially "drm/bridge: Introduce pre_enable_upstream_first to alter bridge init order" seems not 100% relevant to this series as they affect bridge chain call flow globally. Having a separate series for that makes sense to me. I'm sending v5 by excluding those parts. Jagan. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-13 17:29 ` Jagan Teki (?) @ 2022-09-14 9:21 ` Marek Szyprowski -1 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-14 9:21 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Neil Armstrong, Robert Foss, Seung-Woo Kim, Kyungmin Park, dri-devel, Tommaso Merciai, Frieder Schrempf, Andrzej Hajda, Adam Ford, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, linux-arm-kernel, Matteo Lisi Hi Jagan, On 13.09.2022 19:29, Jagan Teki wrote: > On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 06.09.2022 21:07, Jagan Teki wrote: >>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>> various >>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>> >>>>>> In order to access this DSI controller between various platform SoCs, >>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>> driver. >>>>>> >>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>> driver >>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>> >>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>> detach code along with conventional component_ops. >>>>>> >>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>> platforms and >>>>>> the respective platform-specific glue will initialize at the end >>>>>> of the >>>>>> probe. The platform-specific operations and other glue calls will >>>>>> invoke >>>>>> on associate code areas. >>>>>> >>>>>> v4: >>>>>> * include Inki Dae in MAINTAINERS >>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>> to wait until the DSI driver is probed and registered as component. >>>>> >>>>> I will show how to rework this the way it is done in >>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>> I've finally had some time to implement such approach, see >>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>> >>>> If you want me to send the patches against your v4 patchset, let me >>>> know, but imho my changes are much more readable after squashing to the >>>> original patches. >>>> >>>> Now the driver is fully multi-arch safe and ready for further >>>> extensions. I've removed the weak functions, reworked the way the >>>> plat_data is used (dropped the patch related to it) and restored >>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>> free to resend the above as v5 after testing on your hardware. At least >>>> it properly works now on all Exynos boards I have, both compiled into >>>> the kernel or as modules. >>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>> these depends on Dave changes as well? >> Yes and no. My rework doesn't change anything with this dependency. It >> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >> order" already included in your series (patch #1). Without it exynos-dsi >> driver hacks the list of bridges to ensure the order of pre_enable calls >> needed for proper operation. This works somehow with DSI panels on my >> test systems, but it has been reported that it doesn't work with a bit >> more complex display pipelines. Only that patch depends on the Dave's >> patches. If you remove it, you would need to adjust the code in the >> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >> better to keep it and merge Dave's patches together with dsi changes, as >> they are the first real client of it. > I think the Dave patches especially "drm/bridge: Introduce > pre_enable_upstream_first to alter bridge init order" seems not 100% > relevant to this series as they affect bridge chain call flow > globally. Having a separate series for that makes sense to me. I'm > sending v5 by excluding those parts. If so then drop the "drm: exynos: dsi: Restore proper bridge chain order" patch and adjust code respectively in samsung-dsim.c. Without the Dave's patches, that one doesn't make sense. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-14 9:21 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-14 9:21 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 13.09.2022 19:29, Jagan Teki wrote: > On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 06.09.2022 21:07, Jagan Teki wrote: >>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>> various >>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>> >>>>>> In order to access this DSI controller between various platform SoCs, >>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>> driver. >>>>>> >>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>> driver >>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>> >>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>> detach code along with conventional component_ops. >>>>>> >>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>> platforms and >>>>>> the respective platform-specific glue will initialize at the end >>>>>> of the >>>>>> probe. The platform-specific operations and other glue calls will >>>>>> invoke >>>>>> on associate code areas. >>>>>> >>>>>> v4: >>>>>> * include Inki Dae in MAINTAINERS >>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>> to wait until the DSI driver is probed and registered as component. >>>>> >>>>> I will show how to rework this the way it is done in >>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>> I've finally had some time to implement such approach, see >>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>> >>>> If you want me to send the patches against your v4 patchset, let me >>>> know, but imho my changes are much more readable after squashing to the >>>> original patches. >>>> >>>> Now the driver is fully multi-arch safe and ready for further >>>> extensions. I've removed the weak functions, reworked the way the >>>> plat_data is used (dropped the patch related to it) and restored >>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>> free to resend the above as v5 after testing on your hardware. At least >>>> it properly works now on all Exynos boards I have, both compiled into >>>> the kernel or as modules. >>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>> these depends on Dave changes as well? >> Yes and no. My rework doesn't change anything with this dependency. It >> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >> order" already included in your series (patch #1). Without it exynos-dsi >> driver hacks the list of bridges to ensure the order of pre_enable calls >> needed for proper operation. This works somehow with DSI panels on my >> test systems, but it has been reported that it doesn't work with a bit >> more complex display pipelines. Only that patch depends on the Dave's >> patches. If you remove it, you would need to adjust the code in the >> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >> better to keep it and merge Dave's patches together with dsi changes, as >> they are the first real client of it. > I think the Dave patches especially "drm/bridge: Introduce > pre_enable_upstream_first to alter bridge init order" seems not 100% > relevant to this series as they affect bridge chain call flow > globally. Having a separate series for that makes sense to me. I'm > sending v5 by excluding those parts. If so then drop the "drm: exynos: dsi: Restore proper bridge chain order" patch and adjust code respectively in samsung-dsim.c. Without the Dave's patches, that one doesn't make sense. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-14 9:21 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-14 9:21 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 13.09.2022 19:29, Jagan Teki wrote: > On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 06.09.2022 21:07, Jagan Teki wrote: >>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>> various >>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>> >>>>>> In order to access this DSI controller between various platform SoCs, >>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>> driver. >>>>>> >>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>> driver >>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>> >>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>> detach code along with conventional component_ops. >>>>>> >>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>> platforms and >>>>>> the respective platform-specific glue will initialize at the end >>>>>> of the >>>>>> probe. The platform-specific operations and other glue calls will >>>>>> invoke >>>>>> on associate code areas. >>>>>> >>>>>> v4: >>>>>> * include Inki Dae in MAINTAINERS >>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>> to wait until the DSI driver is probed and registered as component. >>>>> >>>>> I will show how to rework this the way it is done in >>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>> I've finally had some time to implement such approach, see >>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>> >>>> If you want me to send the patches against your v4 patchset, let me >>>> know, but imho my changes are much more readable after squashing to the >>>> original patches. >>>> >>>> Now the driver is fully multi-arch safe and ready for further >>>> extensions. I've removed the weak functions, reworked the way the >>>> plat_data is used (dropped the patch related to it) and restored >>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>> free to resend the above as v5 after testing on your hardware. At least >>>> it properly works now on all Exynos boards I have, both compiled into >>>> the kernel or as modules. >>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>> these depends on Dave changes as well? >> Yes and no. My rework doesn't change anything with this dependency. It >> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >> order" already included in your series (patch #1). Without it exynos-dsi >> driver hacks the list of bridges to ensure the order of pre_enable calls >> needed for proper operation. This works somehow with DSI panels on my >> test systems, but it has been reported that it doesn't work with a bit >> more complex display pipelines. Only that patch depends on the Dave's >> patches. If you remove it, you would need to adjust the code in the >> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >> better to keep it and merge Dave's patches together with dsi changes, as >> they are the first real client of it. > I think the Dave patches especially "drm/bridge: Introduce > pre_enable_upstream_first to alter bridge init order" seems not 100% > relevant to this series as they affect bridge chain call flow > globally. Having a separate series for that makes sense to me. I'm > sending v5 by excluding those parts. If so then drop the "drm: exynos: dsi: Restore proper bridge chain order" patch and adjust code respectively in samsung-dsim.c. Without the Dave's patches, that one doesn't make sense. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-14 9:21 ` Marek Szyprowski (?) @ 2022-09-14 9:39 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-14 9:39 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 13.09.2022 19:29, Jagan Teki wrote: > > On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 06.09.2022 21:07, Jagan Teki wrote: > >>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > >>> <m.szyprowski@samsung.com> wrote: > >>>> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>>>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>>>> various > >>>>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>>>> > >>>>>> In order to access this DSI controller between various platform SoCs, > >>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>>>> driver. > >>>>>> > >>>>>> This patch is trying to differentiate platform-specific and bridge > >>>>>> driver > >>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>>>> > >>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>>>> detach code along with conventional component_ops. > >>>>>> > >>>>>> - Samsung DSIM is a bridge driver which is common across all > >>>>>> platforms and > >>>>>> the respective platform-specific glue will initialize at the end > >>>>>> of the > >>>>>> probe. The platform-specific operations and other glue calls will > >>>>>> invoke > >>>>>> on associate code areas. > >>>>>> > >>>>>> v4: > >>>>>> * include Inki Dae in MAINTAINERS > >>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>>>> to wait until the DSI driver is probed and registered as component. > >>>>> > >>>>> I will show how to rework this the way it is done in > >>>>> drivers/gpu/drm/exynos/exynos_dp.c and > >>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >>>> I've finally had some time to implement such approach, see > >>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >>>> > >>>> If you want me to send the patches against your v4 patchset, let me > >>>> know, but imho my changes are much more readable after squashing to the > >>>> original patches. > >>>> > >>>> Now the driver is fully multi-arch safe and ready for further > >>>> extensions. I've removed the weak functions, reworked the way the > >>>> plat_data is used (dropped the patch related to it) and restored > >>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >>>> free to resend the above as v5 after testing on your hardware. At least > >>>> it properly works now on all Exynos boards I have, both compiled into > >>>> the kernel or as modules. > >>> Thanks. I've seen the repo added on top of Dave patches - does it mean > >>> these depends on Dave changes as well? > >> Yes and no. My rework doesn't change anything with this dependency. It > >> comes from my patch "drm: exynos: dsi: Restore proper bridge chain > >> order" already included in your series (patch #1). Without it exynos-dsi > >> driver hacks the list of bridges to ensure the order of pre_enable calls > >> needed for proper operation. This works somehow with DSI panels on my > >> test systems, but it has been reported that it doesn't work with a bit > >> more complex display pipelines. Only that patch depends on the Dave's > >> patches. If you remove it, you would need to adjust the code in the > >> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > >> better to keep it and merge Dave's patches together with dsi changes, as > >> they are the first real client of it. > > I think the Dave patches especially "drm/bridge: Introduce > > pre_enable_upstream_first to alter bridge init order" seems not 100% > > relevant to this series as they affect bridge chain call flow > > globally. Having a separate series for that makes sense to me. I'm > > sending v5 by excluding those parts. > > If so then drop the "drm: exynos: dsi: Restore proper bridge chain > order" patch and adjust code respectively in samsung-dsim.c. Without the > Dave's patches, that one doesn't make sense. Doesn't it break Exynos? Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-14 9:39 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-14 9:39 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 13.09.2022 19:29, Jagan Teki wrote: > > On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 06.09.2022 21:07, Jagan Teki wrote: > >>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > >>> <m.szyprowski@samsung.com> wrote: > >>>> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>>>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>>>> various > >>>>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>>>> > >>>>>> In order to access this DSI controller between various platform SoCs, > >>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>>>> driver. > >>>>>> > >>>>>> This patch is trying to differentiate platform-specific and bridge > >>>>>> driver > >>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>>>> > >>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>>>> detach code along with conventional component_ops. > >>>>>> > >>>>>> - Samsung DSIM is a bridge driver which is common across all > >>>>>> platforms and > >>>>>> the respective platform-specific glue will initialize at the end > >>>>>> of the > >>>>>> probe. The platform-specific operations and other glue calls will > >>>>>> invoke > >>>>>> on associate code areas. > >>>>>> > >>>>>> v4: > >>>>>> * include Inki Dae in MAINTAINERS > >>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>>>> to wait until the DSI driver is probed and registered as component. > >>>>> > >>>>> I will show how to rework this the way it is done in > >>>>> drivers/gpu/drm/exynos/exynos_dp.c and > >>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >>>> I've finally had some time to implement such approach, see > >>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >>>> > >>>> If you want me to send the patches against your v4 patchset, let me > >>>> know, but imho my changes are much more readable after squashing to the > >>>> original patches. > >>>> > >>>> Now the driver is fully multi-arch safe and ready for further > >>>> extensions. I've removed the weak functions, reworked the way the > >>>> plat_data is used (dropped the patch related to it) and restored > >>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >>>> free to resend the above as v5 after testing on your hardware. At least > >>>> it properly works now on all Exynos boards I have, both compiled into > >>>> the kernel or as modules. > >>> Thanks. I've seen the repo added on top of Dave patches - does it mean > >>> these depends on Dave changes as well? > >> Yes and no. My rework doesn't change anything with this dependency. It > >> comes from my patch "drm: exynos: dsi: Restore proper bridge chain > >> order" already included in your series (patch #1). Without it exynos-dsi > >> driver hacks the list of bridges to ensure the order of pre_enable calls > >> needed for proper operation. This works somehow with DSI panels on my > >> test systems, but it has been reported that it doesn't work with a bit > >> more complex display pipelines. Only that patch depends on the Dave's > >> patches. If you remove it, you would need to adjust the code in the > >> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > >> better to keep it and merge Dave's patches together with dsi changes, as > >> they are the first real client of it. > > I think the Dave patches especially "drm/bridge: Introduce > > pre_enable_upstream_first to alter bridge init order" seems not 100% > > relevant to this series as they affect bridge chain call flow > > globally. Having a separate series for that makes sense to me. I'm > > sending v5 by excluding those parts. > > If so then drop the "drm: exynos: dsi: Restore proper bridge chain > order" patch and adjust code respectively in samsung-dsim.c. Without the > Dave's patches, that one doesn't make sense. Doesn't it break Exynos? Jagan. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-14 9:39 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-14 9:39 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Neil Armstrong, Robert Foss, Seung-Woo Kim, Kyungmin Park, dri-devel, Tommaso Merciai, Frieder Schrempf, Andrzej Hajda, Adam Ford, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, linux-arm-kernel, Matteo Lisi On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 13.09.2022 19:29, Jagan Teki wrote: > > On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 06.09.2022 21:07, Jagan Teki wrote: > >>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > >>> <m.szyprowski@samsung.com> wrote: > >>>> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>>>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>>>> various > >>>>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>>>> > >>>>>> In order to access this DSI controller between various platform SoCs, > >>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>>>> driver. > >>>>>> > >>>>>> This patch is trying to differentiate platform-specific and bridge > >>>>>> driver > >>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>>>> > >>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>>>> detach code along with conventional component_ops. > >>>>>> > >>>>>> - Samsung DSIM is a bridge driver which is common across all > >>>>>> platforms and > >>>>>> the respective platform-specific glue will initialize at the end > >>>>>> of the > >>>>>> probe. The platform-specific operations and other glue calls will > >>>>>> invoke > >>>>>> on associate code areas. > >>>>>> > >>>>>> v4: > >>>>>> * include Inki Dae in MAINTAINERS > >>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>>>> to wait until the DSI driver is probed and registered as component. > >>>>> > >>>>> I will show how to rework this the way it is done in > >>>>> drivers/gpu/drm/exynos/exynos_dp.c and > >>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >>>> I've finally had some time to implement such approach, see > >>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >>>> > >>>> If you want me to send the patches against your v4 patchset, let me > >>>> know, but imho my changes are much more readable after squashing to the > >>>> original patches. > >>>> > >>>> Now the driver is fully multi-arch safe and ready for further > >>>> extensions. I've removed the weak functions, reworked the way the > >>>> plat_data is used (dropped the patch related to it) and restored > >>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >>>> free to resend the above as v5 after testing on your hardware. At least > >>>> it properly works now on all Exynos boards I have, both compiled into > >>>> the kernel or as modules. > >>> Thanks. I've seen the repo added on top of Dave patches - does it mean > >>> these depends on Dave changes as well? > >> Yes and no. My rework doesn't change anything with this dependency. It > >> comes from my patch "drm: exynos: dsi: Restore proper bridge chain > >> order" already included in your series (patch #1). Without it exynos-dsi > >> driver hacks the list of bridges to ensure the order of pre_enable calls > >> needed for proper operation. This works somehow with DSI panels on my > >> test systems, but it has been reported that it doesn't work with a bit > >> more complex display pipelines. Only that patch depends on the Dave's > >> patches. If you remove it, you would need to adjust the code in the > >> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > >> better to keep it and merge Dave's patches together with dsi changes, as > >> they are the first real client of it. > > I think the Dave patches especially "drm/bridge: Introduce > > pre_enable_upstream_first to alter bridge init order" seems not 100% > > relevant to this series as they affect bridge chain call flow > > globally. Having a separate series for that makes sense to me. I'm > > sending v5 by excluding those parts. > > If so then drop the "drm: exynos: dsi: Restore proper bridge chain > order" patch and adjust code respectively in samsung-dsim.c. Without the > Dave's patches, that one doesn't make sense. Doesn't it break Exynos? Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-14 9:39 ` Jagan Teki (?) @ 2022-09-16 8:28 ` Marek Szyprowski -1 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-16 8:28 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 14.09.2022 11:39, Jagan Teki wrote: > On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 13.09.2022 19:29, Jagan Teki wrote: >>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 06.09.2022 21:07, Jagan Teki wrote: >>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>>>> <m.szyprowski@samsung.com> wrote: >>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>>>> various >>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>>>> >>>>>>>> In order to access this DSI controller between various platform SoCs, >>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>>>> driver. >>>>>>>> >>>>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>>>> driver >>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>>>> >>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>>>> detach code along with conventional component_ops. >>>>>>>> >>>>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>>>> platforms and >>>>>>>> the respective platform-specific glue will initialize at the end >>>>>>>> of the >>>>>>>> probe. The platform-specific operations and other glue calls will >>>>>>>> invoke >>>>>>>> on associate code areas. >>>>>>>> >>>>>>>> v4: >>>>>>>> * include Inki Dae in MAINTAINERS >>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>>>> to wait until the DSI driver is probed and registered as component. >>>>>>> >>>>>>> I will show how to rework this the way it is done in >>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>>>> I've finally had some time to implement such approach, see >>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>>>> >>>>>> If you want me to send the patches against your v4 patchset, let me >>>>>> know, but imho my changes are much more readable after squashing to the >>>>>> original patches. >>>>>> >>>>>> Now the driver is fully multi-arch safe and ready for further >>>>>> extensions. I've removed the weak functions, reworked the way the >>>>>> plat_data is used (dropped the patch related to it) and restored >>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>>>> free to resend the above as v5 after testing on your hardware. At least >>>>>> it properly works now on all Exynos boards I have, both compiled into >>>>>> the kernel or as modules. >>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>>>> these depends on Dave changes as well? >>>> Yes and no. My rework doesn't change anything with this dependency. It >>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >>>> order" already included in your series (patch #1). Without it exynos-dsi >>>> driver hacks the list of bridges to ensure the order of pre_enable calls >>>> needed for proper operation. This works somehow with DSI panels on my >>>> test systems, but it has been reported that it doesn't work with a bit >>>> more complex display pipelines. Only that patch depends on the Dave's >>>> patches. If you remove it, you would need to adjust the code in the >>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >>>> better to keep it and merge Dave's patches together with dsi changes, as >>>> they are the first real client of it. >>> I think the Dave patches especially "drm/bridge: Introduce >>> pre_enable_upstream_first to alter bridge init order" seems not 100% >>> relevant to this series as they affect bridge chain call flow >>> globally. Having a separate series for that makes sense to me. I'm >>> sending v5 by excluding those parts. >> If so then drop the "drm: exynos: dsi: Restore proper bridge chain >> order" patch and adjust code respectively in samsung-dsim.c. Without the >> Dave's patches, that one doesn't make sense. > Doesn't it break Exynos? No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain order" patch doesn't change much against the current state of the driver. Here is my rework of your v4 patchset without the mentioned patch and Dave's patches: https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked-minimal Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-16 8:28 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-16 8:28 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 14.09.2022 11:39, Jagan Teki wrote: > On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 13.09.2022 19:29, Jagan Teki wrote: >>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 06.09.2022 21:07, Jagan Teki wrote: >>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>>>> <m.szyprowski@samsung.com> wrote: >>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>>>> various >>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>>>> >>>>>>>> In order to access this DSI controller between various platform SoCs, >>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>>>> driver. >>>>>>>> >>>>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>>>> driver >>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>>>> >>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>>>> detach code along with conventional component_ops. >>>>>>>> >>>>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>>>> platforms and >>>>>>>> the respective platform-specific glue will initialize at the end >>>>>>>> of the >>>>>>>> probe. The platform-specific operations and other glue calls will >>>>>>>> invoke >>>>>>>> on associate code areas. >>>>>>>> >>>>>>>> v4: >>>>>>>> * include Inki Dae in MAINTAINERS >>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>>>> to wait until the DSI driver is probed and registered as component. >>>>>>> >>>>>>> I will show how to rework this the way it is done in >>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>>>> I've finally had some time to implement such approach, see >>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>>>> >>>>>> If you want me to send the patches against your v4 patchset, let me >>>>>> know, but imho my changes are much more readable after squashing to the >>>>>> original patches. >>>>>> >>>>>> Now the driver is fully multi-arch safe and ready for further >>>>>> extensions. I've removed the weak functions, reworked the way the >>>>>> plat_data is used (dropped the patch related to it) and restored >>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>>>> free to resend the above as v5 after testing on your hardware. At least >>>>>> it properly works now on all Exynos boards I have, both compiled into >>>>>> the kernel or as modules. >>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>>>> these depends on Dave changes as well? >>>> Yes and no. My rework doesn't change anything with this dependency. It >>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >>>> order" already included in your series (patch #1). Without it exynos-dsi >>>> driver hacks the list of bridges to ensure the order of pre_enable calls >>>> needed for proper operation. This works somehow with DSI panels on my >>>> test systems, but it has been reported that it doesn't work with a bit >>>> more complex display pipelines. Only that patch depends on the Dave's >>>> patches. If you remove it, you would need to adjust the code in the >>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >>>> better to keep it and merge Dave's patches together with dsi changes, as >>>> they are the first real client of it. >>> I think the Dave patches especially "drm/bridge: Introduce >>> pre_enable_upstream_first to alter bridge init order" seems not 100% >>> relevant to this series as they affect bridge chain call flow >>> globally. Having a separate series for that makes sense to me. I'm >>> sending v5 by excluding those parts. >> If so then drop the "drm: exynos: dsi: Restore proper bridge chain >> order" patch and adjust code respectively in samsung-dsim.c. Without the >> Dave's patches, that one doesn't make sense. > Doesn't it break Exynos? No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain order" patch doesn't change much against the current state of the driver. Here is my rework of your v4 patchset without the mentioned patch and Dave's patches: https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked-minimal Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-16 8:28 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-16 8:28 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Neil Armstrong, Robert Foss, Seung-Woo Kim, Kyungmin Park, dri-devel, Tommaso Merciai, Frieder Schrempf, Andrzej Hajda, Adam Ford, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, linux-arm-kernel, Matteo Lisi Hi Jagan, On 14.09.2022 11:39, Jagan Teki wrote: > On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 13.09.2022 19:29, Jagan Teki wrote: >>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 06.09.2022 21:07, Jagan Teki wrote: >>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>>>> <m.szyprowski@samsung.com> wrote: >>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>>>> various >>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>>>> >>>>>>>> In order to access this DSI controller between various platform SoCs, >>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>>>> driver. >>>>>>>> >>>>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>>>> driver >>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>>>> >>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>>>> detach code along with conventional component_ops. >>>>>>>> >>>>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>>>> platforms and >>>>>>>> the respective platform-specific glue will initialize at the end >>>>>>>> of the >>>>>>>> probe. The platform-specific operations and other glue calls will >>>>>>>> invoke >>>>>>>> on associate code areas. >>>>>>>> >>>>>>>> v4: >>>>>>>> * include Inki Dae in MAINTAINERS >>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>>>> to wait until the DSI driver is probed and registered as component. >>>>>>> >>>>>>> I will show how to rework this the way it is done in >>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>>>> I've finally had some time to implement such approach, see >>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>>>> >>>>>> If you want me to send the patches against your v4 patchset, let me >>>>>> know, but imho my changes are much more readable after squashing to the >>>>>> original patches. >>>>>> >>>>>> Now the driver is fully multi-arch safe and ready for further >>>>>> extensions. I've removed the weak functions, reworked the way the >>>>>> plat_data is used (dropped the patch related to it) and restored >>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>>>> free to resend the above as v5 after testing on your hardware. At least >>>>>> it properly works now on all Exynos boards I have, both compiled into >>>>>> the kernel or as modules. >>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>>>> these depends on Dave changes as well? >>>> Yes and no. My rework doesn't change anything with this dependency. It >>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >>>> order" already included in your series (patch #1). Without it exynos-dsi >>>> driver hacks the list of bridges to ensure the order of pre_enable calls >>>> needed for proper operation. This works somehow with DSI panels on my >>>> test systems, but it has been reported that it doesn't work with a bit >>>> more complex display pipelines. Only that patch depends on the Dave's >>>> patches. If you remove it, you would need to adjust the code in the >>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >>>> better to keep it and merge Dave's patches together with dsi changes, as >>>> they are the first real client of it. >>> I think the Dave patches especially "drm/bridge: Introduce >>> pre_enable_upstream_first to alter bridge init order" seems not 100% >>> relevant to this series as they affect bridge chain call flow >>> globally. Having a separate series for that makes sense to me. I'm >>> sending v5 by excluding those parts. >> If so then drop the "drm: exynos: dsi: Restore proper bridge chain >> order" patch and adjust code respectively in samsung-dsim.c. Without the >> Dave's patches, that one doesn't make sense. > Doesn't it break Exynos? No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain order" patch doesn't change much against the current state of the driver. Here is my rework of your v4 patchset without the mentioned patch and Dave's patches: https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked-minimal Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-16 8:28 ` Marek Szyprowski (?) @ 2022-09-16 10:21 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-16 10:21 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Neil Armstrong, Robert Foss, Seung-Woo Kim, Kyungmin Park, dri-devel, Tommaso Merciai, Frieder Schrempf, Andrzej Hajda, Adam Ford, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, linux-arm-kernel, Matteo Lisi On Fri, Sep 16, 2022 at 1:58 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 14.09.2022 11:39, Jagan Teki wrote: > > On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 13.09.2022 19:29, Jagan Teki wrote: > >>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > >>> <m.szyprowski@samsung.com> wrote: > >>>> On 06.09.2022 21:07, Jagan Teki wrote: > >>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > >>>>> <m.szyprowski@samsung.com> wrote: > >>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>>>>>> various > >>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>>>>>> > >>>>>>>> In order to access this DSI controller between various platform SoCs, > >>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>>>>>> driver. > >>>>>>>> > >>>>>>>> This patch is trying to differentiate platform-specific and bridge > >>>>>>>> driver > >>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>>>>>> > >>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>>>>>> detach code along with conventional component_ops. > >>>>>>>> > >>>>>>>> - Samsung DSIM is a bridge driver which is common across all > >>>>>>>> platforms and > >>>>>>>> the respective platform-specific glue will initialize at the end > >>>>>>>> of the > >>>>>>>> probe. The platform-specific operations and other glue calls will > >>>>>>>> invoke > >>>>>>>> on associate code areas. > >>>>>>>> > >>>>>>>> v4: > >>>>>>>> * include Inki Dae in MAINTAINERS > >>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>>>>>> to wait until the DSI driver is probed and registered as component. > >>>>>>> > >>>>>>> I will show how to rework this the way it is done in > >>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and > >>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >>>>>> I've finally had some time to implement such approach, see > >>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >>>>>> > >>>>>> If you want me to send the patches against your v4 patchset, let me > >>>>>> know, but imho my changes are much more readable after squashing to the > >>>>>> original patches. > >>>>>> > >>>>>> Now the driver is fully multi-arch safe and ready for further > >>>>>> extensions. I've removed the weak functions, reworked the way the > >>>>>> plat_data is used (dropped the patch related to it) and restored > >>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >>>>>> free to resend the above as v5 after testing on your hardware. At least > >>>>>> it properly works now on all Exynos boards I have, both compiled into > >>>>>> the kernel or as modules. > >>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean > >>>>> these depends on Dave changes as well? > >>>> Yes and no. My rework doesn't change anything with this dependency. It > >>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain > >>>> order" already included in your series (patch #1). Without it exynos-dsi > >>>> driver hacks the list of bridges to ensure the order of pre_enable calls > >>>> needed for proper operation. This works somehow with DSI panels on my > >>>> test systems, but it has been reported that it doesn't work with a bit > >>>> more complex display pipelines. Only that patch depends on the Dave's > >>>> patches. If you remove it, you would need to adjust the code in the > >>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > >>>> better to keep it and merge Dave's patches together with dsi changes, as > >>>> they are the first real client of it. > >>> I think the Dave patches especially "drm/bridge: Introduce > >>> pre_enable_upstream_first to alter bridge init order" seems not 100% > >>> relevant to this series as they affect bridge chain call flow > >>> globally. Having a separate series for that makes sense to me. I'm > >>> sending v5 by excluding those parts. > >> If so then drop the "drm: exynos: dsi: Restore proper bridge chain > >> order" patch and adjust code respectively in samsung-dsim.c. Without the > >> Dave's patches, that one doesn't make sense. > > Doesn't it break Exynos? > > No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain > order" patch doesn't change much against the current state of the driver. > > Here is my rework of your v4 patchset without the mentioned patch and > Dave's patches: > > https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked-minimal We have one problem with getting bus format from previous bridge if we pass NULL in bridge_func.attach() https://github.com/mszyprow/linux/commit/0fa57e33b3bf866efc4c17ab20eec28d6e07b3e9#diff-3fe873f1ada5f1dfcf2a50ac114bdab3ea7b026d12278648ca40809d3fa1a331R1321 Booting the video as it assigns default bus format if the previous bus format is unknown. [ 1.635984] samsung-dsim 32e10000.dsi: [drm:samsung_dsim_host_attach] Attached sn65dsi83 device [ 1.648067] [drm] Initialized mxsfb-drm 1.0.0 20160824 for 32e00000.lcdif on minor 0 [ 1.658726] mmc0: SDHCI controller on 30b40000.mmc [30b40000.mmc] using ADMA [ 1.681893] sn65dsi83 3-002c: Unsupported LVDS bus format 0x100a, please check output bridge driver. Falling back to SPWG24. Does passing the bridge to drm_bridge_attach is working on your platform? return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, flags); Thanks, Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-16 10:21 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-16 10:21 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Fri, Sep 16, 2022 at 1:58 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 14.09.2022 11:39, Jagan Teki wrote: > > On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 13.09.2022 19:29, Jagan Teki wrote: > >>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > >>> <m.szyprowski@samsung.com> wrote: > >>>> On 06.09.2022 21:07, Jagan Teki wrote: > >>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > >>>>> <m.szyprowski@samsung.com> wrote: > >>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>>>>>> various > >>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>>>>>> > >>>>>>>> In order to access this DSI controller between various platform SoCs, > >>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>>>>>> driver. > >>>>>>>> > >>>>>>>> This patch is trying to differentiate platform-specific and bridge > >>>>>>>> driver > >>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>>>>>> > >>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>>>>>> detach code along with conventional component_ops. > >>>>>>>> > >>>>>>>> - Samsung DSIM is a bridge driver which is common across all > >>>>>>>> platforms and > >>>>>>>> the respective platform-specific glue will initialize at the end > >>>>>>>> of the > >>>>>>>> probe. The platform-specific operations and other glue calls will > >>>>>>>> invoke > >>>>>>>> on associate code areas. > >>>>>>>> > >>>>>>>> v4: > >>>>>>>> * include Inki Dae in MAINTAINERS > >>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>>>>>> to wait until the DSI driver is probed and registered as component. > >>>>>>> > >>>>>>> I will show how to rework this the way it is done in > >>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and > >>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >>>>>> I've finally had some time to implement such approach, see > >>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >>>>>> > >>>>>> If you want me to send the patches against your v4 patchset, let me > >>>>>> know, but imho my changes are much more readable after squashing to the > >>>>>> original patches. > >>>>>> > >>>>>> Now the driver is fully multi-arch safe and ready for further > >>>>>> extensions. I've removed the weak functions, reworked the way the > >>>>>> plat_data is used (dropped the patch related to it) and restored > >>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >>>>>> free to resend the above as v5 after testing on your hardware. At least > >>>>>> it properly works now on all Exynos boards I have, both compiled into > >>>>>> the kernel or as modules. > >>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean > >>>>> these depends on Dave changes as well? > >>>> Yes and no. My rework doesn't change anything with this dependency. It > >>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain > >>>> order" already included in your series (patch #1). Without it exynos-dsi > >>>> driver hacks the list of bridges to ensure the order of pre_enable calls > >>>> needed for proper operation. This works somehow with DSI panels on my > >>>> test systems, but it has been reported that it doesn't work with a bit > >>>> more complex display pipelines. Only that patch depends on the Dave's > >>>> patches. If you remove it, you would need to adjust the code in the > >>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > >>>> better to keep it and merge Dave's patches together with dsi changes, as > >>>> they are the first real client of it. > >>> I think the Dave patches especially "drm/bridge: Introduce > >>> pre_enable_upstream_first to alter bridge init order" seems not 100% > >>> relevant to this series as they affect bridge chain call flow > >>> globally. Having a separate series for that makes sense to me. I'm > >>> sending v5 by excluding those parts. > >> If so then drop the "drm: exynos: dsi: Restore proper bridge chain > >> order" patch and adjust code respectively in samsung-dsim.c. Without the > >> Dave's patches, that one doesn't make sense. > > Doesn't it break Exynos? > > No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain > order" patch doesn't change much against the current state of the driver. > > Here is my rework of your v4 patchset without the mentioned patch and > Dave's patches: > > https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked-minimal We have one problem with getting bus format from previous bridge if we pass NULL in bridge_func.attach() https://github.com/mszyprow/linux/commit/0fa57e33b3bf866efc4c17ab20eec28d6e07b3e9#diff-3fe873f1ada5f1dfcf2a50ac114bdab3ea7b026d12278648ca40809d3fa1a331R1321 Booting the video as it assigns default bus format if the previous bus format is unknown. [ 1.635984] samsung-dsim 32e10000.dsi: [drm:samsung_dsim_host_attach] Attached sn65dsi83 device [ 1.648067] [drm] Initialized mxsfb-drm 1.0.0 20160824 for 32e00000.lcdif on minor 0 [ 1.658726] mmc0: SDHCI controller on 30b40000.mmc [30b40000.mmc] using ADMA [ 1.681893] sn65dsi83 3-002c: Unsupported LVDS bus format 0x100a, please check output bridge driver. Falling back to SPWG24. Does passing the bridge to drm_bridge_attach is working on your platform? return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, flags); Thanks, Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-16 10:21 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-16 10:21 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Fri, Sep 16, 2022 at 1:58 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 14.09.2022 11:39, Jagan Teki wrote: > > On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski > > <m.szyprowski@samsung.com> wrote: > >> On 13.09.2022 19:29, Jagan Teki wrote: > >>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski > >>> <m.szyprowski@samsung.com> wrote: > >>>> On 06.09.2022 21:07, Jagan Teki wrote: > >>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski > >>>>> <m.szyprowski@samsung.com> wrote: > >>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: > >>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: > >>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in > >>>>>>>> various > >>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. > >>>>>>>> > >>>>>>>> In order to access this DSI controller between various platform SoCs, > >>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge > >>>>>>>> driver. > >>>>>>>> > >>>>>>>> This patch is trying to differentiate platform-specific and bridge > >>>>>>>> driver > >>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific > >>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. > >>>>>>>> > >>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and > >>>>>>>> detach code along with conventional component_ops. > >>>>>>>> > >>>>>>>> - Samsung DSIM is a bridge driver which is common across all > >>>>>>>> platforms and > >>>>>>>> the respective platform-specific glue will initialize at the end > >>>>>>>> of the > >>>>>>>> probe. The platform-specific operations and other glue calls will > >>>>>>>> invoke > >>>>>>>> on associate code areas. > >>>>>>>> > >>>>>>>> v4: > >>>>>>>> * include Inki Dae in MAINTAINERS > >>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > >>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able > >>>>>>> to wait until the DSI driver is probed and registered as component. > >>>>>>> > >>>>>>> I will show how to rework this the way it is done in > >>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and > >>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... > >>>>>> I've finally had some time to implement such approach, see > >>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked > >>>>>> > >>>>>> If you want me to send the patches against your v4 patchset, let me > >>>>>> know, but imho my changes are much more readable after squashing to the > >>>>>> original patches. > >>>>>> > >>>>>> Now the driver is fully multi-arch safe and ready for further > >>>>>> extensions. I've removed the weak functions, reworked the way the > >>>>>> plat_data is used (dropped the patch related to it) and restored > >>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel > >>>>>> free to resend the above as v5 after testing on your hardware. At least > >>>>>> it properly works now on all Exynos boards I have, both compiled into > >>>>>> the kernel or as modules. > >>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean > >>>>> these depends on Dave changes as well? > >>>> Yes and no. My rework doesn't change anything with this dependency. It > >>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain > >>>> order" already included in your series (patch #1). Without it exynos-dsi > >>>> driver hacks the list of bridges to ensure the order of pre_enable calls > >>>> needed for proper operation. This works somehow with DSI panels on my > >>>> test systems, but it has been reported that it doesn't work with a bit > >>>> more complex display pipelines. Only that patch depends on the Dave's > >>>> patches. If you remove it, you would need to adjust the code in the > >>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be > >>>> better to keep it and merge Dave's patches together with dsi changes, as > >>>> they are the first real client of it. > >>> I think the Dave patches especially "drm/bridge: Introduce > >>> pre_enable_upstream_first to alter bridge init order" seems not 100% > >>> relevant to this series as they affect bridge chain call flow > >>> globally. Having a separate series for that makes sense to me. I'm > >>> sending v5 by excluding those parts. > >> If so then drop the "drm: exynos: dsi: Restore proper bridge chain > >> order" patch and adjust code respectively in samsung-dsim.c. Without the > >> Dave's patches, that one doesn't make sense. > > Doesn't it break Exynos? > > No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain > order" patch doesn't change much against the current state of the driver. > > Here is my rework of your v4 patchset without the mentioned patch and > Dave's patches: > > https://github.com/mszyprow/linux/tree/v6.0-dsi-v4-reworked-minimal We have one problem with getting bus format from previous bridge if we pass NULL in bridge_func.attach() https://github.com/mszyprow/linux/commit/0fa57e33b3bf866efc4c17ab20eec28d6e07b3e9#diff-3fe873f1ada5f1dfcf2a50ac114bdab3ea7b026d12278648ca40809d3fa1a331R1321 Booting the video as it assigns default bus format if the previous bus format is unknown. [ 1.635984] samsung-dsim 32e10000.dsi: [drm:samsung_dsim_host_attach] Attached sn65dsi83 device [ 1.648067] [drm] Initialized mxsfb-drm 1.0.0 20160824 for 32e00000.lcdif on minor 0 [ 1.658726] mmc0: SDHCI controller on 30b40000.mmc [30b40000.mmc] using ADMA [ 1.681893] sn65dsi83 3-002c: Unsupported LVDS bus format 0x100a, please check output bridge driver. Falling back to SPWG24. Does passing the bridge to drm_bridge_attach is working on your platform? return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, flags); Thanks, Jagan. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver 2022-09-16 10:21 ` Jagan Teki (?) @ 2022-09-19 6:22 ` Marek Szyprowski -1 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-19 6:22 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 16.09.2022 12:21, Jagan Teki wrote: > On Fri, Sep 16, 2022 at 1:58 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 14.09.2022 11:39, Jagan Teki wrote: >>> On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 13.09.2022 19:29, Jagan Teki wrote: >>>>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski >>>>> <m.szyprowski@samsung.com> wrote: >>>>>> On 06.09.2022 21:07, Jagan Teki wrote: >>>>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>>>>>> <m.szyprowski@samsung.com> wrote: >>>>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>>>>>> various >>>>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>>>>>> >>>>>>>>>> In order to access this DSI controller between various platform SoCs, >>>>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>>>>>> driver. >>>>>>>>>> >>>>>>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>>>>>> driver >>>>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>>>>>> >>>>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>>>>>> detach code along with conventional component_ops. >>>>>>>>>> >>>>>>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>>>>>> platforms and >>>>>>>>>> the respective platform-specific glue will initialize at the end >>>>>>>>>> of the >>>>>>>>>> probe. The platform-specific operations and other glue calls will >>>>>>>>>> invoke >>>>>>>>>> on associate code areas. >>>>>>>>>> >>>>>>>>>> v4: >>>>>>>>>> * include Inki Dae in MAINTAINERS >>>>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>>>>>> to wait until the DSI driver is probed and registered as component. >>>>>>>>> >>>>>>>>> I will show how to rework this the way it is done in >>>>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>>>>>> I've finally had some time to implement such approach, see >>>>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>>>>>> >>>>>>>> If you want me to send the patches against your v4 patchset, let me >>>>>>>> know, but imho my changes are much more readable after squashing to the >>>>>>>> original patches. >>>>>>>> >>>>>>>> Now the driver is fully multi-arch safe and ready for further >>>>>>>> extensions. I've removed the weak functions, reworked the way the >>>>>>>> plat_data is used (dropped the patch related to it) and restored >>>>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>>>>>> free to resend the above as v5 after testing on your hardware. At least >>>>>>>> it properly works now on all Exynos boards I have, both compiled into >>>>>>>> the kernel or as modules. >>>>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>>>>>> these depends on Dave changes as well? >>>>>> Yes and no. My rework doesn't change anything with this dependency. It >>>>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >>>>>> order" already included in your series (patch #1). Without it exynos-dsi >>>>>> driver hacks the list of bridges to ensure the order of pre_enable calls >>>>>> needed for proper operation. This works somehow with DSI panels on my >>>>>> test systems, but it has been reported that it doesn't work with a bit >>>>>> more complex display pipelines. Only that patch depends on the Dave's >>>>>> patches. If you remove it, you would need to adjust the code in the >>>>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >>>>>> better to keep it and merge Dave's patches together with dsi changes, as >>>>>> they are the first real client of it. >>>>> I think the Dave patches especially "drm/bridge: Introduce >>>>> pre_enable_upstream_first to alter bridge init order" seems not 100% >>>>> relevant to this series as they affect bridge chain call flow >>>>> globally. Having a separate series for that makes sense to me. I'm >>>>> sending v5 by excluding those parts. >>>> If so then drop the "drm: exynos: dsi: Restore proper bridge chain >>>> order" patch and adjust code respectively in samsung-dsim.c. Without the >>>> Dave's patches, that one doesn't make sense. >>> Doesn't it break Exynos? >> No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain >> order" patch doesn't change much against the current state of the driver. >> >> Here is my rework of your v4 patchset without the mentioned patch and >> Dave's patches: >> >> https://protect2.fireeye.com/v1/url?k=6282936d-3d19aa74-62831822-000babff3793-9317af6e2b207460&q=1&e=cd36cc51-8faa-4812-880a-8242739a86bd&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked-minimal > We have one problem with getting bus format from previous bridge if we > pass NULL in bridge_func.attach() > https://protect2.fireeye.com/v1/url?k=bdc3e18a-e258d893-bdc26ac5-000babff3793-1dd81e5acf9d7f83&q=1&e=cd36cc51-8faa-4812-880a-8242739a86bd&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Fcommit%2F0fa57e33b3bf866efc4c17ab20eec28d6e07b3e9%23diff-3fe873f1ada5f1dfcf2a50ac114bdab3ea7b026d12278648ca40809d3fa1a331R1321 > > Booting the video as it assigns default bus format if the previous bus > format is unknown. > > [ 1.635984] samsung-dsim 32e10000.dsi: > [drm:samsung_dsim_host_attach] Attached sn65dsi83 device > [ 1.648067] [drm] Initialized mxsfb-drm 1.0.0 20160824 for > 32e00000.lcdif on minor 0 > [ 1.658726] mmc0: SDHCI controller on 30b40000.mmc [30b40000.mmc] > using ADMA > [ 1.681893] sn65dsi83 3-002c: Unsupported LVDS bus format 0x100a, > please check output bridge driver. Falling back to SPWG24. > > Does passing the bridge to drm_bridge_attach is working on your platform? > return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, flags); Nope, it fails: [drm] Initialized exynos 1.1.0 20180330 for exynos-drm on minor 0 exynos-dsi 11c80000.dsi: [drm:samsung_dsim_host_attach] Attached s6e8aa0 device panel-samsung-s6e8aa0 11c80000.dsi.0: error -22 setting maximum return packet size to 3 panel-samsung-s6e8aa0 11c80000.dsi.0: read id failed I've already pointed that it makes sense only together with Dave's patches. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-19 6:22 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-19 6:22 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Neil Armstrong, linux-amarula, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart Hi Jagan, On 16.09.2022 12:21, Jagan Teki wrote: > On Fri, Sep 16, 2022 at 1:58 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 14.09.2022 11:39, Jagan Teki wrote: >>> On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 13.09.2022 19:29, Jagan Teki wrote: >>>>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski >>>>> <m.szyprowski@samsung.com> wrote: >>>>>> On 06.09.2022 21:07, Jagan Teki wrote: >>>>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>>>>>> <m.szyprowski@samsung.com> wrote: >>>>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>>>>>> various >>>>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>>>>>> >>>>>>>>>> In order to access this DSI controller between various platform SoCs, >>>>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>>>>>> driver. >>>>>>>>>> >>>>>>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>>>>>> driver >>>>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>>>>>> >>>>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>>>>>> detach code along with conventional component_ops. >>>>>>>>>> >>>>>>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>>>>>> platforms and >>>>>>>>>> the respective platform-specific glue will initialize at the end >>>>>>>>>> of the >>>>>>>>>> probe. The platform-specific operations and other glue calls will >>>>>>>>>> invoke >>>>>>>>>> on associate code areas. >>>>>>>>>> >>>>>>>>>> v4: >>>>>>>>>> * include Inki Dae in MAINTAINERS >>>>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>>>>>> to wait until the DSI driver is probed and registered as component. >>>>>>>>> >>>>>>>>> I will show how to rework this the way it is done in >>>>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>>>>>> I've finally had some time to implement such approach, see >>>>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>>>>>> >>>>>>>> If you want me to send the patches against your v4 patchset, let me >>>>>>>> know, but imho my changes are much more readable after squashing to the >>>>>>>> original patches. >>>>>>>> >>>>>>>> Now the driver is fully multi-arch safe and ready for further >>>>>>>> extensions. I've removed the weak functions, reworked the way the >>>>>>>> plat_data is used (dropped the patch related to it) and restored >>>>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>>>>>> free to resend the above as v5 after testing on your hardware. At least >>>>>>>> it properly works now on all Exynos boards I have, both compiled into >>>>>>>> the kernel or as modules. >>>>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>>>>>> these depends on Dave changes as well? >>>>>> Yes and no. My rework doesn't change anything with this dependency. It >>>>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >>>>>> order" already included in your series (patch #1). Without it exynos-dsi >>>>>> driver hacks the list of bridges to ensure the order of pre_enable calls >>>>>> needed for proper operation. This works somehow with DSI panels on my >>>>>> test systems, but it has been reported that it doesn't work with a bit >>>>>> more complex display pipelines. Only that patch depends on the Dave's >>>>>> patches. If you remove it, you would need to adjust the code in the >>>>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >>>>>> better to keep it and merge Dave's patches together with dsi changes, as >>>>>> they are the first real client of it. >>>>> I think the Dave patches especially "drm/bridge: Introduce >>>>> pre_enable_upstream_first to alter bridge init order" seems not 100% >>>>> relevant to this series as they affect bridge chain call flow >>>>> globally. Having a separate series for that makes sense to me. I'm >>>>> sending v5 by excluding those parts. >>>> If so then drop the "drm: exynos: dsi: Restore proper bridge chain >>>> order" patch and adjust code respectively in samsung-dsim.c. Without the >>>> Dave's patches, that one doesn't make sense. >>> Doesn't it break Exynos? >> No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain >> order" patch doesn't change much against the current state of the driver. >> >> Here is my rework of your v4 patchset without the mentioned patch and >> Dave's patches: >> >> https://protect2.fireeye.com/v1/url?k=6282936d-3d19aa74-62831822-000babff3793-9317af6e2b207460&q=1&e=cd36cc51-8faa-4812-880a-8242739a86bd&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked-minimal > We have one problem with getting bus format from previous bridge if we > pass NULL in bridge_func.attach() > https://protect2.fireeye.com/v1/url?k=bdc3e18a-e258d893-bdc26ac5-000babff3793-1dd81e5acf9d7f83&q=1&e=cd36cc51-8faa-4812-880a-8242739a86bd&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Fcommit%2F0fa57e33b3bf866efc4c17ab20eec28d6e07b3e9%23diff-3fe873f1ada5f1dfcf2a50ac114bdab3ea7b026d12278648ca40809d3fa1a331R1321 > > Booting the video as it assigns default bus format if the previous bus > format is unknown. > > [ 1.635984] samsung-dsim 32e10000.dsi: > [drm:samsung_dsim_host_attach] Attached sn65dsi83 device > [ 1.648067] [drm] Initialized mxsfb-drm 1.0.0 20160824 for > 32e00000.lcdif on minor 0 > [ 1.658726] mmc0: SDHCI controller on 30b40000.mmc [30b40000.mmc] > using ADMA > [ 1.681893] sn65dsi83 3-002c: Unsupported LVDS bus format 0x100a, > please check output bridge driver. Falling back to SPWG24. > > Does passing the bridge to drm_bridge_attach is working on your platform? > return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, flags); Nope, it fails: [drm] Initialized exynos 1.1.0 20180330 for exynos-drm on minor 0 exynos-dsi 11c80000.dsi: [drm:samsung_dsim_host_attach] Attached s6e8aa0 device panel-samsung-s6e8aa0 11c80000.dsi.0: error -22 setting maximum return packet size to 3 panel-samsung-s6e8aa0 11c80000.dsi.0: read id failed I've already pointed that it makes sense only together with Dave's patches. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver @ 2022-09-19 6:22 ` Marek Szyprowski 0 siblings, 0 replies; 76+ messages in thread From: Marek Szyprowski @ 2022-09-19 6:22 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Neil Armstrong, Robert Foss, Seung-Woo Kim, Kyungmin Park, dri-devel, Tommaso Merciai, Frieder Schrempf, Andrzej Hajda, Adam Ford, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, linux-arm-kernel, Matteo Lisi Hi Jagan, On 16.09.2022 12:21, Jagan Teki wrote: > On Fri, Sep 16, 2022 at 1:58 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: >> On 14.09.2022 11:39, Jagan Teki wrote: >>> On Wed, Sep 14, 2022 at 2:51 PM Marek Szyprowski >>> <m.szyprowski@samsung.com> wrote: >>>> On 13.09.2022 19:29, Jagan Teki wrote: >>>>> On Wed, Sep 7, 2022 at 3:34 PM Marek Szyprowski >>>>> <m.szyprowski@samsung.com> wrote: >>>>>> On 06.09.2022 21:07, Jagan Teki wrote: >>>>>>> On Mon, Sep 5, 2022 at 4:54 PM Marek Szyprowski >>>>>>> <m.szyprowski@samsung.com> wrote: >>>>>>>> On 02.09.2022 12:47, Marek Szyprowski wrote: >>>>>>>>> On 29.08.2022 20:40, Jagan Teki wrote: >>>>>>>>>> Samsung MIPI DSIM controller is common DSI IP that can be used in >>>>>>>>>> various >>>>>>>>>> SoCs like Exynos, i.MX8M Mini/Nano. >>>>>>>>>> >>>>>>>>>> In order to access this DSI controller between various platform SoCs, >>>>>>>>>> the ideal way to incorporate this in the drm stack is via the drm bridge >>>>>>>>>> driver. >>>>>>>>>> >>>>>>>>>> This patch is trying to differentiate platform-specific and bridge >>>>>>>>>> driver >>>>>>>>>> code and keep maintaining the exynos_drm_dsi.c code as platform-specific >>>>>>>>>> glue code and samsung-dsim.c as a common bridge driver code. >>>>>>>>>> >>>>>>>>>> - Exynos specific glue code is exynos specific te_irq, host_attach, and >>>>>>>>>> detach code along with conventional component_ops. >>>>>>>>>> >>>>>>>>>> - Samsung DSIM is a bridge driver which is common across all >>>>>>>>>> platforms and >>>>>>>>>> the respective platform-specific glue will initialize at the end >>>>>>>>>> of the >>>>>>>>>> probe. The platform-specific operations and other glue calls will >>>>>>>>>> invoke >>>>>>>>>> on associate code areas. >>>>>>>>>> >>>>>>>>>> v4: >>>>>>>>>> * include Inki Dae in MAINTAINERS >>>>>>>>>> * remove dsi_driver probe in exynos_drm_drv to support multi-arch build >>>>>>>>> This breaks Exynos DRM completely as the Exynos DRM driver is not able >>>>>>>>> to wait until the DSI driver is probed and registered as component. >>>>>>>>> >>>>>>>>> I will show how to rework this the way it is done in >>>>>>>>> drivers/gpu/drm/exynos/exynos_dp.c and >>>>>>>>> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c soon... >>>>>>>> I've finally had some time to implement such approach, see >>>>>>>> https://protect2.fireeye.com/v1/url?k=c5d024d9-a4ab8e4e-c5d1af96-74fe4860001d-625a8324a9797375&q=1&e=489b94d4-84fb-408e-b679-a8d27acf2930&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked >>>>>>>> >>>>>>>> If you want me to send the patches against your v4 patchset, let me >>>>>>>> know, but imho my changes are much more readable after squashing to the >>>>>>>> original patches. >>>>>>>> >>>>>>>> Now the driver is fully multi-arch safe and ready for further >>>>>>>> extensions. I've removed the weak functions, reworked the way the >>>>>>>> plat_data is used (dropped the patch related to it) and restored >>>>>>>> exynos-dsi driver as a part of the Exynos DRM drivers/subsystem. Feel >>>>>>>> free to resend the above as v5 after testing on your hardware. At least >>>>>>>> it properly works now on all Exynos boards I have, both compiled into >>>>>>>> the kernel or as modules. >>>>>>> Thanks. I've seen the repo added on top of Dave patches - does it mean >>>>>>> these depends on Dave changes as well? >>>>>> Yes and no. My rework doesn't change anything with this dependency. It >>>>>> comes from my patch "drm: exynos: dsi: Restore proper bridge chain >>>>>> order" already included in your series (patch #1). Without it exynos-dsi >>>>>> driver hacks the list of bridges to ensure the order of pre_enable calls >>>>>> needed for proper operation. This works somehow with DSI panels on my >>>>>> test systems, but it has been reported that it doesn't work with a bit >>>>>> more complex display pipelines. Only that patch depends on the Dave's >>>>>> patches. If you remove it, you would need to adjust the code in the >>>>>> exynos_drm_dsi.c and samsung-dsim.c respectively. imho it would be >>>>>> better to keep it and merge Dave's patches together with dsi changes, as >>>>>> they are the first real client of it. >>>>> I think the Dave patches especially "drm/bridge: Introduce >>>>> pre_enable_upstream_first to alter bridge init order" seems not 100% >>>>> relevant to this series as they affect bridge chain call flow >>>>> globally. Having a separate series for that makes sense to me. I'm >>>>> sending v5 by excluding those parts. >>>> If so then drop the "drm: exynos: dsi: Restore proper bridge chain >>>> order" patch and adjust code respectively in samsung-dsim.c. Without the >>>> Dave's patches, that one doesn't make sense. >>> Doesn't it break Exynos? >> No it won't. Lack of the "drm: exynos: dsi: Restore proper bridge chain >> order" patch doesn't change much against the current state of the driver. >> >> Here is my rework of your v4 patchset without the mentioned patch and >> Dave's patches: >> >> https://protect2.fireeye.com/v1/url?k=6282936d-3d19aa74-62831822-000babff3793-9317af6e2b207460&q=1&e=cd36cc51-8faa-4812-880a-8242739a86bd&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Ftree%2Fv6.0-dsi-v4-reworked-minimal > We have one problem with getting bus format from previous bridge if we > pass NULL in bridge_func.attach() > https://protect2.fireeye.com/v1/url?k=bdc3e18a-e258d893-bdc26ac5-000babff3793-1dd81e5acf9d7f83&q=1&e=cd36cc51-8faa-4812-880a-8242739a86bd&u=https%3A%2F%2Fgithub.com%2Fmszyprow%2Flinux%2Fcommit%2F0fa57e33b3bf866efc4c17ab20eec28d6e07b3e9%23diff-3fe873f1ada5f1dfcf2a50ac114bdab3ea7b026d12278648ca40809d3fa1a331R1321 > > Booting the video as it assigns default bus format if the previous bus > format is unknown. > > [ 1.635984] samsung-dsim 32e10000.dsi: > [drm:samsung_dsim_host_attach] Attached sn65dsi83 device > [ 1.648067] [drm] Initialized mxsfb-drm 1.0.0 20160824 for > 32e00000.lcdif on minor 0 > [ 1.658726] mmc0: SDHCI controller on 30b40000.mmc [30b40000.mmc] > using ADMA > [ 1.681893] sn65dsi83 3-002c: Unsupported LVDS bus format 0x100a, > please check output bridge driver. Falling back to SPWG24. > > Does passing the bridge to drm_bridge_attach is working on your platform? > return drm_bridge_attach(bridge->encoder, dsi->out_bridge, bridge, flags); Nope, it fails: [drm] Initialized exynos 1.1.0 20180330 for exynos-drm on minor 0 exynos-dsi 11c80000.dsi: [drm:samsung_dsim_host_attach] Attached s6e8aa0 device panel-samsung-s6e8aa0 11c80000.dsi.0: error -22 setting maximum return packet size to 3 panel-samsung-s6e8aa0 11c80000.dsi.0: read id failed I've already pointed that it makes sense only together with Dave's patches. Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v4 03/12] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki The child devices in MIPI DSI can be binding with OF-graph and also via child nodes. The OF-graph interface represents the child devices via remote and associated endpoint numbers like dsi { compatible = "fsl,imx8mm-mipi-dsim"; ports { port@0 { reg = <0>; dsi_in_lcdif: endpoint@0 { reg = <0>; remote-endpoint = <&lcdif_out_dsi>; }; }; port@1 { reg = <1>; dsi_out_bridge: endpoint { remote-endpoint = <&bridge_in_dsi>; }; }; }; The child node interface represents the child devices via conventional child nodes on given DSI parent like dsi { compatible = "samsung,exynos5433-mipi-dsi"; ports { port@0 { reg = <0>; dsi_to_mic: endpoint { remote-endpoint = <&mic_to_dsi>; }; }; }; panel@0 { reg = <0>; }; }; As Samsung DSIM bridge is common DSI IP across all Exynos DSI and NXP i.MX8M host controllers, this patch adds support to lookup the child devices whether its bindings on the associated host represent OF-graph or child node interfaces. v4, v3: * none v2: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 38 +++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index ab2fa0f42f40..8130845750ac 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1357,18 +1357,52 @@ static int samsung_dsim_host_attach(struct mipi_dsi_host *host, struct samsung_dsim *dsi = host_to_dsi(host); const struct samsung_dsim_plat_data *pdata = dsi->plat_data; struct device *dev = dsi->dev; + struct device_node *np = dev->of_node; + struct device_node *remote; struct drm_panel *panel; int ret; - panel = of_drm_find_panel(device->dev.of_node); + /** + * Devices can also be child nodes when we also control that device + * through the upstream device (ie, MIPI-DCS for a MIPI-DSI device). + * + * Lookup for a child node of the given parent that isn't either port + * or ports. + */ + for_each_available_child_of_node(np, remote) { + if (of_node_name_eq(remote, "port") || + of_node_name_eq(remote, "ports")) + continue; + + goto of_find_panel_or_bridge; + } + + /* + * of_graph_get_remote_node() produces a noisy error message if port + * node isn't found and the absence of the port is a legit case here, + * so at first we silently check whether graph presents in the + * device-tree node. + */ + if (!of_graph_is_present(np)) + return -ENODEV; + + remote = of_graph_get_remote_node(np, 1, 0); + +of_find_panel_or_bridge: + if (!remote) + return -ENODEV; + + panel = of_drm_find_panel(remote); if (!IS_ERR(panel)) { dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel); } else { - dsi->out_bridge = of_drm_find_bridge(device->dev.of_node); + dsi->out_bridge = of_drm_find_bridge(remote); if (!dsi->out_bridge) dsi->out_bridge = ERR_PTR(-EINVAL); } + of_node_put(remote); + if (IS_ERR(dsi->out_bridge)) { ret = PTR_ERR(dsi->out_bridge); DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret); -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 03/12] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki The child devices in MIPI DSI can be binding with OF-graph and also via child nodes. The OF-graph interface represents the child devices via remote and associated endpoint numbers like dsi { compatible = "fsl,imx8mm-mipi-dsim"; ports { port@0 { reg = <0>; dsi_in_lcdif: endpoint@0 { reg = <0>; remote-endpoint = <&lcdif_out_dsi>; }; }; port@1 { reg = <1>; dsi_out_bridge: endpoint { remote-endpoint = <&bridge_in_dsi>; }; }; }; The child node interface represents the child devices via conventional child nodes on given DSI parent like dsi { compatible = "samsung,exynos5433-mipi-dsi"; ports { port@0 { reg = <0>; dsi_to_mic: endpoint { remote-endpoint = <&mic_to_dsi>; }; }; }; panel@0 { reg = <0>; }; }; As Samsung DSIM bridge is common DSI IP across all Exynos DSI and NXP i.MX8M host controllers, this patch adds support to lookup the child devices whether its bindings on the associated host represent OF-graph or child node interfaces. v4, v3: * none v2: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 38 +++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index ab2fa0f42f40..8130845750ac 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1357,18 +1357,52 @@ static int samsung_dsim_host_attach(struct mipi_dsi_host *host, struct samsung_dsim *dsi = host_to_dsi(host); const struct samsung_dsim_plat_data *pdata = dsi->plat_data; struct device *dev = dsi->dev; + struct device_node *np = dev->of_node; + struct device_node *remote; struct drm_panel *panel; int ret; - panel = of_drm_find_panel(device->dev.of_node); + /** + * Devices can also be child nodes when we also control that device + * through the upstream device (ie, MIPI-DCS for a MIPI-DSI device). + * + * Lookup for a child node of the given parent that isn't either port + * or ports. + */ + for_each_available_child_of_node(np, remote) { + if (of_node_name_eq(remote, "port") || + of_node_name_eq(remote, "ports")) + continue; + + goto of_find_panel_or_bridge; + } + + /* + * of_graph_get_remote_node() produces a noisy error message if port + * node isn't found and the absence of the port is a legit case here, + * so at first we silently check whether graph presents in the + * device-tree node. + */ + if (!of_graph_is_present(np)) + return -ENODEV; + + remote = of_graph_get_remote_node(np, 1, 0); + +of_find_panel_or_bridge: + if (!remote) + return -ENODEV; + + panel = of_drm_find_panel(remote); if (!IS_ERR(panel)) { dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel); } else { - dsi->out_bridge = of_drm_find_bridge(device->dev.of_node); + dsi->out_bridge = of_drm_find_bridge(remote); if (!dsi->out_bridge) dsi->out_bridge = ERR_PTR(-EINVAL); } + of_node_put(remote); + if (IS_ERR(dsi->out_bridge)) { ret = PTR_ERR(dsi->out_bridge); DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret); -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 03/12] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki The child devices in MIPI DSI can be binding with OF-graph and also via child nodes. The OF-graph interface represents the child devices via remote and associated endpoint numbers like dsi { compatible = "fsl,imx8mm-mipi-dsim"; ports { port@0 { reg = <0>; dsi_in_lcdif: endpoint@0 { reg = <0>; remote-endpoint = <&lcdif_out_dsi>; }; }; port@1 { reg = <1>; dsi_out_bridge: endpoint { remote-endpoint = <&bridge_in_dsi>; }; }; }; The child node interface represents the child devices via conventional child nodes on given DSI parent like dsi { compatible = "samsung,exynos5433-mipi-dsi"; ports { port@0 { reg = <0>; dsi_to_mic: endpoint { remote-endpoint = <&mic_to_dsi>; }; }; }; panel@0 { reg = <0>; }; }; As Samsung DSIM bridge is common DSI IP across all Exynos DSI and NXP i.MX8M host controllers, this patch adds support to lookup the child devices whether its bindings on the associated host represent OF-graph or child node interfaces. v4, v3: * none v2: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 38 +++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index ab2fa0f42f40..8130845750ac 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1357,18 +1357,52 @@ static int samsung_dsim_host_attach(struct mipi_dsi_host *host, struct samsung_dsim *dsi = host_to_dsi(host); const struct samsung_dsim_plat_data *pdata = dsi->plat_data; struct device *dev = dsi->dev; + struct device_node *np = dev->of_node; + struct device_node *remote; struct drm_panel *panel; int ret; - panel = of_drm_find_panel(device->dev.of_node); + /** + * Devices can also be child nodes when we also control that device + * through the upstream device (ie, MIPI-DCS for a MIPI-DSI device). + * + * Lookup for a child node of the given parent that isn't either port + * or ports. + */ + for_each_available_child_of_node(np, remote) { + if (of_node_name_eq(remote, "port") || + of_node_name_eq(remote, "ports")) + continue; + + goto of_find_panel_or_bridge; + } + + /* + * of_graph_get_remote_node() produces a noisy error message if port + * node isn't found and the absence of the port is a legit case here, + * so at first we silently check whether graph presents in the + * device-tree node. + */ + if (!of_graph_is_present(np)) + return -ENODEV; + + remote = of_graph_get_remote_node(np, 1, 0); + +of_find_panel_or_bridge: + if (!remote) + return -ENODEV; + + panel = of_drm_find_panel(remote); if (!IS_ERR(panel)) { dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel); } else { - dsi->out_bridge = of_drm_find_bridge(device->dev.of_node); + dsi->out_bridge = of_drm_find_bridge(remote); if (!dsi->out_bridge) dsi->out_bridge = ERR_PTR(-EINVAL); } + of_node_put(remote); + if (IS_ERR(dsi->out_bridge)) { ret = PTR_ERR(dsi->out_bridge); DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret); -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 04/12] drm: bridge: samsung-dsim: Handle platform init via driver_data 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki In order to make a common Samsung DSIM bridge driver some platform specific glue code needs to maintain separately as it is hard to maintain platform specific glue and conventional component_ops on the drm bridge drivers side. This patch is trying to support that glue code initialization based on the DSIM_QUIRK_PLAT_DATA set from respective driver_data. So, the platforms which enable DSIM_QUIRK_PLAT_DATA flags will handle all platform specific initialization via samsung_dsim_plat_probe. The platform probe is responsible to - initialize samsung_dsim_plat_data and install hooks - initialize component_ops - preserve samsung_dsim structure pointer v4: * none v3: * update samsung_dsim_plat_probe return value * add plat_data quirk to handle platform init v2: * fix samsung_dsim_plat_probe return pointer v1: * use platform_init instead of exynos_specific * handle component_ops in glue code Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- include/drm/bridge/samsung-dsim.h | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 8130845750ac..76dc7687857a 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -369,6 +369,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { @@ -391,6 +393,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { @@ -402,6 +405,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .wait_for_reset = 0, .num_bits_resol = 12, .reg_values = exynos5433_reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { @@ -413,6 +417,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 12, .reg_values = exynos5422_reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct of_device_id samsung_dsim_of_match[] = { @@ -1609,7 +1614,11 @@ static int samsung_dsim_probe(struct platform_device *pdev) dsi->bridge.of_node = dev->of_node; dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; - ret = samsung_dsim_plat_probe(dsi); + if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) + ret = samsung_dsim_plat_probe(dsi); + else + ret = mipi_dsi_host_register(&dsi->dsi_host); + if (ret) goto err_disable_runtime; @@ -1627,7 +1636,10 @@ static int samsung_dsim_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - samsung_dsim_plat_remove(dsi); + if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) + samsung_dsim_plat_remove(dsi); + else + mipi_dsi_host_unregister(&dsi->dsi_host); return 0; } diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 2e245bffd1b6..97fdee5ef5df 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -33,6 +33,10 @@ struct samsung_dsim_transfer { u16 rx_done; }; +enum samsung_dsim_quirks { + DSIM_QUIRK_PLAT_DATA = BIT(0), +}; + struct samsung_dsim_driver_data { const unsigned int *reg_ofs; unsigned int plltmr_reg; @@ -43,6 +47,7 @@ struct samsung_dsim_driver_data { unsigned int wait_for_reset; unsigned int num_bits_resol; const unsigned int *reg_values; + enum samsung_dsim_quirks quirks; }; struct samsung_dsim_host_ops { -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 04/12] drm: bridge: samsung-dsim: Handle platform init via driver_data @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki In order to make a common Samsung DSIM bridge driver some platform specific glue code needs to maintain separately as it is hard to maintain platform specific glue and conventional component_ops on the drm bridge drivers side. This patch is trying to support that glue code initialization based on the DSIM_QUIRK_PLAT_DATA set from respective driver_data. So, the platforms which enable DSIM_QUIRK_PLAT_DATA flags will handle all platform specific initialization via samsung_dsim_plat_probe. The platform probe is responsible to - initialize samsung_dsim_plat_data and install hooks - initialize component_ops - preserve samsung_dsim structure pointer v4: * none v3: * update samsung_dsim_plat_probe return value * add plat_data quirk to handle platform init v2: * fix samsung_dsim_plat_probe return pointer v1: * use platform_init instead of exynos_specific * handle component_ops in glue code Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- include/drm/bridge/samsung-dsim.h | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 8130845750ac..76dc7687857a 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -369,6 +369,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { @@ -391,6 +393,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { @@ -402,6 +405,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .wait_for_reset = 0, .num_bits_resol = 12, .reg_values = exynos5433_reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { @@ -413,6 +417,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 12, .reg_values = exynos5422_reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct of_device_id samsung_dsim_of_match[] = { @@ -1609,7 +1614,11 @@ static int samsung_dsim_probe(struct platform_device *pdev) dsi->bridge.of_node = dev->of_node; dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; - ret = samsung_dsim_plat_probe(dsi); + if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) + ret = samsung_dsim_plat_probe(dsi); + else + ret = mipi_dsi_host_register(&dsi->dsi_host); + if (ret) goto err_disable_runtime; @@ -1627,7 +1636,10 @@ static int samsung_dsim_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - samsung_dsim_plat_remove(dsi); + if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) + samsung_dsim_plat_remove(dsi); + else + mipi_dsi_host_unregister(&dsi->dsi_host); return 0; } diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 2e245bffd1b6..97fdee5ef5df 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -33,6 +33,10 @@ struct samsung_dsim_transfer { u16 rx_done; }; +enum samsung_dsim_quirks { + DSIM_QUIRK_PLAT_DATA = BIT(0), +}; + struct samsung_dsim_driver_data { const unsigned int *reg_ofs; unsigned int plltmr_reg; @@ -43,6 +47,7 @@ struct samsung_dsim_driver_data { unsigned int wait_for_reset; unsigned int num_bits_resol; const unsigned int *reg_values; + enum samsung_dsim_quirks quirks; }; struct samsung_dsim_host_ops { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 04/12] drm: bridge: samsung-dsim: Handle platform init via driver_data @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki In order to make a common Samsung DSIM bridge driver some platform specific glue code needs to maintain separately as it is hard to maintain platform specific glue and conventional component_ops on the drm bridge drivers side. This patch is trying to support that glue code initialization based on the DSIM_QUIRK_PLAT_DATA set from respective driver_data. So, the platforms which enable DSIM_QUIRK_PLAT_DATA flags will handle all platform specific initialization via samsung_dsim_plat_probe. The platform probe is responsible to - initialize samsung_dsim_plat_data and install hooks - initialize component_ops - preserve samsung_dsim structure pointer v4: * none v3: * update samsung_dsim_plat_probe return value * add plat_data quirk to handle platform init v2: * fix samsung_dsim_plat_probe return pointer v1: * use platform_init instead of exynos_specific * handle component_ops in glue code Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 16 ++++++++++++++-- include/drm/bridge/samsung-dsim.h | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 8130845750ac..76dc7687857a 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -369,6 +369,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { @@ -391,6 +393,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 11, .reg_values = reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { @@ -402,6 +405,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .wait_for_reset = 0, .num_bits_resol = 12, .reg_values = exynos5433_reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { @@ -413,6 +417,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .wait_for_reset = 1, .num_bits_resol = 12, .reg_values = exynos5422_reg_values, + .quirks = DSIM_QUIRK_PLAT_DATA, }; static const struct of_device_id samsung_dsim_of_match[] = { @@ -1609,7 +1614,11 @@ static int samsung_dsim_probe(struct platform_device *pdev) dsi->bridge.of_node = dev->of_node; dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; - ret = samsung_dsim_plat_probe(dsi); + if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) + ret = samsung_dsim_plat_probe(dsi); + else + ret = mipi_dsi_host_register(&dsi->dsi_host); + if (ret) goto err_disable_runtime; @@ -1627,7 +1636,10 @@ static int samsung_dsim_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - samsung_dsim_plat_remove(dsi); + if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) + samsung_dsim_plat_remove(dsi); + else + mipi_dsi_host_unregister(&dsi->dsi_host); return 0; } diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 2e245bffd1b6..97fdee5ef5df 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -33,6 +33,10 @@ struct samsung_dsim_transfer { u16 rx_done; }; +enum samsung_dsim_quirks { + DSIM_QUIRK_PLAT_DATA = BIT(0), +}; + struct samsung_dsim_driver_data { const unsigned int *reg_ofs; unsigned int plltmr_reg; @@ -43,6 +47,7 @@ struct samsung_dsim_driver_data { unsigned int wait_for_reset; unsigned int num_bits_resol; const unsigned int *reg_values; + enum samsung_dsim_quirks quirks; }; struct samsung_dsim_host_ops { -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 05/12] drm: bridge: samsung-dsim: Mark PHY as optional 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki In i.MX8M Mini/Nano SoC the DSI Phy requires a MIPI DPHY bit to reset in order to activate the PHY and that can be done via upstream i.MX8M blk-ctrl driver. So, mark the phy get as optional. v4, v3, v2: * none v1: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 76dc7687857a..c3ed317996ad 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1583,7 +1583,7 @@ static int samsung_dsim_probe(struct platform_device *pdev) if (IS_ERR(dsi->reg_base)) return PTR_ERR(dsi->reg_base); - dsi->phy = devm_phy_get(dev, "dsim"); + dsi->phy = devm_phy_optional_get(dev, "dsim"); if (IS_ERR(dsi->phy)) { dev_info(dev, "failed to get dsim phy\n"); return PTR_ERR(dsi->phy); -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 05/12] drm: bridge: samsung-dsim: Mark PHY as optional @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki In i.MX8M Mini/Nano SoC the DSI Phy requires a MIPI DPHY bit to reset in order to activate the PHY and that can be done via upstream i.MX8M blk-ctrl driver. So, mark the phy get as optional. v4, v3, v2: * none v1: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 76dc7687857a..c3ed317996ad 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1583,7 +1583,7 @@ static int samsung_dsim_probe(struct platform_device *pdev) if (IS_ERR(dsi->reg_base)) return PTR_ERR(dsi->reg_base); - dsi->phy = devm_phy_get(dev, "dsim"); + dsi->phy = devm_phy_optional_get(dev, "dsim"); if (IS_ERR(dsi->phy)) { dev_info(dev, "failed to get dsim phy\n"); return PTR_ERR(dsi->phy); -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 05/12] drm: bridge: samsung-dsim: Mark PHY as optional @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki In i.MX8M Mini/Nano SoC the DSI Phy requires a MIPI DPHY bit to reset in order to activate the PHY and that can be done via upstream i.MX8M blk-ctrl driver. So, mark the phy get as optional. v4, v3, v2: * none v1: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 76dc7687857a..c3ed317996ad 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1583,7 +1583,7 @@ static int samsung_dsim_probe(struct platform_device *pdev) if (IS_ERR(dsi->reg_base)) return PTR_ERR(dsi->reg_base); - dsi->phy = devm_phy_get(dev, "dsim"); + dsi->phy = devm_phy_optional_get(dev, "dsim"); if (IS_ERR(dsi->phy)) { dev_info(dev, "failed to get dsim phy\n"); return PTR_ERR(dsi->phy); -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 06/12] drm: bridge: samsung-dsim: Handle proper DSI host initialization 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki DSI host initialization handling in previous exynos dsi driver has some pitfalls. It initializes the host during host transfer() hook that is indeed not the desired call flow for I2C and any other DSI configured downstream bridges. Host transfer() is usually triggered for downstream DSI panels or bridges and I2C-configured-DSI bridges miss these host initialization as these downstream bridges use bridge operations hooks like pre_enable, and enable in order to initialize or set up the host. This patch is trying to handle the host init handler to satisfy all downstream panels and bridges. Added the DSIM_STATE_REINITIALIZED state flag to ensure that host init is also done on first cmd transfer, this helps existing DSI panels work on exynos platform (form Marek Szyprowski). v4: * update init handling to ensure host init done on first cmd transfer v3: * none v2: * check initialized state in samsung_dsim_init v1: * keep DSI init in host transfer Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 25 +++++++++++++++++-------- include/drm/bridge/samsung-dsim.h | 5 +++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index c3ed317996ad..b6883a6d4681 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1254,12 +1254,17 @@ static void samsung_dsim_disable_irq(struct samsung_dsim *dsi) disable_irq(dsi->irq); } -static int samsung_dsim_init(struct samsung_dsim *dsi) +static int samsung_dsim_init(struct samsung_dsim *dsi, unsigned int flag) { const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + if (dsi->state & flag) + return 0; + samsung_dsim_reset(dsi); - samsung_dsim_enable_irq(dsi); + + if (!(dsi->state & DSIM_STATE_INITIALIZED)) + samsung_dsim_enable_irq(dsi); if (driver_data->reg_values[RESET_TYPE] == DSIM_FUNCRST) samsung_dsim_enable_lane(dsi, BIT(dsi->lanes) - 1); @@ -1270,6 +1275,8 @@ static int samsung_dsim_init(struct samsung_dsim *dsi) samsung_dsim_set_phy_ctrl(dsi); samsung_dsim_init_link(dsi); + dsi->state |= flag; + return 0; } @@ -1289,6 +1296,10 @@ static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge, } dsi->state |= DSIM_STATE_ENABLED; + + ret = samsung_dsim_init(dsi, DSIM_STATE_INITIALIZED); + if (ret) + return; } static void samsung_dsim_atomic_enable(struct drm_bridge *bridge, @@ -1464,12 +1475,9 @@ static ssize_t samsung_dsim_host_transfer(struct mipi_dsi_host *host, if (!(dsi->state & DSIM_STATE_ENABLED)) return -EINVAL; - if (!(dsi->state & DSIM_STATE_INITIALIZED)) { - ret = samsung_dsim_init(dsi); - if (ret) - return ret; - dsi->state |= DSIM_STATE_INITIALIZED; - } + ret = samsung_dsim_init(dsi, DSIM_STATE_REINITIALIZED); + if (ret) + return ret; ret = mipi_dsi_create_packet(&xfer.packet, msg); if (ret < 0) @@ -1654,6 +1662,7 @@ static int __maybe_unused samsung_dsim_suspend(struct device *dev) if (dsi->state & DSIM_STATE_INITIALIZED) { dsi->state &= ~DSIM_STATE_INITIALIZED; + dsi->state &= ~DSIM_STATE_REINITIALIZED; samsung_dsim_disable_clock(dsi); diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 97fdee5ef5df..e15fbfd49efe 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -17,8 +17,9 @@ struct samsung_dsim; #define DSIM_STATE_ENABLED BIT(0) #define DSIM_STATE_INITIALIZED BIT(1) -#define DSIM_STATE_CMD_LPM BIT(2) -#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3) +#define DSIM_STATE_REINITIALIZED BIT(2) +#define DSIM_STATE_CMD_LPM BIT(3) +#define DSIM_STATE_VIDOUT_AVAILABLE BIT(4) struct samsung_dsim_transfer { struct list_head list; -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 06/12] drm: bridge: samsung-dsim: Handle proper DSI host initialization @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki DSI host initialization handling in previous exynos dsi driver has some pitfalls. It initializes the host during host transfer() hook that is indeed not the desired call flow for I2C and any other DSI configured downstream bridges. Host transfer() is usually triggered for downstream DSI panels or bridges and I2C-configured-DSI bridges miss these host initialization as these downstream bridges use bridge operations hooks like pre_enable, and enable in order to initialize or set up the host. This patch is trying to handle the host init handler to satisfy all downstream panels and bridges. Added the DSIM_STATE_REINITIALIZED state flag to ensure that host init is also done on first cmd transfer, this helps existing DSI panels work on exynos platform (form Marek Szyprowski). v4: * update init handling to ensure host init done on first cmd transfer v3: * none v2: * check initialized state in samsung_dsim_init v1: * keep DSI init in host transfer Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 25 +++++++++++++++++-------- include/drm/bridge/samsung-dsim.h | 5 +++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index c3ed317996ad..b6883a6d4681 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1254,12 +1254,17 @@ static void samsung_dsim_disable_irq(struct samsung_dsim *dsi) disable_irq(dsi->irq); } -static int samsung_dsim_init(struct samsung_dsim *dsi) +static int samsung_dsim_init(struct samsung_dsim *dsi, unsigned int flag) { const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + if (dsi->state & flag) + return 0; + samsung_dsim_reset(dsi); - samsung_dsim_enable_irq(dsi); + + if (!(dsi->state & DSIM_STATE_INITIALIZED)) + samsung_dsim_enable_irq(dsi); if (driver_data->reg_values[RESET_TYPE] == DSIM_FUNCRST) samsung_dsim_enable_lane(dsi, BIT(dsi->lanes) - 1); @@ -1270,6 +1275,8 @@ static int samsung_dsim_init(struct samsung_dsim *dsi) samsung_dsim_set_phy_ctrl(dsi); samsung_dsim_init_link(dsi); + dsi->state |= flag; + return 0; } @@ -1289,6 +1296,10 @@ static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge, } dsi->state |= DSIM_STATE_ENABLED; + + ret = samsung_dsim_init(dsi, DSIM_STATE_INITIALIZED); + if (ret) + return; } static void samsung_dsim_atomic_enable(struct drm_bridge *bridge, @@ -1464,12 +1475,9 @@ static ssize_t samsung_dsim_host_transfer(struct mipi_dsi_host *host, if (!(dsi->state & DSIM_STATE_ENABLED)) return -EINVAL; - if (!(dsi->state & DSIM_STATE_INITIALIZED)) { - ret = samsung_dsim_init(dsi); - if (ret) - return ret; - dsi->state |= DSIM_STATE_INITIALIZED; - } + ret = samsung_dsim_init(dsi, DSIM_STATE_REINITIALIZED); + if (ret) + return ret; ret = mipi_dsi_create_packet(&xfer.packet, msg); if (ret < 0) @@ -1654,6 +1662,7 @@ static int __maybe_unused samsung_dsim_suspend(struct device *dev) if (dsi->state & DSIM_STATE_INITIALIZED) { dsi->state &= ~DSIM_STATE_INITIALIZED; + dsi->state &= ~DSIM_STATE_REINITIALIZED; samsung_dsim_disable_clock(dsi); diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 97fdee5ef5df..e15fbfd49efe 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -17,8 +17,9 @@ struct samsung_dsim; #define DSIM_STATE_ENABLED BIT(0) #define DSIM_STATE_INITIALIZED BIT(1) -#define DSIM_STATE_CMD_LPM BIT(2) -#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3) +#define DSIM_STATE_REINITIALIZED BIT(2) +#define DSIM_STATE_CMD_LPM BIT(3) +#define DSIM_STATE_VIDOUT_AVAILABLE BIT(4) struct samsung_dsim_transfer { struct list_head list; -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 06/12] drm: bridge: samsung-dsim: Handle proper DSI host initialization @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki DSI host initialization handling in previous exynos dsi driver has some pitfalls. It initializes the host during host transfer() hook that is indeed not the desired call flow for I2C and any other DSI configured downstream bridges. Host transfer() is usually triggered for downstream DSI panels or bridges and I2C-configured-DSI bridges miss these host initialization as these downstream bridges use bridge operations hooks like pre_enable, and enable in order to initialize or set up the host. This patch is trying to handle the host init handler to satisfy all downstream panels and bridges. Added the DSIM_STATE_REINITIALIZED state flag to ensure that host init is also done on first cmd transfer, this helps existing DSI panels work on exynos platform (form Marek Szyprowski). v4: * update init handling to ensure host init done on first cmd transfer v3: * none v2: * check initialized state in samsung_dsim_init v1: * keep DSI init in host transfer Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 25 +++++++++++++++++-------- include/drm/bridge/samsung-dsim.h | 5 +++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index c3ed317996ad..b6883a6d4681 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1254,12 +1254,17 @@ static void samsung_dsim_disable_irq(struct samsung_dsim *dsi) disable_irq(dsi->irq); } -static int samsung_dsim_init(struct samsung_dsim *dsi) +static int samsung_dsim_init(struct samsung_dsim *dsi, unsigned int flag) { const struct samsung_dsim_driver_data *driver_data = dsi->driver_data; + if (dsi->state & flag) + return 0; + samsung_dsim_reset(dsi); - samsung_dsim_enable_irq(dsi); + + if (!(dsi->state & DSIM_STATE_INITIALIZED)) + samsung_dsim_enable_irq(dsi); if (driver_data->reg_values[RESET_TYPE] == DSIM_FUNCRST) samsung_dsim_enable_lane(dsi, BIT(dsi->lanes) - 1); @@ -1270,6 +1275,8 @@ static int samsung_dsim_init(struct samsung_dsim *dsi) samsung_dsim_set_phy_ctrl(dsi); samsung_dsim_init_link(dsi); + dsi->state |= flag; + return 0; } @@ -1289,6 +1296,10 @@ static void samsung_dsim_atomic_pre_enable(struct drm_bridge *bridge, } dsi->state |= DSIM_STATE_ENABLED; + + ret = samsung_dsim_init(dsi, DSIM_STATE_INITIALIZED); + if (ret) + return; } static void samsung_dsim_atomic_enable(struct drm_bridge *bridge, @@ -1464,12 +1475,9 @@ static ssize_t samsung_dsim_host_transfer(struct mipi_dsi_host *host, if (!(dsi->state & DSIM_STATE_ENABLED)) return -EINVAL; - if (!(dsi->state & DSIM_STATE_INITIALIZED)) { - ret = samsung_dsim_init(dsi); - if (ret) - return ret; - dsi->state |= DSIM_STATE_INITIALIZED; - } + ret = samsung_dsim_init(dsi, DSIM_STATE_REINITIALIZED); + if (ret) + return ret; ret = mipi_dsi_create_packet(&xfer.packet, msg); if (ret < 0) @@ -1654,6 +1662,7 @@ static int __maybe_unused samsung_dsim_suspend(struct device *dev) if (dsi->state & DSIM_STATE_INITIALIZED) { dsi->state &= ~DSIM_STATE_INITIALIZED; + dsi->state &= ~DSIM_STATE_REINITIALIZED; samsung_dsim_disable_clock(dsi); diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 97fdee5ef5df..e15fbfd49efe 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -17,8 +17,9 @@ struct samsung_dsim; #define DSIM_STATE_ENABLED BIT(0) #define DSIM_STATE_INITIALIZED BIT(1) -#define DSIM_STATE_CMD_LPM BIT(2) -#define DSIM_STATE_VIDOUT_AVAILABLE BIT(3) +#define DSIM_STATE_REINITIALIZED BIT(2) +#define DSIM_STATE_CMD_LPM BIT(3) +#define DSIM_STATE_VIDOUT_AVAILABLE BIT(4) struct samsung_dsim_transfer { struct list_head list; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset range from BIT[18-13] and the upstream driver is using the same offset. However, offset 13 is not working on i.MX8M Mini platforms but downstream NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. Not sure about whether it is reference manual documentation or something else but this patch trusts the downstream code and fixes the PLL_P offset. [1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/gpu/drm/bridge/sec-dsim.c?h=imx_5.4.47_2.2.0#n211 v4, v3, v2: * none v1: * updated commit message * add downstream driver link Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 10 ++++++++-- include/drm/bridge/samsung-dsim.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index b6883a6d4681..b6d17c0c9e58 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -168,7 +168,7 @@ /* DSIM_PLLCTRL */ #define DSIM_FREQ_BAND(x) ((x) << 24) #define DSIM_PLL_EN (1 << 23) -#define DSIM_PLL_P(x) ((x) << 13) +#define DSIM_PLL_P(x, offset) ((x) << (offset)) #define DSIM_PLL_M(x) ((x) << 4) #define DSIM_PLL_S(x) ((x) << 1) @@ -368,6 +368,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -392,6 +394,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -404,6 +407,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .max_freq = 1500, .wait_for_reset = 0, .num_bits_resol = 12, + .pll_p_offset = 13, .reg_values = exynos5433_reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -416,6 +420,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .max_freq = 1500, .wait_for_reset = 1, .num_bits_resol = 12, + .pll_p_offset = 13, .reg_values = exynos5422_reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -563,7 +568,8 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, writel(driver_data->reg_values[PLL_TIMER], dsi->reg_base + driver_data->plltmr_reg); - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); + reg = DSIM_PLL_EN | DSIM_PLL_P(p, driver_data->pll_p_offset) | + DSIM_PLL_M(m) | DSIM_PLL_S(s); if (driver_data->has_freqband) { static const unsigned long freq_bands[] = { diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index e15fbfd49efe..95d3f89aec4f 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -47,6 +47,7 @@ struct samsung_dsim_driver_data { unsigned int max_freq; unsigned int wait_for_reset; unsigned int num_bits_resol; + unsigned int pll_p_offset; const unsigned int *reg_values; enum samsung_dsim_quirks quirks; }; -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset range from BIT[18-13] and the upstream driver is using the same offset. However, offset 13 is not working on i.MX8M Mini platforms but downstream NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. Not sure about whether it is reference manual documentation or something else but this patch trusts the downstream code and fixes the PLL_P offset. [1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/gpu/drm/bridge/sec-dsim.c?h=imx_5.4.47_2.2.0#n211 v4, v3, v2: * none v1: * updated commit message * add downstream driver link Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 10 ++++++++-- include/drm/bridge/samsung-dsim.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index b6883a6d4681..b6d17c0c9e58 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -168,7 +168,7 @@ /* DSIM_PLLCTRL */ #define DSIM_FREQ_BAND(x) ((x) << 24) #define DSIM_PLL_EN (1 << 23) -#define DSIM_PLL_P(x) ((x) << 13) +#define DSIM_PLL_P(x, offset) ((x) << (offset)) #define DSIM_PLL_M(x) ((x) << 4) #define DSIM_PLL_S(x) ((x) << 1) @@ -368,6 +368,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -392,6 +394,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -404,6 +407,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .max_freq = 1500, .wait_for_reset = 0, .num_bits_resol = 12, + .pll_p_offset = 13, .reg_values = exynos5433_reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -416,6 +420,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .max_freq = 1500, .wait_for_reset = 1, .num_bits_resol = 12, + .pll_p_offset = 13, .reg_values = exynos5422_reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -563,7 +568,8 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, writel(driver_data->reg_values[PLL_TIMER], dsi->reg_base + driver_data->plltmr_reg); - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); + reg = DSIM_PLL_EN | DSIM_PLL_P(p, driver_data->pll_p_offset) | + DSIM_PLL_M(m) | DSIM_PLL_S(s); if (driver_data->has_freqband) { static const unsigned long freq_bands[] = { diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index e15fbfd49efe..95d3f89aec4f 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -47,6 +47,7 @@ struct samsung_dsim_driver_data { unsigned int max_freq; unsigned int wait_for_reset; unsigned int num_bits_resol; + unsigned int pll_p_offset; const unsigned int *reg_values; enum samsung_dsim_quirks quirks; }; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset range from BIT[18-13] and the upstream driver is using the same offset. However, offset 13 is not working on i.MX8M Mini platforms but downstream NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. Not sure about whether it is reference manual documentation or something else but this patch trusts the downstream code and fixes the PLL_P offset. [1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/gpu/drm/bridge/sec-dsim.c?h=imx_5.4.47_2.2.0#n211 v4, v3, v2: * none v1: * updated commit message * add downstream driver link Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 10 ++++++++-- include/drm/bridge/samsung-dsim.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index b6883a6d4681..b6d17c0c9e58 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -168,7 +168,7 @@ /* DSIM_PLLCTRL */ #define DSIM_FREQ_BAND(x) ((x) << 24) #define DSIM_PLL_EN (1 << 23) -#define DSIM_PLL_P(x) ((x) << 13) +#define DSIM_PLL_P(x, offset) ((x) << (offset)) #define DSIM_PLL_M(x) ((x) << 4) #define DSIM_PLL_S(x) ((x) << 1) @@ -368,6 +368,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -392,6 +394,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .max_freq = 1000, .wait_for_reset = 1, .num_bits_resol = 11, + .pll_p_offset = 13, .reg_values = reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -404,6 +407,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .max_freq = 1500, .wait_for_reset = 0, .num_bits_resol = 12, + .pll_p_offset = 13, .reg_values = exynos5433_reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -416,6 +420,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .max_freq = 1500, .wait_for_reset = 1, .num_bits_resol = 12, + .pll_p_offset = 13, .reg_values = exynos5422_reg_values, .quirks = DSIM_QUIRK_PLAT_DATA, }; @@ -563,7 +568,8 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, writel(driver_data->reg_values[PLL_TIMER], dsi->reg_base + driver_data->plltmr_reg); - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); + reg = DSIM_PLL_EN | DSIM_PLL_P(p, driver_data->pll_p_offset) | + DSIM_PLL_M(m) | DSIM_PLL_S(s); if (driver_data->has_freqband) { static const unsigned long freq_bands[] = { diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index e15fbfd49efe..95d3f89aec4f 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -47,6 +47,7 @@ struct samsung_dsim_driver_data { unsigned int max_freq; unsigned int wait_for_reset; unsigned int num_bits_resol; + unsigned int pll_p_offset; const unsigned int *reg_values; enum samsung_dsim_quirks quirks; }; -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* Re: [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 19:42 ` Adam Ford -1 siblings, 0 replies; 76+ messages in thread From: Adam Ford @ 2022-08-29 19:42 UTC (permalink / raw) To: Jagan Teki Cc: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, Matteo Lisi, dri-devel, linux-samsung-soc, arm-soc, NXP Linux Team, linux-amarula On Mon, Aug 29, 2022 at 1:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 > with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset > range from BIT[18-13] and the upstream driver is using the same offset. > > However, offset 13 is not working on i.MX8M Mini platforms but downstream > NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. From the line you highlighted in the link, the downstream NXP ones shows 13 if I'm reading it correctly. #define PLLCTRL_SET_P(x) REG_PUT(x, 18, 13) From what I can tell the PMS calculation here needs to be updated for the Mini because the ranges of the FCO calculator are different. Took your series and tweaked it a bit [2] which changes a few settings, and the PMS calculator appears to more closely match the values I get from the NXP one. I think it could be further tweaked because p min and p_max also have changed. > > Not sure about whether it is reference manual documentation or something > else but this patch trusts the downstream code and fixes the PLL_P offset. > > [1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/gpu/drm/bridge/sec-dsim.c?h=imx_5.4.47_2.2.0#n211 > [2] -https://github.com/aford173/linux/commit/a5fa184160ec9ea45a7546eaa0d8b8fc760cf3d9 > v4, v3, v2: > * none > > v1: > * updated commit message > * add downstream driver link > > Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > drivers/gpu/drm/bridge/samsung-dsim.c | 10 ++++++++-- > include/drm/bridge/samsung-dsim.h | 1 + > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index b6883a6d4681..b6d17c0c9e58 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -168,7 +168,7 @@ > /* DSIM_PLLCTRL */ > #define DSIM_FREQ_BAND(x) ((x) << 24) > #define DSIM_PLL_EN (1 << 23) > -#define DSIM_PLL_P(x) ((x) << 13) > +#define DSIM_PLL_P(x, offset) ((x) << (offset)) > #define DSIM_PLL_M(x) ((x) << 4) > #define DSIM_PLL_S(x) ((x) << 1) > > @@ -368,6 +368,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -392,6 +394,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -404,6 +407,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { > .max_freq = 1500, > .wait_for_reset = 0, > .num_bits_resol = 12, > + .pll_p_offset = 13, > .reg_values = exynos5433_reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -416,6 +420,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { > .max_freq = 1500, > .wait_for_reset = 1, > .num_bits_resol = 12, > + .pll_p_offset = 13, > .reg_values = exynos5422_reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -563,7 +568,8 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, > writel(driver_data->reg_values[PLL_TIMER], > dsi->reg_base + driver_data->plltmr_reg); > > - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); > + reg = DSIM_PLL_EN | DSIM_PLL_P(p, driver_data->pll_p_offset) | > + DSIM_PLL_M(m) | DSIM_PLL_S(s); > > if (driver_data->has_freqband) { > static const unsigned long freq_bands[] = { > diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h > index e15fbfd49efe..95d3f89aec4f 100644 > --- a/include/drm/bridge/samsung-dsim.h > +++ b/include/drm/bridge/samsung-dsim.h > @@ -47,6 +47,7 @@ struct samsung_dsim_driver_data { > unsigned int max_freq; > unsigned int wait_for_reset; > unsigned int num_bits_resol; > + unsigned int pll_p_offset; > const unsigned int *reg_values; > enum samsung_dsim_quirks quirks; > }; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset @ 2022-08-29 19:42 ` Adam Ford 0 siblings, 0 replies; 76+ messages in thread From: Adam Ford @ 2022-08-29 19:42 UTC (permalink / raw) To: Jagan Teki Cc: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, Matteo Lisi, dri-devel, linux-samsung-soc, arm-soc, NXP Linux Team, linux-amarula On Mon, Aug 29, 2022 at 1:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 > with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset > range from BIT[18-13] and the upstream driver is using the same offset. > > However, offset 13 is not working on i.MX8M Mini platforms but downstream > NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. From the line you highlighted in the link, the downstream NXP ones shows 13 if I'm reading it correctly. #define PLLCTRL_SET_P(x) REG_PUT(x, 18, 13) From what I can tell the PMS calculation here needs to be updated for the Mini because the ranges of the FCO calculator are different. Took your series and tweaked it a bit [2] which changes a few settings, and the PMS calculator appears to more closely match the values I get from the NXP one. I think it could be further tweaked because p min and p_max also have changed. > > Not sure about whether it is reference manual documentation or something > else but this patch trusts the downstream code and fixes the PLL_P offset. > > [1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/gpu/drm/bridge/sec-dsim.c?h=imx_5.4.47_2.2.0#n211 > [2] -https://github.com/aford173/linux/commit/a5fa184160ec9ea45a7546eaa0d8b8fc760cf3d9 > v4, v3, v2: > * none > > v1: > * updated commit message > * add downstream driver link > > Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > drivers/gpu/drm/bridge/samsung-dsim.c | 10 ++++++++-- > include/drm/bridge/samsung-dsim.h | 1 + > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index b6883a6d4681..b6d17c0c9e58 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -168,7 +168,7 @@ > /* DSIM_PLLCTRL */ > #define DSIM_FREQ_BAND(x) ((x) << 24) > #define DSIM_PLL_EN (1 << 23) > -#define DSIM_PLL_P(x) ((x) << 13) > +#define DSIM_PLL_P(x, offset) ((x) << (offset)) > #define DSIM_PLL_M(x) ((x) << 4) > #define DSIM_PLL_S(x) ((x) << 1) > > @@ -368,6 +368,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -392,6 +394,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -404,6 +407,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { > .max_freq = 1500, > .wait_for_reset = 0, > .num_bits_resol = 12, > + .pll_p_offset = 13, > .reg_values = exynos5433_reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -416,6 +420,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { > .max_freq = 1500, > .wait_for_reset = 1, > .num_bits_resol = 12, > + .pll_p_offset = 13, > .reg_values = exynos5422_reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -563,7 +568,8 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, > writel(driver_data->reg_values[PLL_TIMER], > dsi->reg_base + driver_data->plltmr_reg); > > - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); > + reg = DSIM_PLL_EN | DSIM_PLL_P(p, driver_data->pll_p_offset) | > + DSIM_PLL_M(m) | DSIM_PLL_S(s); > > if (driver_data->has_freqband) { > static const unsigned long freq_bands[] = { > diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h > index e15fbfd49efe..95d3f89aec4f 100644 > --- a/include/drm/bridge/samsung-dsim.h > +++ b/include/drm/bridge/samsung-dsim.h > @@ -47,6 +47,7 @@ struct samsung_dsim_driver_data { > unsigned int max_freq; > unsigned int wait_for_reset; > unsigned int num_bits_resol; > + unsigned int pll_p_offset; > const unsigned int *reg_values; > enum samsung_dsim_quirks quirks; > }; > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset @ 2022-08-29 19:42 ` Adam Ford 0 siblings, 0 replies; 76+ messages in thread From: Adam Ford @ 2022-08-29 19:42 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, dri-devel, Neil Armstrong, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, arm-soc, Marek Szyprowski On Mon, Aug 29, 2022 at 1:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 > with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset > range from BIT[18-13] and the upstream driver is using the same offset. > > However, offset 13 is not working on i.MX8M Mini platforms but downstream > NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. From the line you highlighted in the link, the downstream NXP ones shows 13 if I'm reading it correctly. #define PLLCTRL_SET_P(x) REG_PUT(x, 18, 13) From what I can tell the PMS calculation here needs to be updated for the Mini because the ranges of the FCO calculator are different. Took your series and tweaked it a bit [2] which changes a few settings, and the PMS calculator appears to more closely match the values I get from the NXP one. I think it could be further tweaked because p min and p_max also have changed. > > Not sure about whether it is reference manual documentation or something > else but this patch trusts the downstream code and fixes the PLL_P offset. > > [1] https://source.codeaurora.org/external/imx/linux-imx/tree/drivers/gpu/drm/bridge/sec-dsim.c?h=imx_5.4.47_2.2.0#n211 > [2] -https://github.com/aford173/linux/commit/a5fa184160ec9ea45a7546eaa0d8b8fc760cf3d9 > v4, v3, v2: > * none > > v1: > * updated commit message > * add downstream driver link > > Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > drivers/gpu/drm/bridge/samsung-dsim.c | 10 ++++++++-- > include/drm/bridge/samsung-dsim.h | 1 + > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index b6883a6d4681..b6d17c0c9e58 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -168,7 +168,7 @@ > /* DSIM_PLLCTRL */ > #define DSIM_FREQ_BAND(x) ((x) << 24) > #define DSIM_PLL_EN (1 << 23) > -#define DSIM_PLL_P(x) ((x) << 13) > +#define DSIM_PLL_P(x, offset) ((x) << (offset)) > #define DSIM_PLL_M(x) ((x) << 4) > #define DSIM_PLL_S(x) ((x) << 1) > > @@ -368,6 +368,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -381,6 +382,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -392,6 +394,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { > .max_freq = 1000, > .wait_for_reset = 1, > .num_bits_resol = 11, > + .pll_p_offset = 13, > .reg_values = reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -404,6 +407,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { > .max_freq = 1500, > .wait_for_reset = 0, > .num_bits_resol = 12, > + .pll_p_offset = 13, > .reg_values = exynos5433_reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -416,6 +420,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { > .max_freq = 1500, > .wait_for_reset = 1, > .num_bits_resol = 12, > + .pll_p_offset = 13, > .reg_values = exynos5422_reg_values, > .quirks = DSIM_QUIRK_PLAT_DATA, > }; > @@ -563,7 +568,8 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi, > writel(driver_data->reg_values[PLL_TIMER], > dsi->reg_base + driver_data->plltmr_reg); > > - reg = DSIM_PLL_EN | DSIM_PLL_P(p) | DSIM_PLL_M(m) | DSIM_PLL_S(s); > + reg = DSIM_PLL_EN | DSIM_PLL_P(p, driver_data->pll_p_offset) | > + DSIM_PLL_M(m) | DSIM_PLL_S(s); > > if (driver_data->has_freqband) { > static const unsigned long freq_bands[] = { > diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h > index e15fbfd49efe..95d3f89aec4f 100644 > --- a/include/drm/bridge/samsung-dsim.h > +++ b/include/drm/bridge/samsung-dsim.h > @@ -47,6 +47,7 @@ struct samsung_dsim_driver_data { > unsigned int max_freq; > unsigned int wait_for_reset; > unsigned int num_bits_resol; > + unsigned int pll_p_offset; > const unsigned int *reg_values; > enum samsung_dsim_quirks quirks; > }; > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset 2022-08-29 19:42 ` Adam Ford (?) @ 2022-09-14 8:22 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-14 8:22 UTC (permalink / raw) To: Adam Ford Cc: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, Matteo Lisi, dri-devel, linux-samsung-soc, arm-soc, NXP Linux Team, linux-amarula On Tue, Aug 30, 2022 at 1:12 AM Adam Ford <aford173@gmail.com> wrote: > > On Mon, Aug 29, 2022 at 1:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 > > with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset > > range from BIT[18-13] and the upstream driver is using the same offset. > > > > However, offset 13 is not working on i.MX8M Mini platforms but downstream > > NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. > > From the line you highlighted in the link, the downstream NXP ones > shows 13 if I'm reading it correctly. > > #define PLLCTRL_SET_P(x) REG_PUT(x, 18, 13) PMS_P value set in sec_mipi_dsim_check_pll_out using PLLCTRL_SET_P() with offset 13 and then an additional offset of one bit added in sec_mipi_dsim_config_pll via PLLCTRL_SET_PMS(). Please check this for additional information https://github.com/fschrempf/linux/commit/bbb3549a99e162ef6ad4c83d5fd4d39a6daa6d56 I'll update the additional information in commit messages in v5. Thanks, Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset @ 2022-09-14 8:22 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-14 8:22 UTC (permalink / raw) To: Adam Ford Cc: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut, Matteo Lisi, dri-devel, linux-samsung-soc, arm-soc, NXP Linux Team, linux-amarula On Tue, Aug 30, 2022 at 1:12 AM Adam Ford <aford173@gmail.com> wrote: > > On Mon, Aug 29, 2022 at 1:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 > > with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset > > range from BIT[18-13] and the upstream driver is using the same offset. > > > > However, offset 13 is not working on i.MX8M Mini platforms but downstream > > NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. > > From the line you highlighted in the link, the downstream NXP ones > shows 13 if I'm reading it correctly. > > #define PLLCTRL_SET_P(x) REG_PUT(x, 18, 13) PMS_P value set in sec_mipi_dsim_check_pll_out using PLLCTRL_SET_P() with offset 13 and then an additional offset of one bit added in sec_mipi_dsim_config_pll via PLLCTRL_SET_PMS(). Please check this for additional information https://github.com/fschrempf/linux/commit/bbb3549a99e162ef6ad4c83d5fd4d39a6daa6d56 I'll update the additional information in commit messages in v5. Thanks, Jagan. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset @ 2022-09-14 8:22 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-09-14 8:22 UTC (permalink / raw) To: Adam Ford Cc: Marek Vasut, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, dri-devel, Neil Armstrong, Seung-Woo Kim, Tommaso Merciai, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, linux-amarula, arm-soc, Marek Szyprowski On Tue, Aug 30, 2022 at 1:12 AM Adam Ford <aford173@gmail.com> wrote: > > On Mon, Aug 29, 2022 at 1:41 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > The i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 > > with 13.7.10.1 Master PLL PMS Value setting Register mentioned PMS_P offset > > range from BIT[18-13] and the upstream driver is using the same offset. > > > > However, offset 13 is not working on i.MX8M Mini platforms but downstream > > NXP driver is using 14 [1] and it is working with i.MX8M Mini SoC. > > From the line you highlighted in the link, the downstream NXP ones > shows 13 if I'm reading it correctly. > > #define PLLCTRL_SET_P(x) REG_PUT(x, 18, 13) PMS_P value set in sec_mipi_dsim_check_pll_out using PLLCTRL_SET_P() with offset 13 and then an additional offset of one bit added in sec_mipi_dsim_config_pll via PLLCTRL_SET_PMS(). Please check this for additional information https://github.com/fschrempf/linux/commit/bbb3549a99e162ef6ad4c83d5fd4d39a6daa6d56 I'll update the additional information in commit messages in v5. Thanks, Jagan. ^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH v4 08/12] drm: bridge: samsung-dsim: Add atomic_check 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki Explicit fixing up of mode_flags is required for DSIM present in i.MX8M SoC. At least the LCDIF + DSIM needs active low sync polarities in order to correlate the correct sync flags of the surrounding components in the chain to make sure the whole pipeline can work properly. So, add DSIM_QUIRK_FIXUP_SYNC_POL to handle this fixup via bridge atomic_check. v4: * none v3: * add DSIM_QUIRK_FIXUP_SYNC_POL to handle mode_flasg fixup v2: * none v1: * fix mode flags in atomic_check instead of mode_fixup Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 18 ++++++++++++++++++ include/drm/bridge/samsung-dsim.h | 1 + 2 files changed, 19 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index b6d17c0c9e58..724fd76435c6 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1341,6 +1341,23 @@ static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, pm_runtime_put_sync(dsi->dev); } +static int samsung_dsim_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + + if (dsi->driver_data->quirks & DSIM_QUIRK_FIXUP_SYNC_POL) { + /* At least LCDIF + DSIM needs active low sync */ + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); + } + + return 0; +} + static void samsung_dsim_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, const struct drm_display_mode *adjusted_mode) @@ -1363,6 +1380,7 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_check = samsung_dsim_atomic_check, .atomic_pre_enable = samsung_dsim_atomic_pre_enable, .atomic_enable = samsung_dsim_atomic_enable, .atomic_disable = samsung_dsim_atomic_disable, diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 95d3f89aec4f..62e1078f43cc 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -36,6 +36,7 @@ struct samsung_dsim_transfer { enum samsung_dsim_quirks { DSIM_QUIRK_PLAT_DATA = BIT(0), + DSIM_QUIRK_FIXUP_SYNC_POL = BIT(1), }; struct samsung_dsim_driver_data { -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 08/12] drm: bridge: samsung-dsim: Add atomic_check @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki Explicit fixing up of mode_flags is required for DSIM present in i.MX8M SoC. At least the LCDIF + DSIM needs active low sync polarities in order to correlate the correct sync flags of the surrounding components in the chain to make sure the whole pipeline can work properly. So, add DSIM_QUIRK_FIXUP_SYNC_POL to handle this fixup via bridge atomic_check. v4: * none v3: * add DSIM_QUIRK_FIXUP_SYNC_POL to handle mode_flasg fixup v2: * none v1: * fix mode flags in atomic_check instead of mode_fixup Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 18 ++++++++++++++++++ include/drm/bridge/samsung-dsim.h | 1 + 2 files changed, 19 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index b6d17c0c9e58..724fd76435c6 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1341,6 +1341,23 @@ static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, pm_runtime_put_sync(dsi->dev); } +static int samsung_dsim_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + + if (dsi->driver_data->quirks & DSIM_QUIRK_FIXUP_SYNC_POL) { + /* At least LCDIF + DSIM needs active low sync */ + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); + } + + return 0; +} + static void samsung_dsim_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, const struct drm_display_mode *adjusted_mode) @@ -1363,6 +1380,7 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_check = samsung_dsim_atomic_check, .atomic_pre_enable = samsung_dsim_atomic_pre_enable, .atomic_enable = samsung_dsim_atomic_enable, .atomic_disable = samsung_dsim_atomic_disable, diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 95d3f89aec4f..62e1078f43cc 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -36,6 +36,7 @@ struct samsung_dsim_transfer { enum samsung_dsim_quirks { DSIM_QUIRK_PLAT_DATA = BIT(0), + DSIM_QUIRK_FIXUP_SYNC_POL = BIT(1), }; struct samsung_dsim_driver_data { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 08/12] drm: bridge: samsung-dsim: Add atomic_check @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki Explicit fixing up of mode_flags is required for DSIM present in i.MX8M SoC. At least the LCDIF + DSIM needs active low sync polarities in order to correlate the correct sync flags of the surrounding components in the chain to make sure the whole pipeline can work properly. So, add DSIM_QUIRK_FIXUP_SYNC_POL to handle this fixup via bridge atomic_check. v4: * none v3: * add DSIM_QUIRK_FIXUP_SYNC_POL to handle mode_flasg fixup v2: * none v1: * fix mode flags in atomic_check instead of mode_fixup Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 18 ++++++++++++++++++ include/drm/bridge/samsung-dsim.h | 1 + 2 files changed, 19 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index b6d17c0c9e58..724fd76435c6 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1341,6 +1341,23 @@ static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, pm_runtime_put_sync(dsi->dev); } +static int samsung_dsim_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct samsung_dsim *dsi = bridge_to_dsi(bridge); + struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + + if (dsi->driver_data->quirks & DSIM_QUIRK_FIXUP_SYNC_POL) { + /* At least LCDIF + DSIM needs active low sync */ + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); + } + + return 0; +} + static void samsung_dsim_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, const struct drm_display_mode *adjusted_mode) @@ -1363,6 +1380,7 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_check = samsung_dsim_atomic_check, .atomic_pre_enable = samsung_dsim_atomic_pre_enable, .atomic_enable = samsung_dsim_atomic_enable, .atomic_disable = samsung_dsim_atomic_disable, diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h index 95d3f89aec4f..62e1078f43cc 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -36,6 +36,7 @@ struct samsung_dsim_transfer { enum samsung_dsim_quirks { DSIM_QUIRK_PLAT_DATA = BIT(0), + DSIM_QUIRK_FIXUP_SYNC_POL = BIT(1), }; struct samsung_dsim_driver_data { -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 09/12] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki Finding the right input bus format throughout the pipeline is hard so add atomic_get_input_bus_fmts callback and initialize with the default RGB888_1X24 bus format on DSI-end. This format can be used in pipeline for negotiating bus format between the DSI-end of this bridge and the other component closer to pipeline components. v4: * none v3: * include media-bus-format.h v2: * none v1: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 724fd76435c6..871cc8cc5352 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -15,6 +15,7 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/irq.h> +#include <linux/media-bus-format.h> #include <linux/of_device.h> #include <linux/phy/phy.h> @@ -1341,6 +1342,32 @@ static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, pm_runtime_put_sync(dsi->dev); } +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 * +samsung_dsim_atomic_get_input_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + u32 output_fmt, + unsigned int *num_input_fmts) +{ + u32 *input_fmts; + + *num_input_fmts = 0; + + input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts), + GFP_KERNEL); + if (!input_fmts) + return NULL; + + /* This is the DSI-end bus format */ + input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; + *num_input_fmts = 1; + + return input_fmts; +} + static int samsung_dsim_atomic_check(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, struct drm_crtc_state *crtc_state, @@ -1380,6 +1407,7 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = samsung_dsim_atomic_get_input_bus_fmts, .atomic_check = samsung_dsim_atomic_check, .atomic_pre_enable = samsung_dsim_atomic_pre_enable, .atomic_enable = samsung_dsim_atomic_enable, -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 09/12] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki Finding the right input bus format throughout the pipeline is hard so add atomic_get_input_bus_fmts callback and initialize with the default RGB888_1X24 bus format on DSI-end. This format can be used in pipeline for negotiating bus format between the DSI-end of this bridge and the other component closer to pipeline components. v4: * none v3: * include media-bus-format.h v2: * none v1: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 724fd76435c6..871cc8cc5352 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -15,6 +15,7 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/irq.h> +#include <linux/media-bus-format.h> #include <linux/of_device.h> #include <linux/phy/phy.h> @@ -1341,6 +1342,32 @@ static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, pm_runtime_put_sync(dsi->dev); } +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 * +samsung_dsim_atomic_get_input_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + u32 output_fmt, + unsigned int *num_input_fmts) +{ + u32 *input_fmts; + + *num_input_fmts = 0; + + input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts), + GFP_KERNEL); + if (!input_fmts) + return NULL; + + /* This is the DSI-end bus format */ + input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; + *num_input_fmts = 1; + + return input_fmts; +} + static int samsung_dsim_atomic_check(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, struct drm_crtc_state *crtc_state, @@ -1380,6 +1407,7 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = samsung_dsim_atomic_get_input_bus_fmts, .atomic_check = samsung_dsim_atomic_check, .atomic_pre_enable = samsung_dsim_atomic_pre_enable, .atomic_enable = samsung_dsim_atomic_enable, -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 09/12] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki Finding the right input bus format throughout the pipeline is hard so add atomic_get_input_bus_fmts callback and initialize with the default RGB888_1X24 bus format on DSI-end. This format can be used in pipeline for negotiating bus format between the DSI-end of this bridge and the other component closer to pipeline components. v4: * none v3: * include media-bus-format.h v2: * none v1: * new patch Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 724fd76435c6..871cc8cc5352 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -15,6 +15,7 @@ #include <linux/clk.h> #include <linux/delay.h> #include <linux/irq.h> +#include <linux/media-bus-format.h> #include <linux/of_device.h> #include <linux/phy/phy.h> @@ -1341,6 +1342,32 @@ static void samsung_dsim_atomic_post_disable(struct drm_bridge *bridge, pm_runtime_put_sync(dsi->dev); } +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 * +samsung_dsim_atomic_get_input_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + u32 output_fmt, + unsigned int *num_input_fmts) +{ + u32 *input_fmts; + + *num_input_fmts = 0; + + input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts), + GFP_KERNEL); + if (!input_fmts) + return NULL; + + /* This is the DSI-end bus format */ + input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; + *num_input_fmts = 1; + + return input_fmts; +} + static int samsung_dsim_atomic_check(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, struct drm_crtc_state *crtc_state, @@ -1380,6 +1407,7 @@ static const struct drm_bridge_funcs samsung_dsim_bridge_funcs = { .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = samsung_dsim_atomic_get_input_bus_fmts, .atomic_check = samsung_dsim_atomic_check, .atomic_pre_enable = samsung_dsim_atomic_pre_enable, .atomic_enable = samsung_dsim_atomic_enable, -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 10/12] drm: bridge: samsung-dsim: Add input_bus_flags 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki eLCDIF is expecting to have input_bus_flags as DE_LOW in order to set active low during valid data transfer on each horizontal line. Add DE_LOW flag via drm bridge timings. v4, v3, v2: * none v1: * none Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 871cc8cc5352..f3b5e265b027 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1593,6 +1593,10 @@ __weak void samsung_dsim_plat_remove(struct samsung_dsim *priv) { } +static const struct drm_bridge_timings samsung_dsim_bridge_timings = { + .input_bus_flags = DRM_BUS_FLAG_DE_LOW, +}; + static int samsung_dsim_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1672,6 +1676,7 @@ static int samsung_dsim_probe(struct platform_device *pdev) dsi->bridge.funcs = &samsung_dsim_bridge_funcs; dsi->bridge.of_node = dev->of_node; + dsi->bridge.timings = &samsung_dsim_bridge_timings; dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 10/12] drm: bridge: samsung-dsim: Add input_bus_flags @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki eLCDIF is expecting to have input_bus_flags as DE_LOW in order to set active low during valid data transfer on each horizontal line. Add DE_LOW flag via drm bridge timings. v4, v3, v2: * none v1: * none Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 871cc8cc5352..f3b5e265b027 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1593,6 +1593,10 @@ __weak void samsung_dsim_plat_remove(struct samsung_dsim *priv) { } +static const struct drm_bridge_timings samsung_dsim_bridge_timings = { + .input_bus_flags = DRM_BUS_FLAG_DE_LOW, +}; + static int samsung_dsim_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1672,6 +1676,7 @@ static int samsung_dsim_probe(struct platform_device *pdev) dsi->bridge.funcs = &samsung_dsim_bridge_funcs; dsi->bridge.of_node = dev->of_node; + dsi->bridge.timings = &samsung_dsim_bridge_timings; dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 10/12] drm: bridge: samsung-dsim: Add input_bus_flags @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki eLCDIF is expecting to have input_bus_flags as DE_LOW in order to set active low during valid data transfer on each horizontal line. Add DE_LOW flag via drm bridge timings. v4, v3, v2: * none v1: * none Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 871cc8cc5352..f3b5e265b027 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1593,6 +1593,10 @@ __weak void samsung_dsim_plat_remove(struct samsung_dsim *priv) { } +static const struct drm_bridge_timings samsung_dsim_bridge_timings = { + .input_bus_flags = DRM_BUS_FLAG_DE_LOW, +}; + static int samsung_dsim_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1672,6 +1676,7 @@ static int samsung_dsim_probe(struct platform_device *pdev) dsi->bridge.funcs = &samsung_dsim_bridge_funcs; dsi->bridge.of_node = dev->of_node; + dsi->bridge.timings = &samsung_dsim_bridge_timings; dsi->bridge.type = DRM_MODE_CONNECTOR_DSI; if (dsi->driver_data->quirks & DSIM_QUIRK_PLAT_DATA) -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 11/12] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki, Rob Herring Samsung MIPI DSIM bridge can also be found in i.MX8MM SoC. Add dt-bingings for it. v4: * none v3: * collect Rob Acked-by v2: * updated comments v1: * new patch Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt index be377786e8cd..8efcf4728e0b 100644 --- a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt @@ -7,6 +7,7 @@ Required properties: "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */ "samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */ "samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */ + "fsl,imx8mm-mipi-dsim" /* for i.MX8M Mini SoCs */ - reg: physical base address and length of the registers set for the device - interrupts: should contain DSI interrupt - clocks: list of clock specifiers, must contain an entry for each required -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 11/12] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki, Rob Herring Samsung MIPI DSIM bridge can also be found in i.MX8MM SoC. Add dt-bingings for it. v4: * none v3: * collect Rob Acked-by v2: * updated comments v1: * new patch Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt index be377786e8cd..8efcf4728e0b 100644 --- a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt @@ -7,6 +7,7 @@ Required properties: "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */ "samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */ "samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */ + "fsl,imx8mm-mipi-dsim" /* for i.MX8M Mini SoCs */ - reg: physical base address and length of the registers set for the device - interrupts: should contain DSI interrupt - clocks: list of clock specifiers, must contain an entry for each required -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 11/12] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki Samsung MIPI DSIM bridge can also be found in i.MX8MM SoC. Add dt-bingings for it. v4: * none v3: * collect Rob Acked-by v2: * updated comments v1: * new patch Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt index be377786e8cd..8efcf4728e0b 100644 --- a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt @@ -7,6 +7,7 @@ Required properties: "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */ "samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */ "samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */ + "fsl,imx8mm-mipi-dsim" /* for i.MX8M Mini SoCs */ - reg: physical base address and length of the registers set for the device - interrupts: should contain DSI interrupt - clocks: list of clock specifiers, must contain an entry for each required -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 12/12] drm: bridge: samsung-dsim: Add i.MX8MM support 2022-08-29 18:40 ` Jagan Teki (?) @ 2022-08-29 18:40 ` Jagan Teki -1 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki, Laurent Pinchart Samsung MIPI DSIM master can also be found in i.MX8MM SoC. Add compatible and associated driver_data for it. v4: * none v3: * enable DSIM_QUIRK_FIXUP_SYNC_POL quirk v2: * collect Laurent r-b v1: * none Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index f3b5e265b027..749b11e19217 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -360,6 +360,24 @@ static const unsigned int exynos5433_reg_values[] = { [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0c), }; +static const unsigned int imx8mm_dsim_reg_values[] = { + [RESET_TYPE] = DSIM_SWRST, + [PLL_TIMER] = 500, + [STOP_STATE_CNT] = 0xf, + [PHYCTRL_ULPS_EXIT] = 0, + [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(0x26), + [PHYTIMING_CLK_POST] = DSIM_PHYTIMING1_CLK_POST(0x0d), + [PHYTIMING_CLK_TRAIL] = DSIM_PHYTIMING1_CLK_TRAIL(0x08), + [PHYTIMING_HS_PREPARE] = DSIM_PHYTIMING2_HS_PREPARE(0x08), + [PHYTIMING_HS_ZERO] = DSIM_PHYTIMING2_HS_ZERO(0x0d), + [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0b), +}; + static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .reg_ofs = exynos_reg_ofs, .plltmr_reg = 0x50, @@ -426,6 +444,19 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .quirks = DSIM_QUIRK_PLAT_DATA, }; +static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = { + .reg_ofs = exynos5433_reg_ofs, + .plltmr_reg = 0xa0, + .has_clklane_stop = 1, + .num_clks = 2, + .max_freq = 2100, + .wait_for_reset = 0, + .num_bits_resol = 12, + .pll_p_offset = 14, + .reg_values = imx8mm_dsim_reg_values, + .quirks = DSIM_QUIRK_FIXUP_SYNC_POL, +}; + static const struct of_device_id samsung_dsim_of_match[] = { { .compatible = "samsung,exynos3250-mipi-dsi", @@ -447,6 +478,10 @@ static const struct of_device_id samsung_dsim_of_match[] = { .compatible = "samsung,exynos5433-mipi-dsi", .data = &exynos5433_dsi_driver_data }, + { + .compatible = "fsl,imx8mm-mipi-dsim", + .data = &imx8mm_dsi_driver_data + }, { /* sentinel. */ } }; -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 12/12] drm: bridge: samsung-dsim: Add i.MX8MM support @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: Matteo Lisi, dri-devel, linux-samsung-soc, linux-arm-kernel, NXP Linux Team, linux-amarula, Jagan Teki, Laurent Pinchart Samsung MIPI DSIM master can also be found in i.MX8MM SoC. Add compatible and associated driver_data for it. v4: * none v3: * enable DSIM_QUIRK_FIXUP_SYNC_POL quirk v2: * collect Laurent r-b v1: * none Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index f3b5e265b027..749b11e19217 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -360,6 +360,24 @@ static const unsigned int exynos5433_reg_values[] = { [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0c), }; +static const unsigned int imx8mm_dsim_reg_values[] = { + [RESET_TYPE] = DSIM_SWRST, + [PLL_TIMER] = 500, + [STOP_STATE_CNT] = 0xf, + [PHYCTRL_ULPS_EXIT] = 0, + [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(0x26), + [PHYTIMING_CLK_POST] = DSIM_PHYTIMING1_CLK_POST(0x0d), + [PHYTIMING_CLK_TRAIL] = DSIM_PHYTIMING1_CLK_TRAIL(0x08), + [PHYTIMING_HS_PREPARE] = DSIM_PHYTIMING2_HS_PREPARE(0x08), + [PHYTIMING_HS_ZERO] = DSIM_PHYTIMING2_HS_ZERO(0x0d), + [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0b), +}; + static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .reg_ofs = exynos_reg_ofs, .plltmr_reg = 0x50, @@ -426,6 +444,19 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .quirks = DSIM_QUIRK_PLAT_DATA, }; +static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = { + .reg_ofs = exynos5433_reg_ofs, + .plltmr_reg = 0xa0, + .has_clklane_stop = 1, + .num_clks = 2, + .max_freq = 2100, + .wait_for_reset = 0, + .num_bits_resol = 12, + .pll_p_offset = 14, + .reg_values = imx8mm_dsim_reg_values, + .quirks = DSIM_QUIRK_FIXUP_SYNC_POL, +}; + static const struct of_device_id samsung_dsim_of_match[] = { { .compatible = "samsung,exynos3250-mipi-dsi", @@ -447,6 +478,10 @@ static const struct of_device_id samsung_dsim_of_match[] = { .compatible = "samsung,exynos5433-mipi-dsi", .data = &exynos5433_dsi_driver_data }, + { + .compatible = "fsl,imx8mm-mipi-dsim", + .data = &imx8mm_dsi_driver_data + }, { /* sentinel. */ } }; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 76+ messages in thread
* [PATCH v4 12/12] drm: bridge: samsung-dsim: Add i.MX8MM support @ 2022-08-29 18:40 ` Jagan Teki 0 siblings, 0 replies; 76+ messages in thread From: Jagan Teki @ 2022-08-29 18:40 UTC (permalink / raw) To: Andrzej Hajda, Inki Dae, Marek Szyprowski, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park, Frieder Schrempf, Fancy Fang, Tim Harvey, Michael Nazzareno Trimarchi, Adam Ford, Neil Armstrong, Robert Foss, Laurent Pinchart, Tommaso Merciai, Marek Vasut Cc: linux-samsung-soc, Laurent Pinchart, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel, Jagan Teki Samsung MIPI DSIM master can also be found in i.MX8MM SoC. Add compatible and associated driver_data for it. v4: * none v3: * enable DSIM_QUIRK_FIXUP_SYNC_POL quirk v2: * collect Laurent r-b v1: * none Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index f3b5e265b027..749b11e19217 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -360,6 +360,24 @@ static const unsigned int exynos5433_reg_values[] = { [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0c), }; +static const unsigned int imx8mm_dsim_reg_values[] = { + [RESET_TYPE] = DSIM_SWRST, + [PLL_TIMER] = 500, + [STOP_STATE_CNT] = 0xf, + [PHYCTRL_ULPS_EXIT] = 0, + [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(0x26), + [PHYTIMING_CLK_POST] = DSIM_PHYTIMING1_CLK_POST(0x0d), + [PHYTIMING_CLK_TRAIL] = DSIM_PHYTIMING1_CLK_TRAIL(0x08), + [PHYTIMING_HS_PREPARE] = DSIM_PHYTIMING2_HS_PREPARE(0x08), + [PHYTIMING_HS_ZERO] = DSIM_PHYTIMING2_HS_ZERO(0x0d), + [PHYTIMING_HS_TRAIL] = DSIM_PHYTIMING2_HS_TRAIL(0x0b), +}; + static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .reg_ofs = exynos_reg_ofs, .plltmr_reg = 0x50, @@ -426,6 +444,19 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .quirks = DSIM_QUIRK_PLAT_DATA, }; +static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = { + .reg_ofs = exynos5433_reg_ofs, + .plltmr_reg = 0xa0, + .has_clklane_stop = 1, + .num_clks = 2, + .max_freq = 2100, + .wait_for_reset = 0, + .num_bits_resol = 12, + .pll_p_offset = 14, + .reg_values = imx8mm_dsim_reg_values, + .quirks = DSIM_QUIRK_FIXUP_SYNC_POL, +}; + static const struct of_device_id samsung_dsim_of_match[] = { { .compatible = "samsung,exynos3250-mipi-dsi", @@ -447,6 +478,10 @@ static const struct of_device_id samsung_dsim_of_match[] = { .compatible = "samsung,exynos5433-mipi-dsi", .data = &exynos5433_dsi_driver_data }, + { + .compatible = "fsl,imx8mm-mipi-dsim", + .data = &imx8mm_dsi_driver_data + }, { /* sentinel. */ } }; -- 2.25.1 ^ permalink raw reply related [flat|nested] 76+ messages in thread
end of thread, other threads:[~2022-09-19 6:24 UTC | newest] Thread overview: 76+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-08-29 18:40 [PATCH v4 00/12] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 01/12] drm: exynos: dsi: Restore proper bridge chain order Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 02/12] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki 2022-09-02 10:47 ` Marek Szyprowski 2022-09-02 10:47 ` Marek Szyprowski 2022-09-02 10:47 ` Marek Szyprowski 2022-09-05 11:24 ` Marek Szyprowski 2022-09-05 11:24 ` Marek Szyprowski 2022-09-05 11:24 ` Marek Szyprowski 2022-09-06 19:07 ` Jagan Teki 2022-09-06 19:07 ` Jagan Teki 2022-09-06 19:07 ` Jagan Teki 2022-09-07 10:04 ` Marek Szyprowski 2022-09-07 10:04 ` Marek Szyprowski 2022-09-07 10:04 ` Marek Szyprowski 2022-09-12 14:52 ` Frieder Schrempf 2022-09-12 14:52 ` Frieder Schrempf 2022-09-12 14:52 ` Frieder Schrempf 2022-09-13 17:29 ` Jagan Teki 2022-09-13 17:29 ` Jagan Teki 2022-09-13 17:29 ` Jagan Teki 2022-09-14 9:21 ` Marek Szyprowski 2022-09-14 9:21 ` Marek Szyprowski 2022-09-14 9:21 ` Marek Szyprowski 2022-09-14 9:39 ` Jagan Teki 2022-09-14 9:39 ` Jagan Teki 2022-09-14 9:39 ` Jagan Teki 2022-09-16 8:28 ` Marek Szyprowski 2022-09-16 8:28 ` Marek Szyprowski 2022-09-16 8:28 ` Marek Szyprowski 2022-09-16 10:21 ` Jagan Teki 2022-09-16 10:21 ` Jagan Teki 2022-09-16 10:21 ` Jagan Teki 2022-09-19 6:22 ` Marek Szyprowski 2022-09-19 6:22 ` Marek Szyprowski 2022-09-19 6:22 ` Marek Szyprowski 2022-08-29 18:40 ` [PATCH v4 03/12] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 04/12] drm: bridge: samsung-dsim: Handle platform init via driver_data Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 05/12] drm: bridge: samsung-dsim: Mark PHY as optional Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 06/12] drm: bridge: samsung-dsim: Handle proper DSI host initialization Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 07/12] drm: bridge: samsung-dsim: Fix PLL_P (PMS_P) offset Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 19:42 ` Adam Ford 2022-08-29 19:42 ` Adam Ford 2022-08-29 19:42 ` Adam Ford 2022-09-14 8:22 ` Jagan Teki 2022-09-14 8:22 ` Jagan Teki 2022-09-14 8:22 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 08/12] drm: bridge: samsung-dsim: Add atomic_check Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 09/12] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 10/12] drm: bridge: samsung-dsim: Add input_bus_flags Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 11/12] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` [PATCH v4 12/12] drm: bridge: samsung-dsim: Add " Jagan Teki 2022-08-29 18:40 ` Jagan Teki 2022-08-29 18:40 ` Jagan Teki
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.