* [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge @ 2022-10-05 15:12 ` Jagan Teki 2022-10-05 15:13 ` [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki ` (15 more replies) 0 siblings, 16 replies; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:12 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. The final bridge supports both the Exynos and i.MX8MM DSI devices. Changes for v7: * fix the drm bridge attach chain for exynos drm dsi driver * fix the hw_type checking logic Changes for v6: * handle previous bridge for exynos dsi while attaching bridge Changes for v5: * bridge changes to support multi-arch * updated and clear commit messages * add hw_type via plat data * removed unneeded quirk * rebased on linux-next Changes for v4: * include Inki Dae in MAINTAINERS * remove dsi_driver probe in exynos_drm_drv to support multi-arch build * update init handling to ensure host init done on first cmd transfer 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: Samsung DSIM bridge Patch 0002: PHY optional Patch 0003: OF-graph or Child node lookup Patch 0004: DSI host initialization Patch 0005: atomic check Patch 0006: PMS_P offset via plat data Patch 0007: atomic_get_input_bus_fmts Patch 0008: input_bus_flags Patch 0009: document fsl,imx8mm-mipi-dsim Patch 0010: add i.MX8MM DSIM support Tested in Engicam i.Core MX8M Mini SoM. Repo: https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 Any inputs? Jagan. Jagan Teki (10): drm: bridge: Add Samsung DSIM bridge driver drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices drm: bridge: samsung-dsim: Mark PHY as optional drm: bridge: samsung-dsim: Handle proper DSI host initialization drm: bridge: samsung-dsim: Add atomic_check drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset 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 .../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 | 1856 +++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- include/drm/bridge/samsung-dsim.h | 115 + 8 files changed, 2108 insertions(+), 1653 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] 53+ messages in thread
* [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:46 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices Jagan Teki ` (14 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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 by maintaining exynos platform glue code in exynos_drm_dsi.c driver and common bridge driver code in samsung-dsim.c providing that the new platform-specific glue should be supported in the bridge driver, unlike exynos platform drm drivers. - Add samsung_dsim_plat_data for keeping platform-specific attributes like host_ops, irq_ops, and hw_type. - Initialize the plat_data hooks for exynos platform in exynos_drm_dsi.c. - samsung_dsim_probe is the common probe call across exynos_drm_dsi.c and samsung-dsim.c. - plat_data hooks like host_ops and irq_ops are invoked during the respective bridge call chains. v7: * fix the drm bridge attach chain for exynos drm dsi driver * fix the hw_type checking logic v6: * handle previous bridge pointer for exynos dsi v5: * [mszyprow] reworked driver initialization using the same approach as in drivers/gpu/drm/{exynos/exynos_dp.c, bridge/analogix/analogix_dp_core.c}, removed weak functions, moved exynos_dsi_driver back to exynos_drm_dsi.c and restored integration with exynos_drm custom initialization. * updated the commit message [Jagan] 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 | 1703 ++++++++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 ++--------------------- include/drm/bridge/samsung-dsim.h | 113 ++ 7 files changed, 1952 insertions(+), 1653 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 9ae989b32ebb..ba7a6721443c 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..07563d00a420 --- /dev/null +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -0,0 +1,1703 @@ +// 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 samsung_dsim_driver_data * +samsung_dsim_types[SAMSUNG_DSIM_TYPE_COUNT] = { + [SAMSUNG_DSIM_TYPE_EXYNOS3250] = &exynos3_dsi_driver_data, + [SAMSUNG_DSIM_TYPE_EXYNOS4210] = &exynos4_dsi_driver_data, + [SAMSUNG_DSIM_TYPE_EXYNOS5410] = &exynos5_dsi_driver_data, + [SAMSUNG_DSIM_TYPE_EXYNOS5422] = &exynos5422_dsi_driver_data, + [SAMSUNG_DSIM_TYPE_EXYNOS5433] = &exynos5433_dsi_driver_data, +}; + +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->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->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); + struct drm_bridge *previous = bridge; + + /** + * FIXME: + * This has to remove once the bridge chain order is compatible + * with Exynos DSI drivers. + * + * DRM bridge chain ordering is not compatible with Exynos DSI + * drivers because DSI sink devices typically want the DSI host + * powered up and configured before they are powered up. + * + * Passing NULL to the previous bridge makes Exynos DSI drivers + * work which is exactly done before. + */ + if (!(dsi->plat_data->hw_type == SAMSUNG_DSIM_TYPE_IMX8MM)) + previous = NULL; + + return drm_bridge_attach(bridge->encoder, dsi->out_bridge, previous, + 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, +}; + +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->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->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; +} + +static int samsung_dsim_register_host(struct samsung_dsim *dsi) +{ + return mipi_dsi_host_register(&dsi->dsi_host); +} + +static void samsung_dsim_unregister_host(struct samsung_dsim *dsi) +{ + mipi_dsi_host_unregister(&dsi->dsi_host); +} + +static const struct samsung_dsim_host_ops samsung_dsim_generic_host_ops = { + .register_host = samsung_dsim_register_host, + .unregister_host = samsung_dsim_unregister_host, +}; + +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->plat_data = of_device_get_match_data(dev); + dsi->driver_data = samsung_dsim_types[dsi->plat_data->hw_type]; + + 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; + + if (dsi->plat_data->host_ops && dsi->plat_data->host_ops->register_host) + ret = dsi->plat_data->host_ops->register_host(dsi); + + if (ret) + goto err_disable_runtime; + + return 0; + +err_disable_runtime: + pm_runtime_disable(dev); + + return ret; +} +EXPORT_SYMBOL_GPL(samsung_dsim_probe); + +int samsung_dsim_remove(struct platform_device *pdev) +{ + struct samsung_dsim *dsi = platform_get_drvdata(pdev); + + pm_runtime_disable(&pdev->dev); + + if (dsi->plat_data->host_ops && dsi->plat_data->host_ops->unregister_host) + dsi->plat_data->host_ops->unregister_host(dsi); + + return 0; +} +EXPORT_SYMBOL_GPL(samsung_dsim_remove); + +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; +} + +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) +}; +EXPORT_SYMBOL_GPL(samsung_dsim_pm_ops); + +static const struct of_device_id samsung_dsim_of_match[] = { + { /* sentinel. */ } +}; +MODULE_DEVICE_TABLE(of, samsung_dsim_of_match); + +static 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_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index ec673223d6b7..5f403703d133 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1,1351 +1,83 @@ // 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; - - 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; -}; - -#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) -{ - 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]); -} - -static inline u32 exynos_dsi_read(struct exynos_dsi *dsi, enum reg_idx idx) -{ - return readl(dsi->reg_base + dsi->driver_data->reg_ofs[idx]); -} - -static const unsigned int exynos_reg_ofs[] = { - [DSIM_STATUS_REG] = 0x00, - [DSIM_SWRST_REG] = 0x04, - [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; - -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) +static void exynos_dsi_enable_irq(struct samsung_dsim *dsim) { - 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; - } + struct exynos_dsi *dsi = dsim->priv; - 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 *dsim) { - unsigned long flags; - bool stopped; + struct exynos_dsi *dsi = dsim->priv; - 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; - } - - /* 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 *dsim = (struct samsung_dsim *)dev_id; + struct exynos_dsi *dsi = dsim->priv; struct drm_encoder *encoder = &dsi->encoder; - if (dsi->state & DSIM_STATE_VIDOUT_AVAILABLE) + if (dsim->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) +static int exynos_dsi_register_te_irq(struct samsung_dsim *dsim, struct device *panel) { - 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) -{ - int ret; + struct exynos_dsi *dsi = dsim->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", - PTR_ERR(dsi->te_gpio)); + dev_err(dsim->dev, "gpio request failed with %ld\n", + PTR_ERR(dsi->te_gpio)); return PTR_ERR(dsi->te_gpio); } te_gpio_irq = gpiod_to_irq(dsi->te_gpio); ret = request_threaded_irq(te_gpio_irq, exynos_dsi_te_irq_handler, NULL, - IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN, "TE", dsi); + IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN, "TE", + dsim); if (ret) { - dev_err(dsi->dev, "request interrupt failed with %d\n", ret); + dev_err(dsim->dev, "request interrupt failed with %d\n", ret); gpiod_put(dsi->te_gpio); return ret; } @@ -1353,128 +85,25 @@ static int exynos_dsi_register_te_irq(struct exynos_dsi *dsi, return 0; } -static void exynos_dsi_unregister_te_irq(struct exynos_dsi *dsi) +static void exynos_dsi_unregister_te_irq(struct samsung_dsim *dsim) { + struct exynos_dsi *dsi = dsim->priv; + if (dsi->te_gpio) { free_irq(gpiod_to_irq(dsi->te_gpio), dsi); gpiod_put(dsi->te_gpio); } } -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, NULL, 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, +static int exynos_dsi_host_attach(struct samsung_dsim *dsim, struct mipi_dsi_device *device) { - struct exynos_dsi *dsi = host_to_dsi(host); - struct device *dev = dsi->dev; + struct exynos_dsi *dsi = dsim->priv; 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, NULL, 0); + drm_bridge_attach(encoder, &dsim->bridge, NULL, 0); /* * This is a temporary solution and should be made by more generic way. @@ -1483,18 +112,18 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, * TE interrupt handler. */ if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO)) { - ret = exynos_dsi_register_te_irq(dsi, &device->dev); + ret = exynos_dsi_register_te_irq(dsim, &device->dev); if (ret) return ret; } mutex_lock(&drm->mode_config.mutex); - dsi->lanes = device->lanes; - dsi->format = device->format; - dsi->mode_flags = device->mode_flags; + dsim->lanes = device->lanes; + dsim->format = device->format; + dsim->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); + !(dsim->mode_flags & MIPI_DSI_MODE_VIDEO); mutex_unlock(&drm->mode_config.mutex); @@ -1504,100 +133,34 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host, return 0; } -static int exynos_dsi_host_detach(struct mipi_dsi_host *host, +static int exynos_dsi_host_detach(struct samsung_dsim *dsim, struct mipi_dsi_device *device) { - struct exynos_dsi *dsi = host_to_dsi(host); + struct exynos_dsi *dsi = dsim->priv; 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); + exynos_dsi_unregister_te_irq(dsim); 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 int exynos_dsi_register_host(struct samsung_dsim *dsim); +static void exynos_dsi_unregister_host(struct samsung_dsim *dsim); -static const struct mipi_dsi_host_ops exynos_dsi_ops = { +static const struct samsung_dsim_host_ops samsung_dsim_exynos_host_ops = { + .register_host = exynos_dsi_register_host, + .unregister_host = exynos_dsi_unregister_host, .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) +static int exynos_dsi_bind(struct device *dev, struct device *master, void *data) { - 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) -{ - struct exynos_dsi *dsi = dev_get_drvdata(dev); + struct samsung_dsim *dsim = dev_get_drvdata(dev); + struct exynos_dsi *dsi = dsim->priv; struct drm_encoder *encoder = &dsi->encoder; struct drm_device *drm_dev = data; int ret; @@ -1608,17 +171,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(&dsim->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 *dsim = dev_get_drvdata(dev); - exynos_dsi_atomic_disable(&dsi->bridge, NULL); + dsim->bridge.funcs->atomic_disable(&dsim->bridge, NULL); - mipi_dsi_host_unregister(&dsi->dsi_host); + mipi_dsi_host_unregister(&dsim->dsi_host); } static const struct component_ops exynos_dsi_component_ops = { @@ -1626,188 +188,86 @@ static const struct component_ops exynos_dsi_component_ops = { .unbind = exynos_dsi_unbind, }; -static int exynos_dsi_probe(struct platform_device *pdev) +static int exynos_dsi_register_host(struct samsung_dsim *dsim) { - struct device *dev = &pdev->dev; - struct exynos_dsi *dsi; - int ret, i; + struct exynos_dsi *exynos_dsi; - dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL); - if (!dsi) + exynos_dsi = devm_kzalloc(dsim->dev, sizeof(*exynos_dsi), GFP_KERNEL); + if (!exynos_dsi) return -ENOMEM; - init_completion(&dsi->completed); - spin_lock_init(&dsi->transfer_lock); - INIT_LIST_HEAD(&dsi->transfer_list); + dsim->priv = exynos_dsi; - 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->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, - 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); - 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; + return component_add(dsim->dev, &exynos_dsi_component_ops); } -static int exynos_dsi_remove(struct platform_device *pdev) +static void exynos_dsi_unregister_host(struct samsung_dsim *dsim) { - pm_runtime_disable(&pdev->dev); - - component_del(&pdev->dev, &exynos_dsi_component_ops); - - return 0; + component_del(dsim->dev, &exynos_dsi_component_ops); } -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) -{ - 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; - } +static const struct samsung_dsim_plat_data exynos3250_dsi_pdata = { + .hw_type = SAMSUNG_DSIM_TYPE_EXYNOS3250, + .host_ops = &samsung_dsim_exynos_host_ops, + .irq_ops = &samsung_dsim_exynos_host_irq, +}; - ret = phy_power_on(dsi->phy); - if (ret < 0) { - dev_err(dsi->dev, "cannot enable phy %d\n", ret); - goto err_clk; - } +static const struct samsung_dsim_plat_data exynos4210_dsi_pdata = { + .hw_type = SAMSUNG_DSIM_TYPE_EXYNOS4210, + .host_ops = &samsung_dsim_exynos_host_ops, + .irq_ops = &samsung_dsim_exynos_host_irq, +}; - return 0; +static const struct samsung_dsim_plat_data exynos5410_dsi_pdata = { + .hw_type = SAMSUNG_DSIM_TYPE_EXYNOS5410, + .host_ops = &samsung_dsim_exynos_host_ops, + .irq_ops = &samsung_dsim_exynos_host_irq, +}; -err_clk: - while (--i > -1) - clk_disable_unprepare(dsi->clks[i]); - regulator_bulk_disable(ARRAY_SIZE(dsi->supplies), dsi->supplies); +static const struct samsung_dsim_plat_data exynos5422_dsi_pdata = { + .hw_type = SAMSUNG_DSIM_TYPE_EXYNOS5422, + .host_ops = &samsung_dsim_exynos_host_ops, + .irq_ops = &samsung_dsim_exynos_host_irq, +}; - return ret; -} +static const struct samsung_dsim_plat_data exynos5433_dsi_pdata = { + .hw_type = SAMSUNG_DSIM_TYPE_EXYNOS5433, + .host_ops = &samsung_dsim_exynos_host_ops, + .irq_ops = &samsung_dsim_exynos_host_irq, +}; -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) +static const struct of_device_id exynos_dsi_of_match[] = { + { + .compatible = "samsung,exynos3250-mipi-dsi", + .data = &exynos3250_dsi_pdata, + }, + { + .compatible = "samsung,exynos4210-mipi-dsi", + .data = &exynos4210_dsi_pdata, + }, + { + .compatible = "samsung,exynos5410-mipi-dsi", + .data = &exynos5410_dsi_pdata, + }, + { + .compatible = "samsung,exynos5422-mipi-dsi", + .data = &exynos5422_dsi_pdata, + }, + { + .compatible = "samsung,exynos5433-mipi-dsi", + .data = &exynos5433_dsi_pdata, + }, + { /* sentinel. */ } }; +MODULE_DEVICE_TABLE(of, exynos_dsi_of_match); struct platform_driver dsi_driver = { - .probe = exynos_dsi_probe, - .remove = exynos_dsi_remove, + .probe = samsung_dsim_probe, + .remove = samsung_dsim_remove, .driver = { .name = "exynos-dsi", .owner = THIS_MODULE, - .pm = &exynos_dsi_pm_ops, + .pm = &samsung_dsim_pm_ops, .of_match_table = exynos_dsi_of_match, }, }; diff --git a/include/drm/bridge/samsung-dsim.h b/include/drm/bridge/samsung-dsim.h new file mode 100644 index 000000000000..b8132bf8e36f --- /dev/null +++ b/include/drm/bridge/samsung-dsim.h @@ -0,0 +1,113 @@ +/* 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) + +enum samsung_dsim_type { + SAMSUNG_DSIM_TYPE_EXYNOS3250, + SAMSUNG_DSIM_TYPE_EXYNOS4210, + SAMSUNG_DSIM_TYPE_EXYNOS5410, + SAMSUNG_DSIM_TYPE_EXYNOS5422, + SAMSUNG_DSIM_TYPE_EXYNOS5433, + SAMSUNG_DSIM_TYPE_IMX8MM, + SAMSUNG_DSIM_TYPE_COUNT, +}; + +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 (*register_host)(struct samsung_dsim *priv); + void (*unregister_host)(struct samsung_dsim *priv); + 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 { + enum samsung_dsim_type hw_type; + const struct samsung_dsim_host_ops *host_ops; + const struct samsung_dsim_irq_ops *irq_ops; +}; + +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; + + void *priv; +}; + +extern int samsung_dsim_probe(struct platform_device *pdev); +extern int samsung_dsim_remove(struct platform_device *pdev); +extern const struct dev_pm_ops samsung_dsim_pm_ops; + +#endif /* __SAMSUNG_DSIM__ */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-05 15:13 ` [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki @ 2022-10-15 21:46 ` Marek Vasut 2022-10-17 2:49 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:46 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c driver > and common bridge driver code in samsung-dsim.c providing that the new > platform-specific glue should be supported in the bridge driver, unlike > exynos platform drm drivers. > > - Add samsung_dsim_plat_data for keeping platform-specific attributes like > host_ops, irq_ops, and hw_type. > > - Initialize the plat_data hooks for exynos platform in exynos_drm_dsi.c. > > - samsung_dsim_probe is the common probe call across exynos_drm_dsi.c and > samsung-dsim.c. > > - plat_data hooks like host_ops and irq_ops are invoked during the > respective bridge call chains. Maybe the Subject should say "Split ... driver" or "Move ... driver" , since it is not adding a new driver here ? ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-15 21:46 ` Marek Vasut @ 2022-10-17 2:49 ` Jagan Teki 2022-10-17 7:19 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-17 2:49 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: > > On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c driver > > and common bridge driver code in samsung-dsim.c providing that the new > > platform-specific glue should be supported in the bridge driver, unlike > > exynos platform drm drivers. > > > > - Add samsung_dsim_plat_data for keeping platform-specific attributes like > > host_ops, irq_ops, and hw_type. > > > > - Initialize the plat_data hooks for exynos platform in exynos_drm_dsi.c. > > > > - samsung_dsim_probe is the common probe call across exynos_drm_dsi.c and > > samsung-dsim.c. > > > > - plat_data hooks like host_ops and irq_ops are invoked during the > > respective bridge call chains. > > Maybe the Subject should say "Split ... driver" or "Move ... driver" , > since it is not adding a new driver here ? Though it is not added a completely new driver, it is adding more infrastructure platform code to be compatible with both Exynos and i.MX8M. This is the prime reason for adding that commit head and explaining the same in the commit body. Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-17 2:49 ` Jagan Teki @ 2022-10-17 7:19 ` Marek Vasut 2022-10-17 7:43 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-17 7:19 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 10/17/22 04:49, Jagan Teki wrote: > On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: >> >> On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c driver >>> and common bridge driver code in samsung-dsim.c providing that the new >>> platform-specific glue should be supported in the bridge driver, unlike >>> exynos platform drm drivers. >>> >>> - Add samsung_dsim_plat_data for keeping platform-specific attributes like >>> host_ops, irq_ops, and hw_type. >>> >>> - Initialize the plat_data hooks for exynos platform in exynos_drm_dsi.c. >>> >>> - samsung_dsim_probe is the common probe call across exynos_drm_dsi.c and >>> samsung-dsim.c. >>> >>> - plat_data hooks like host_ops and irq_ops are invoked during the >>> respective bridge call chains. >> >> Maybe the Subject should say "Split ... driver" or "Move ... driver" , >> since it is not adding a new driver here ? > > Though it is not added a completely new driver, it is adding more > infrastructure platform code to be compatible with both Exynos and > i.MX8M. This is the prime reason for adding that commit head and > explaining the same in the commit body. Diffstat looks like this: drivers/gpu/drm/bridge/samsung-dsim.c | 1703 ++++++++++++++++++++++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 ++--------------------- include/drm/bridge/samsung-dsim.h | 113 ++ 7 files changed, 1952 insertions(+), 1653 deletions(-) Looks to me like most of the code is just moved from existing driver in this patch. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-17 7:19 ` Marek Vasut @ 2022-10-17 7:43 ` Jagan Teki 2022-10-17 8:48 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-17 7:43 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Mon, Oct 17, 2022 at 12:49 PM Marek Vasut <marex@denx.de> wrote: > > On 10/17/22 04:49, Jagan Teki wrote: > > On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: > >> > >> On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c driver > >>> and common bridge driver code in samsung-dsim.c providing that the new > >>> platform-specific glue should be supported in the bridge driver, unlike > >>> exynos platform drm drivers. > >>> > >>> - Add samsung_dsim_plat_data for keeping platform-specific attributes like > >>> host_ops, irq_ops, and hw_type. > >>> > >>> - Initialize the plat_data hooks for exynos platform in exynos_drm_dsi.c. > >>> > >>> - samsung_dsim_probe is the common probe call across exynos_drm_dsi.c and > >>> samsung-dsim.c. > >>> > >>> - plat_data hooks like host_ops and irq_ops are invoked during the > >>> respective bridge call chains. > >> > >> Maybe the Subject should say "Split ... driver" or "Move ... driver" , > >> since it is not adding a new driver here ? > > > > Though it is not added a completely new driver, it is adding more > > infrastructure platform code to be compatible with both Exynos and > > i.MX8M. This is the prime reason for adding that commit head and > > explaining the same in the commit body. > > Diffstat looks like this: > > drivers/gpu/drm/bridge/samsung-dsim.c | 1703 ++++++++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 ++--------------------- > include/drm/bridge/samsung-dsim.h | 113 ++ > 7 files changed, 1952 insertions(+), 1653 deletions(-) > > Looks to me like most of the code is just moved from existing driver in > this patch. Yeah, as I explained (from commit) it is moved, updated, and written the plat code. How about this head? "drm: bridge: Add Samsung DSIM bridge (Split from exynos_drm_dsi)" Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-17 7:43 ` Jagan Teki @ 2022-10-17 8:48 ` Marek Vasut 2022-10-17 9:01 ` Marek Szyprowski 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-17 8:48 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 10/17/22 09:43, Jagan Teki wrote: > On Mon, Oct 17, 2022 at 12:49 PM Marek Vasut <marex@denx.de> wrote: >> >> On 10/17/22 04:49, Jagan Teki wrote: >>> On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: >>>> >>>> On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c driver >>>>> and common bridge driver code in samsung-dsim.c providing that the new >>>>> platform-specific glue should be supported in the bridge driver, unlike >>>>> exynos platform drm drivers. >>>>> >>>>> - Add samsung_dsim_plat_data for keeping platform-specific attributes like >>>>> host_ops, irq_ops, and hw_type. >>>>> >>>>> - Initialize the plat_data hooks for exynos platform in exynos_drm_dsi.c. >>>>> >>>>> - samsung_dsim_probe is the common probe call across exynos_drm_dsi.c and >>>>> samsung-dsim.c. >>>>> >>>>> - plat_data hooks like host_ops and irq_ops are invoked during the >>>>> respective bridge call chains. >>>> >>>> Maybe the Subject should say "Split ... driver" or "Move ... driver" , >>>> since it is not adding a new driver here ? >>> >>> Though it is not added a completely new driver, it is adding more >>> infrastructure platform code to be compatible with both Exynos and >>> i.MX8M. This is the prime reason for adding that commit head and >>> explaining the same in the commit body. >> >> Diffstat looks like this: >> >> drivers/gpu/drm/bridge/samsung-dsim.c | 1703 ++++++++++++++++++++++ >> drivers/gpu/drm/exynos/Kconfig | 1 + >> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 ++--------------------- >> include/drm/bridge/samsung-dsim.h | 113 ++ >> 7 files changed, 1952 insertions(+), 1653 deletions(-) >> >> Looks to me like most of the code is just moved from existing driver in >> this patch. > > Yeah, as I explained (from commit) it is moved, updated, and written > the plat code. How about this head? > > "drm: bridge: Add Samsung DSIM bridge (Split from exynos_drm_dsi)" I disagree with the "Add" part of the Subject, but I'll wait for others' opinion here. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-17 8:48 ` Marek Vasut @ 2022-10-17 9:01 ` Marek Szyprowski 2022-10-18 3:05 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Szyprowski @ 2022-10-17 9:01 UTC (permalink / raw) To: Marek Vasut, Jagan Teki Cc: dri-devel, linux-samsung-soc, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, 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, On 17.10.2022 10:48, Marek Vasut wrote: > On 10/17/22 09:43, Jagan Teki wrote: >> On Mon, Oct 17, 2022 at 12:49 PM Marek Vasut <marex@denx.de> wrote: >>> On 10/17/22 04:49, Jagan Teki wrote: >>>> On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: >>>>> >>>>> On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c >>>>>> driver >>>>>> and common bridge driver code in samsung-dsim.c providing that >>>>>> the new >>>>>> platform-specific glue should be supported in the bridge driver, >>>>>> unlike >>>>>> exynos platform drm drivers. >>>>>> >>>>>> - Add samsung_dsim_plat_data for keeping platform-specific >>>>>> attributes like >>>>>> host_ops, irq_ops, and hw_type. >>>>>> >>>>>> - Initialize the plat_data hooks for exynos platform in >>>>>> exynos_drm_dsi.c. >>>>>> >>>>>> - samsung_dsim_probe is the common probe call across >>>>>> exynos_drm_dsi.c and >>>>>> samsung-dsim.c. >>>>>> >>>>>> - plat_data hooks like host_ops and irq_ops are invoked during the >>>>>> respective bridge call chains. >>>>> >>>>> Maybe the Subject should say "Split ... driver" or "Move ... >>>>> driver" , >>>>> since it is not adding a new driver here ? >>>> >>>> Though it is not added a completely new driver, it is adding more >>>> infrastructure platform code to be compatible with both Exynos and >>>> i.MX8M. This is the prime reason for adding that commit head and >>>> explaining the same in the commit body. >>> >>> Diffstat looks like this: >>> >>> drivers/gpu/drm/bridge/samsung-dsim.c | 1703 >>> ++++++++++++++++++++++ >>> drivers/gpu/drm/exynos/Kconfig | 1 + >>> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 >>> ++--------------------- >>> include/drm/bridge/samsung-dsim.h | 113 ++ >>> 7 files changed, 1952 insertions(+), 1653 deletions(-) >>> >>> Looks to me like most of the code is just moved from existing driver in >>> this patch. >> >> Yeah, as I explained (from commit) it is moved, updated, and written >> the plat code. How about this head? >> >> "drm: bridge: Add Samsung DSIM bridge (Split from exynos_drm_dsi)" > > I disagree with the "Add" part of the Subject, but I'll wait for > others' opinion here. Maybe something like a "Generalize Exynos-DSI DRM driver into a generic Samsung DSIM bridge"? Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-17 9:01 ` Marek Szyprowski @ 2022-10-18 3:05 ` Jagan Teki 2022-10-28 12:12 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-18 3:05 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, 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, Oct 17, 2022 at 2:31 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi, > > On 17.10.2022 10:48, Marek Vasut wrote: > > On 10/17/22 09:43, Jagan Teki wrote: > >> On Mon, Oct 17, 2022 at 12:49 PM Marek Vasut <marex@denx.de> wrote: > >>> On 10/17/22 04:49, Jagan Teki wrote: > >>>> On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: > >>>>> > >>>>> On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c > >>>>>> driver > >>>>>> and common bridge driver code in samsung-dsim.c providing that > >>>>>> the new > >>>>>> platform-specific glue should be supported in the bridge driver, > >>>>>> unlike > >>>>>> exynos platform drm drivers. > >>>>>> > >>>>>> - Add samsung_dsim_plat_data for keeping platform-specific > >>>>>> attributes like > >>>>>> host_ops, irq_ops, and hw_type. > >>>>>> > >>>>>> - Initialize the plat_data hooks for exynos platform in > >>>>>> exynos_drm_dsi.c. > >>>>>> > >>>>>> - samsung_dsim_probe is the common probe call across > >>>>>> exynos_drm_dsi.c and > >>>>>> samsung-dsim.c. > >>>>>> > >>>>>> - plat_data hooks like host_ops and irq_ops are invoked during the > >>>>>> respective bridge call chains. > >>>>> > >>>>> Maybe the Subject should say "Split ... driver" or "Move ... > >>>>> driver" , > >>>>> since it is not adding a new driver here ? > >>>> > >>>> Though it is not added a completely new driver, it is adding more > >>>> infrastructure platform code to be compatible with both Exynos and > >>>> i.MX8M. This is the prime reason for adding that commit head and > >>>> explaining the same in the commit body. > >>> > >>> Diffstat looks like this: > >>> > >>> drivers/gpu/drm/bridge/samsung-dsim.c | 1703 > >>> ++++++++++++++++++++++ > >>> drivers/gpu/drm/exynos/Kconfig | 1 + > >>> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 > >>> ++--------------------- > >>> include/drm/bridge/samsung-dsim.h | 113 ++ > >>> 7 files changed, 1952 insertions(+), 1653 deletions(-) > >>> > >>> Looks to me like most of the code is just moved from existing driver in > >>> this patch. > >> > >> Yeah, as I explained (from commit) it is moved, updated, and written > >> the plat code. How about this head? > >> > >> "drm: bridge: Add Samsung DSIM bridge (Split from exynos_drm_dsi)" > > > > I disagree with the "Add" part of the Subject, but I'll wait for > > others' opinion here. > > Maybe something like a "Generalize Exynos-DSI DRM driver into a generic > Samsung DSIM bridge"? I agreed. Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver 2022-10-18 3:05 ` Jagan Teki @ 2022-10-28 12:12 ` Jagan Teki 0 siblings, 0 replies; 53+ messages in thread From: Jagan Teki @ 2022-10-28 12:12 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, 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 Tue, Oct 18, 2022 at 8:35 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Mon, Oct 17, 2022 at 2:31 PM Marek Szyprowski > <m.szyprowski@samsung.com> wrote: > > > > Hi, > > > > On 17.10.2022 10:48, Marek Vasut wrote: > > > On 10/17/22 09:43, Jagan Teki wrote: > > >> On Mon, Oct 17, 2022 at 12:49 PM Marek Vasut <marex@denx.de> wrote: > > >>> On 10/17/22 04:49, Jagan Teki wrote: > > >>>> On Sun, Oct 16, 2022 at 3:16 AM Marek Vasut <marex@denx.de> wrote: > > >>>>> > > >>>>> On 10/5/22 17:13, 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 by maintaining exynos platform glue code in exynos_drm_dsi.c > > >>>>>> driver > > >>>>>> and common bridge driver code in samsung-dsim.c providing that > > >>>>>> the new > > >>>>>> platform-specific glue should be supported in the bridge driver, > > >>>>>> unlike > > >>>>>> exynos platform drm drivers. > > >>>>>> > > >>>>>> - Add samsung_dsim_plat_data for keeping platform-specific > > >>>>>> attributes like > > >>>>>> host_ops, irq_ops, and hw_type. > > >>>>>> > > >>>>>> - Initialize the plat_data hooks for exynos platform in > > >>>>>> exynos_drm_dsi.c. > > >>>>>> > > >>>>>> - samsung_dsim_probe is the common probe call across > > >>>>>> exynos_drm_dsi.c and > > >>>>>> samsung-dsim.c. > > >>>>>> > > >>>>>> - plat_data hooks like host_ops and irq_ops are invoked during the > > >>>>>> respective bridge call chains. > > >>>>> > > >>>>> Maybe the Subject should say "Split ... driver" or "Move ... > > >>>>> driver" , > > >>>>> since it is not adding a new driver here ? > > >>>> > > >>>> Though it is not added a completely new driver, it is adding more > > >>>> infrastructure platform code to be compatible with both Exynos and > > >>>> i.MX8M. This is the prime reason for adding that commit head and > > >>>> explaining the same in the commit body. > > >>> > > >>> Diffstat looks like this: > > >>> > > >>> drivers/gpu/drm/bridge/samsung-dsim.c | 1703 > > >>> ++++++++++++++++++++++ > > >>> drivers/gpu/drm/exynos/Kconfig | 1 + > > >>> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 > > >>> ++--------------------- > > >>> include/drm/bridge/samsung-dsim.h | 113 ++ > > >>> 7 files changed, 1952 insertions(+), 1653 deletions(-) > > >>> > > >>> Looks to me like most of the code is just moved from existing driver in > > >>> this patch. > > >> > > >> Yeah, as I explained (from commit) it is moved, updated, and written > > >> the plat code. How about this head? > > >> > > >> "drm: bridge: Add Samsung DSIM bridge (Split from exynos_drm_dsi)" > > > > > > I disagree with the "Add" part of the Subject, but I'll wait for > > > others' opinion here. > > > > Maybe something like a "Generalize Exynos-DSI DRM driver into a generic > > Samsung DSIM bridge"? I'm using this commit head for next version patches, hope all Okay with it. Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki 2022-10-05 15:13 ` [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:48 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 03/10] drm: bridge: samsung-dsim: Mark PHY as optional Jagan Teki ` (13 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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. v7, v6, v5, 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 07563d00a420..c34c6abac815 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1356,18 +1356,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] 53+ messages in thread
* Re: [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices 2022-10-05 15:13 ` [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices Jagan Teki @ 2022-10-15 21:48 ` Marek Vasut 2022-10-17 2:52 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:48 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: > 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. This looks like a good candidate for common/helper code which can be reused by other similar drivers. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices 2022-10-15 21:48 ` Marek Vasut @ 2022-10-17 2:52 ` Jagan Teki 0 siblings, 0 replies; 53+ messages in thread From: Jagan Teki @ 2022-10-17 2:52 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Sun, Oct 16, 2022 at 3:18 AM Marek Vasut <marex@denx.de> wrote: > > On 10/5/22 17:13, Jagan Teki wrote: > > 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. > > This looks like a good candidate for common/helper code which can be > reused by other similar drivers. Tried that but unfortunately, it cannot hold to handle things in a generic way. 80253168dbfd ("drm: of: Lookup if child node has panel or bridge") Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 03/10] drm: bridge: samsung-dsim: Mark PHY as optional 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki 2022-10-05 15:13 ` [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki 2022-10-05 15:13 ` [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:50 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 04/10] drm: bridge: samsung-dsim: Handle proper DSI host initialization Jagan Teki ` (12 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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. v7, v6, v5, 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 c34c6abac815..1bae3673151b 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1584,7 +1584,7 @@ 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] 53+ messages in thread
* Re: [PATCH v7 03/10] drm: bridge: samsung-dsim: Mark PHY as optional 2022-10-05 15:13 ` [PATCH v7 03/10] drm: bridge: samsung-dsim: Mark PHY as optional Jagan Teki @ 2022-10-15 21:50 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:50 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: > In i.MX8M Mini/Nano SoC the DSI Phy requires a MIPI DPHY bit 8M Plus too. > 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. Reviewed-by: Marek Vasut <marex@denx.de> ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 04/10] drm: bridge: samsung-dsim: Handle proper DSI host initialization 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (2 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 03/10] drm: bridge: samsung-dsim: Mark PHY as optional Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-05 15:13 ` [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check Jagan Teki ` (11 subsequent siblings) 15 siblings, 0 replies; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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). v7, v6, v5: * none 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 1bae3673151b..563781bb27c4 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1234,12 +1234,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); @@ -1250,6 +1255,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; } @@ -1269,6 +1276,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, @@ -1458,12 +1469,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) @@ -1653,6 +1661,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 b8132bf8e36f..0c5a905f3de7 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) enum samsung_dsim_type { SAMSUNG_DSIM_TYPE_EXYNOS3250, -- 2.25.1 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (3 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 04/10] drm: bridge: samsung-dsim: Handle proper DSI host initialization Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:23 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 06/10] drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset Jagan Teki ` (10 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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 Look like an explicit fixing up of mode_flags is required for DSIM IP present in i.MX8M Mini/Nano SoCs. 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. On the other hand the i.MX 8M Mini Applications Processor Reference Manual, Rev. 3, 11/2020 says. "13.6.3.5.2 RGB interface Vsync, Hsync, and VDEN are active high signals." No clear evidence about whether it can be documentation issues or something, so added a comment FIXME for this and updated the active low sync polarities using SAMSUNG_DSIM_TYPE_IMX8MM hw_type. v7: * fix the hw_type checking logic v6: * none v5: * rebase based new bridge changes [mszyprow] * remove DSIM_QUIRK_FIXUP_SYNC_POL * add hw_type check for sync polarities change. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index 563781bb27c4..b46346232c52 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1315,6 +1315,31 @@ 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->plat_data->hw_type == SAMSUNG_DSIM_TYPE_IMX8MM) { + /** + * FIXME: + * At least LCDIF + DSIM needs active low sync, + * but i.MX 8M Mini Applications Processor Reference Manual, + * Rev. 3, 11/2020 says + * + * 13.6.3.5.2 RGB interface + * Vsync, Hsync, and VDEN are active high signals. + */ + 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) @@ -1353,6 +1378,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, -- 2.25.1 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check 2022-10-05 15:13 ` [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check Jagan Teki @ 2022-10-15 21:23 ` Marek Vasut 2022-10-17 3:54 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:23 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: > Look like an explicit fixing up of mode_flags is required for DSIM IP > present in i.MX8M Mini/Nano SoCs. > > 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. > > On the other hand the i.MX 8M Mini Applications Processor Reference Manual, > Rev. 3, 11/2020 says. > "13.6.3.5.2 RGB interface > Vsync, Hsync, and VDEN are active high signals." > > No clear evidence about whether it can be documentation issues or > something, so added a comment FIXME for this and updated the active low > sync polarities using SAMSUNG_DSIM_TYPE_IMX8MM hw_type. [...] > +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->plat_data->hw_type == SAMSUNG_DSIM_TYPE_IMX8MM) { > + /** > + * FIXME: > + * At least LCDIF + DSIM needs active low sync, > + * but i.MX 8M Mini Applications Processor Reference Manual, > + * Rev. 3, 11/2020 says > + * > + * 13.6.3.5.2 RGB interface > + * Vsync, Hsync, and VDEN are active high signals. > + */ > + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); > + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); > + } It would be good to explain what exactly is going on here in the comment, the comment says "Vsync, Hsync, and VDEN are active high signals." and the code below does exact opposite and sets NxSYNC flags. Yes, the MX8MM/MN does need HS/VS/DE active LOW, it is a quirk of that MXSFB-DSIM glue logic. The MX8MP needs the exact opposite on all three, active HIGH. It would also be good to mention both MX8MM and MX8MN are affected, not only MX8MM. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check 2022-10-15 21:23 ` Marek Vasut @ 2022-10-17 3:54 ` Jagan Teki 2022-10-17 7:23 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-17 3:54 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Sun, Oct 16, 2022 at 2:53 AM Marek Vasut <marex@denx.de> wrote: > > On 10/5/22 17:13, Jagan Teki wrote: > > Look like an explicit fixing up of mode_flags is required for DSIM IP > > present in i.MX8M Mini/Nano SoCs. > > > > 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. > > > > On the other hand the i.MX 8M Mini Applications Processor Reference Manual, > > Rev. 3, 11/2020 says. > > "13.6.3.5.2 RGB interface > > Vsync, Hsync, and VDEN are active high signals." > > > > No clear evidence about whether it can be documentation issues or > > something, so added a comment FIXME for this and updated the active low > > sync polarities using SAMSUNG_DSIM_TYPE_IMX8MM hw_type. > > [...] > > > +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->plat_data->hw_type == SAMSUNG_DSIM_TYPE_IMX8MM) { > > + /** > > + * FIXME: > > + * At least LCDIF + DSIM needs active low sync, > > + * but i.MX 8M Mini Applications Processor Reference Manual, > > + * Rev. 3, 11/2020 says > > + * > > + * 13.6.3.5.2 RGB interface > > + * Vsync, Hsync, and VDEN are active high signals. > > + */ > > + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); > > + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); > > + } > > It would be good to explain what exactly is going on here in the > comment, the comment says "Vsync, Hsync, and VDEN are active high > signals." and the code below does exact opposite and sets NxSYNC flags. > > Yes, the MX8MM/MN does need HS/VS/DE active LOW, it is a quirk of that > MXSFB-DSIM glue logic. The MX8MP needs the exact opposite on all three, > active HIGH. This is what exactly is mentioned in the comments. 2nd line mentioned the active low of signals. > > + * At least LCDIF + DSIM needs active low sync, from 3rd line onwards it mentioned what reference manual is referring Not quite understand what is misleading here. > > It would also be good to mention both MX8MM and MX8MN are affected, not > only MX8MM. I think I can do this once I refer to the MX8MN manual. Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check 2022-10-17 3:54 ` Jagan Teki @ 2022-10-17 7:23 ` Marek Vasut 2022-10-17 7:51 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-17 7:23 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 10/17/22 05:54, Jagan Teki wrote: > On Sun, Oct 16, 2022 at 2:53 AM Marek Vasut <marex@denx.de> wrote: >> >> On 10/5/22 17:13, Jagan Teki wrote: >>> Look like an explicit fixing up of mode_flags is required for DSIM IP >>> present in i.MX8M Mini/Nano SoCs. >>> >>> 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. >>> >>> On the other hand the i.MX 8M Mini Applications Processor Reference Manual, >>> Rev. 3, 11/2020 says. >>> "13.6.3.5.2 RGB interface >>> Vsync, Hsync, and VDEN are active high signals." >>> >>> No clear evidence about whether it can be documentation issues or >>> something, so added a comment FIXME for this and updated the active low >>> sync polarities using SAMSUNG_DSIM_TYPE_IMX8MM hw_type. >> >> [...] >> >>> +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->plat_data->hw_type == SAMSUNG_DSIM_TYPE_IMX8MM) { >>> + /** >>> + * FIXME: >>> + * At least LCDIF + DSIM needs active low sync, >>> + * but i.MX 8M Mini Applications Processor Reference Manual, >>> + * Rev. 3, 11/2020 says >>> + * >>> + * 13.6.3.5.2 RGB interface >>> + * Vsync, Hsync, and VDEN are active high signals. >>> + */ >>> + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); >>> + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); >>> + } >> >> It would be good to explain what exactly is going on here in the >> comment, the comment says "Vsync, Hsync, and VDEN are active high >> signals." and the code below does exact opposite and sets NxSYNC flags. >> >> Yes, the MX8MM/MN does need HS/VS/DE active LOW, it is a quirk of that >> MXSFB-DSIM glue logic. The MX8MP needs the exact opposite on all three, >> active HIGH. > > This is what exactly is mentioned in the comments. > > 2nd line mentioned the active low of signals. >>> + * At least LCDIF + DSIM needs active low sync, > > from 3rd line onwards it mentioned what reference manual is referring > > Not quite understand what is misleading here. This part: " + * Vsync, Hsync, and VDEN are active high signals. + */ + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); " Comment claims the signals are active high by quoting datasheet, and then sets the exact opposite on next line of code. Have a look at this patch, I updated the comment there for MX8MP too: [PATCH] drm: bridge: samsung-dsim: Add i.MX8M Plus support ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check 2022-10-17 7:23 ` Marek Vasut @ 2022-10-17 7:51 ` Jagan Teki 0 siblings, 0 replies; 53+ messages in thread From: Jagan Teki @ 2022-10-17 7:51 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Mon, Oct 17, 2022 at 12:53 PM Marek Vasut <marex@denx.de> wrote: > > On 10/17/22 05:54, Jagan Teki wrote: > > On Sun, Oct 16, 2022 at 2:53 AM Marek Vasut <marex@denx.de> wrote: > >> > >> On 10/5/22 17:13, Jagan Teki wrote: > >>> Look like an explicit fixing up of mode_flags is required for DSIM IP > >>> present in i.MX8M Mini/Nano SoCs. > >>> > >>> 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. > >>> > >>> On the other hand the i.MX 8M Mini Applications Processor Reference Manual, > >>> Rev. 3, 11/2020 says. > >>> "13.6.3.5.2 RGB interface > >>> Vsync, Hsync, and VDEN are active high signals." > >>> > >>> No clear evidence about whether it can be documentation issues or > >>> something, so added a comment FIXME for this and updated the active low > >>> sync polarities using SAMSUNG_DSIM_TYPE_IMX8MM hw_type. > >> > >> [...] > >> > >>> +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->plat_data->hw_type == SAMSUNG_DSIM_TYPE_IMX8MM) { > >>> + /** > >>> + * FIXME: > >>> + * At least LCDIF + DSIM needs active low sync, > >>> + * but i.MX 8M Mini Applications Processor Reference Manual, > >>> + * Rev. 3, 11/2020 says > >>> + * > >>> + * 13.6.3.5.2 RGB interface > >>> + * Vsync, Hsync, and VDEN are active high signals. > >>> + */ > >>> + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); > >>> + adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); > >>> + } > >> > >> It would be good to explain what exactly is going on here in the > >> comment, the comment says "Vsync, Hsync, and VDEN are active high > >> signals." and the code below does exact opposite and sets NxSYNC flags. > >> > >> Yes, the MX8MM/MN does need HS/VS/DE active LOW, it is a quirk of that > >> MXSFB-DSIM glue logic. The MX8MP needs the exact opposite on all three, > >> active HIGH. > > > > This is what exactly is mentioned in the comments. > > > > 2nd line mentioned the active low of signals. > >>> + * At least LCDIF + DSIM needs active low sync, > > > > from 3rd line onwards it mentioned what reference manual is referring > > > > Not quite understand what is misleading here. > > This part: > " > + * Vsync, Hsync, and VDEN are active high signals. > + */ > + adjusted_mode->flags |= (DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); > " > > Comment claims the signals are active high by quoting datasheet, and > then sets the exact opposite on next line of code. The comment stated what is done first and then gave the datasheet reference. look this sequence seems confusing, I will recheck and update the best possible comment. > > Have a look at this patch, I updated the comment there for MX8MP too: > [PATCH] drm: bridge: samsung-dsim: Add i.MX8M Plus support I will check. Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 06/10] drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (4 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:56 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts Jagan Teki ` (9 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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 Look like PLL PMS_P offset value varies between platforms that have Samsung DSIM IP. However, there is no clear evidence for it as both Exynos and i.MX 8M Mini Application Processor Reference Manual is still referring the PMS_P offset as 13. The offset 13 is not working for i.MX8M Mini SoCs but the downstream NXP sec-dsim.c driver is using offset 14 for i.MX8M Mini SoC platforms [1] [2]. 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(). Not sure whether it is reference manual documentation or something else but this patch trusts the downstream code and handle PLL_P offset via platform driver data so-that imx8mm driver data shall use pll_p_offset to 14. [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#n210 [2] 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 v7, v6: * none v5: * updated clear commit message 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 b46346232c52..41970e794a7c 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, }; @@ -380,6 +381,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, }; @@ -390,6 +392,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, }; @@ -401,6 +404,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, }; @@ -412,6 +416,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, }; @@ -543,7 +548,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 0c5a905f3de7..df3d030daec6 100644 --- a/include/drm/bridge/samsung-dsim.h +++ b/include/drm/bridge/samsung-dsim.h @@ -53,6 +53,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; }; -- 2.25.1 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH v7 06/10] drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset 2022-10-05 15:13 ` [PATCH v7 06/10] drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset Jagan Teki @ 2022-10-15 21:56 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:56 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: > Look like PLL PMS_P offset value varies between platforms that have > Samsung DSIM IP. > > However, there is no clear evidence for it as both Exynos and i.MX > 8M Mini Application Processor Reference Manual is still referring > the PMS_P offset as 13. > > The offset 13 is not working for i.MX8M Mini SoCs but the downstream > NXP sec-dsim.c driver is using offset 14 for i.MX8M Mini SoC platforms > [1] [2]. > > 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(). > > Not sure whether it is reference manual documentation or something else > but this patch trusts the downstream code and handle PLL_P offset via > platform driver data so-that imx8mm driver data shall use pll_p_offset > to 14. > > [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#n210 > [2] 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 You also add to the commit message that all of 8M Mini/Nano/Plus have P=14 , unlike Exynos. It also seems like the PLL in the DSIM and the clock PLLs in the 8M are the same design from Samsung. Reviewed-by: Marek Vasut <marex@denx.de> ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (5 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 06/10] drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 22:01 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 08/10] drm: bridge: samsung-dsim: Add input_bus_flags Jagan Teki ` (8 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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. v7, v6, v5, 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 41970e794a7c..f714e49c1eab 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> @@ -1321,6 +1322,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, @@ -1384,6 +1411,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] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-10-05 15:13 ` [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts Jagan Teki @ 2022-10-15 22:01 ` Marek Vasut 2022-10-17 3:58 ` Jagan Teki 2022-11-03 9:39 ` Jagan Teki 0 siblings, 2 replies; 53+ messages in thread From: Marek Vasut @ 2022-10-15 22:01 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: [...] > @@ -1321,6 +1322,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; Is this the only supported format ? NXP AN13573 lists the following: i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 3.7.4 Pixel formats Table 14. DSI pixel packing formats Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 Packed Pixel Stream, 24-bit YCbCr, 4:2:2 Packed Pixel Stream, 16-bit YCbCr, 4:2:2 Packed Pixel Stream, 30-bit RGB, 10-10-10 Packed Pixel Stream, 36-bit RGB, 12-12-12 Packed Pixel Stream, 12-bit YCbCr, 4:2:0 Packed Pixel Stream, 16-bit RGB, 5-6-5 Packed Pixel Stream, 18-bit RGB, 6-6-6 Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 Packed Pixel Stream, 24-bit RGB, 8-8-8 Format The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP LCDIFv3 can also generate the 16bit YCbCr . It seems there should be more formats here. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-10-15 22:01 ` Marek Vasut @ 2022-10-17 3:58 ` Jagan Teki 2022-10-17 7:24 ` Marek Vasut 2022-11-03 9:39 ` Jagan Teki 1 sibling, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-17 3:58 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: > > On 10/5/22 17:13, Jagan Teki wrote: > > [...] > > > @@ -1321,6 +1322,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; > > Is this the only supported format ? NXP AN13573 lists the following: At least it only formats I have tested on my panel. > > i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 > 3.7.4 Pixel formats > Table 14. DSI pixel packing formats > > Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 > Packed Pixel Stream, 24-bit YCbCr, 4:2:2 > Packed Pixel Stream, 16-bit YCbCr, 4:2:2 > Packed Pixel Stream, 30-bit RGB, 10-10-10 > Packed Pixel Stream, 36-bit RGB, 12-12-12 > Packed Pixel Stream, 12-bit YCbCr, 4:2:0 > Packed Pixel Stream, 16-bit RGB, 5-6-5 > Packed Pixel Stream, 18-bit RGB, 6-6-6 > Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 > Packed Pixel Stream, 24-bit RGB, 8-8-8 Format > > The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP > LCDIFv3 can also generate the 16bit YCbCr . > > It seems there should be more formats here. The idea of this patch is to support the default format first, and can possibly add future patches with the addition of new formats. Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-10-17 3:58 ` Jagan Teki @ 2022-10-17 7:24 ` Marek Vasut 2022-11-03 7:40 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-10-17 7:24 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 10/17/22 05:58, Jagan Teki wrote: > On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: >> >> On 10/5/22 17:13, Jagan Teki wrote: >> >> [...] >> >>> @@ -1321,6 +1322,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; >> >> Is this the only supported format ? NXP AN13573 lists the following: > > At least it only formats I have tested on my panel. > >> >> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 >> 3.7.4 Pixel formats >> Table 14. DSI pixel packing formats >> >> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 >> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 >> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 >> Packed Pixel Stream, 30-bit RGB, 10-10-10 >> Packed Pixel Stream, 36-bit RGB, 12-12-12 >> Packed Pixel Stream, 12-bit YCbCr, 4:2:0 >> Packed Pixel Stream, 16-bit RGB, 5-6-5 >> Packed Pixel Stream, 18-bit RGB, 6-6-6 >> Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 >> Packed Pixel Stream, 24-bit RGB, 8-8-8 Format >> >> The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP >> LCDIFv3 can also generate the 16bit YCbCr . >> >> It seems there should be more formats here. > > The idea of this patch is to support the default format first, and can > possibly add future patches with the addition of new formats. Since you already know about the list, please add all the formats, so we won't be adding known broken code first, only to fix it later. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-10-17 7:24 ` Marek Vasut @ 2022-11-03 7:40 ` Jagan Teki 2022-11-03 16:03 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-11-03 7:40 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Mon, Oct 17, 2022 at 12:54 PM Marek Vasut <marex@denx.de> wrote: > > On 10/17/22 05:58, Jagan Teki wrote: > > On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: > >> > >> On 10/5/22 17:13, Jagan Teki wrote: > >> > >> [...] > >> > >>> @@ -1321,6 +1322,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; > >> > >> Is this the only supported format ? NXP AN13573 lists the following: > > > > At least it only formats I have tested on my panel. > > > >> > >> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 > >> 3.7.4 Pixel formats > >> Table 14. DSI pixel packing formats > >> > >> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 > >> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 > >> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 > >> Packed Pixel Stream, 30-bit RGB, 10-10-10 > >> Packed Pixel Stream, 36-bit RGB, 12-12-12 > >> Packed Pixel Stream, 12-bit YCbCr, 4:2:0 > >> Packed Pixel Stream, 16-bit RGB, 5-6-5 > >> Packed Pixel Stream, 18-bit RGB, 6-6-6 > >> Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 > >> Packed Pixel Stream, 24-bit RGB, 8-8-8 Format > >> > >> The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP > >> LCDIFv3 can also generate the 16bit YCbCr . > >> > >> It seems there should be more formats here. > > > > The idea of this patch is to support the default format first, and can > > possibly add future patches with the addition of new formats. > > Since you already know about the list, please add all the formats, so we > won't be adding known broken code first, only to fix it later. Okay. I can see the DSI section Mini TRM shown below formats. (13.6.2 Features) Supports pixel format: 16bpp, 18bpp packed, 18bpp loosely packed (3 byte format), and 24bpp I will try to add these 4 formats. let me know. Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-11-03 7:40 ` Jagan Teki @ 2022-11-03 16:03 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-11-03 16:03 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 11/3/22 08:40, Jagan Teki wrote: > On Mon, Oct 17, 2022 at 12:54 PM Marek Vasut <marex@denx.de> wrote: >> >> On 10/17/22 05:58, Jagan Teki wrote: >>> On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: >>>> >>>> On 10/5/22 17:13, Jagan Teki wrote: >>>> >>>> [...] >>>> >>>>> @@ -1321,6 +1322,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; >>>> >>>> Is this the only supported format ? NXP AN13573 lists the following: >>> >>> At least it only formats I have tested on my panel. >>> >>>> >>>> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 >>>> 3.7.4 Pixel formats >>>> Table 14. DSI pixel packing formats >>>> >>>> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 >>>> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 >>>> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 >>>> Packed Pixel Stream, 30-bit RGB, 10-10-10 >>>> Packed Pixel Stream, 36-bit RGB, 12-12-12 >>>> Packed Pixel Stream, 12-bit YCbCr, 4:2:0 >>>> Packed Pixel Stream, 16-bit RGB, 5-6-5 >>>> Packed Pixel Stream, 18-bit RGB, 6-6-6 >>>> Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 >>>> Packed Pixel Stream, 24-bit RGB, 8-8-8 Format >>>> >>>> The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP >>>> LCDIFv3 can also generate the 16bit YCbCr . >>>> >>>> It seems there should be more formats here. >>> >>> The idea of this patch is to support the default format first, and can >>> possibly add future patches with the addition of new formats. >> >> Since you already know about the list, please add all the formats, so we >> won't be adding known broken code first, only to fix it later. > > Okay. I can see the DSI section Mini TRM shown below formats. (13.6.2 Features) > > Supports pixel format: 16bpp, 18bpp packed, 18bpp loosely packed (3 byte > format), and 24bpp > > I will try to add these 4 formats. let me know. You should be able to add all but the 'Packed Pixel Stream, 12-bit YCbCr, 4:2:0' which would have to be defined (that's a few lines patch?). ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-10-15 22:01 ` Marek Vasut 2022-10-17 3:58 ` Jagan Teki @ 2022-11-03 9:39 ` Jagan Teki 2022-11-03 16:02 ` Marek Vasut 1 sibling, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-11-03 9:39 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: > > On 10/5/22 17:13, Jagan Teki wrote: > > [...] > > > @@ -1321,6 +1322,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; > > Is this the only supported format ? NXP AN13573 lists the following: > > i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 > 3.7.4 Pixel formats > Table 14. DSI pixel packing formats > > Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 > Packed Pixel Stream, 24-bit YCbCr, 4:2:2 > Packed Pixel Stream, 16-bit YCbCr, 4:2:2 Look like these are unsupported in media-bus-format.h list. > Packed Pixel Stream, 30-bit RGB, 10-10-10 > Packed Pixel Stream, 36-bit RGB, 12-12-12 > Packed Pixel Stream, 12-bit YCbCr, 4:2:0 Same issue, unsupported. > Packed Pixel Stream, 16-bit RGB, 5-6-5 MEDIA_BUS_FMT_RGB565_1X16 > Packed Pixel Stream, 18-bit RGB, 6-6-6 Same issue, unsupported. > Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 > Packed Pixel Stream, 24-bit RGB, 8-8-8 Format MEDIA_BUS_FMT_RGB666_1X18 MEDIA_BUS_FMT_RGB888_1X24 > > The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP > LCDIFv3 can also generate the 16bit YCbCr . Is YCbCr denoted as UYVY in media-bus-format.h ? Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-11-03 9:39 ` Jagan Teki @ 2022-11-03 16:02 ` Marek Vasut 2022-11-03 17:27 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-11-03 16:02 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 11/3/22 10:39, Jagan Teki wrote: > On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: >> >> On 10/5/22 17:13, Jagan Teki wrote: >> >> [...] >> >>> @@ -1321,6 +1322,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; >> >> Is this the only supported format ? NXP AN13573 lists the following: >> >> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 >> 3.7.4 Pixel formats >> Table 14. DSI pixel packing formats >> >> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 >> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 >> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 > > Look like these are unsupported in media-bus-format.h list. Aren't those: MEDIA_BUS_FMT_UYVY12_1X24 MEDIA_BUS_FMT_UYVY8_1X16 ? Those are packed, and subsampled 4:2:2 >> Packed Pixel Stream, 30-bit RGB, 10-10-10 MEDIA_BUS_FMT_RGB101010_1X30 >> Packed Pixel Stream, 36-bit RGB, 12-12-12 MEDIA_BUS_FMT_RGB121212_1X36 >> Packed Pixel Stream, 12-bit YCbCr, 4:2:0 > > Same issue, unsupported. The 12-bit packed 4:2:0 might be something along the lines of drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c MEDIA_BUS_FMT_YUYV8_1_5X8, /* YUV420 */ >> Packed Pixel Stream, 16-bit RGB, 5-6-5 > > MEDIA_BUS_FMT_RGB565_1X16 > >> Packed Pixel Stream, 18-bit RGB, 6-6-6 > > Same issue, unsupported. MEDIA_BUS_FMT_RGB666_1X18 >> Loosely Packed Pixel Stream, 18-bit RGB, 6-6-6 >> Packed Pixel Stream, 24-bit RGB, 8-8-8 Format > > MEDIA_BUS_FMT_RGB666_1X18 > MEDIA_BUS_FMT_RGB888_1X24 > >> >> The MX8MM/MN LCDIF can generate all of those RGB formats , the MX8MP >> LCDIFv3 can also generate the 16bit YCbCr . > > Is YCbCr denoted as UYVY in media-bus-format.h ? I think this applies: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/colorspaces.html " Sometimes people confuse Y’CbCr as being a colorspace. This is not correct, it is just an encoding of an R’G’B’ color into luma and chroma values. " And esp. this: " In order to correctly interpret a color you need to know the quantization range, whether it is R’G’B’ or Y’CbCr, the used Y’CbCr encoding and the colorspace. From that information you can calculate the corresponding CIE XYZ color and map that again to whatever colorspace your display device uses. " Which means that in order to properly describe or interpret the data, you need the entire v4l2_mbus_framefmt content, not just the pixel code: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/subdev-formats.html But this information is not passed across the bus, that's metadata internal to the kernel. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-11-03 16:02 ` Marek Vasut @ 2022-11-03 17:27 ` Jagan Teki 2022-11-03 18:58 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-11-03 17:27 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On Thu, Nov 3, 2022 at 9:56 PM Marek Vasut <marex@denx.de> wrote: > > On 11/3/22 10:39, Jagan Teki wrote: > > On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: > >> > >> On 10/5/22 17:13, Jagan Teki wrote: > >> > >> [...] > >> > >>> @@ -1321,6 +1322,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; > >> > >> Is this the only supported format ? NXP AN13573 lists the following: > >> > >> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 > >> 3.7.4 Pixel formats > >> Table 14. DSI pixel packing formats > >> > >> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 > >> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 > >> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 > > > > Look like these are unsupported in media-bus-format.h list. > > Aren't those: > > MEDIA_BUS_FMT_UYVY12_1X24 Why is UYVY12 - YCbCr, 4:2:2 is 4+2+2 = 8 then it has UYVY8 ? > MEDIA_BUS_FMT_UYVY8_1X16 If YCbCr is UYVY (I still don't get this notation, sorry) then Packed Pixel Stream, 24-bit YCbCr, 4:2:2 with 2 Pixels per packet from Table 14 can be MEDIA_BUS_FMT_UYVY8_2X24 (YCbCr 4:2:2 is UYVY8) " based on a reference example from media bus format doc 4.13.3.4.1.1.3. Packed YUV Formats, For instance, a format where pixels are encoded as 8-bit YUV values downsampled to 4:2:2 and transferred as 2 8-bit bus samples per pixel in the U, Y, V, Y order will be named MEDIA_BUS_FMT_UYVY8_2X8." https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/subdev-formats.html _2X24 here 2 Pixels per packet is the exact packets to consider or we can consider 1 Pixel per packet also. If later is true then _1X24 from your notation is correct. Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-11-03 17:27 ` Jagan Teki @ 2022-11-03 18:58 ` Marek Vasut 2022-11-07 17:00 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-11-03 18:58 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 11/3/22 18:27, Jagan Teki wrote: > On Thu, Nov 3, 2022 at 9:56 PM Marek Vasut <marex@denx.de> wrote: >> >> On 11/3/22 10:39, Jagan Teki wrote: >>> On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: >>>> >>>> On 10/5/22 17:13, Jagan Teki wrote: >>>> >>>> [...] >>>> >>>>> @@ -1321,6 +1322,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; >>>> >>>> Is this the only supported format ? NXP AN13573 lists the following: >>>> >>>> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 >>>> 3.7.4 Pixel formats >>>> Table 14. DSI pixel packing formats >>>> >>>> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 >>>> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 >>>> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 >>> >>> Look like these are unsupported in media-bus-format.h list. >> >> Aren't those: >> >> MEDIA_BUS_FMT_UYVY12_1X24 > > Why is UYVY12 - YCbCr, 4:2:2 is 4+2+2 = 8 then it has UYVY8 ? (someone please correct me if I'm totally wrong here) The 12 is channel width (12 bit for each Y1/Y2/U/V channel sample). The 4:2:2 is subsampling (where are the color components sampled relative to brightness component). Picture is here: https://upload.wikimedia.org/wikipedia/commons/f/f2/Common_chroma_subsampling_ratios.svg Each Y square of the left is 12bit sample. Each U+V square is 12bit sample for U and 12bit sample for V. In case of 4:4:4 subsampling, each luminance (brightness) component has matching chrominance (color) components. In case of the 4:2:2 subsampling, two neighboring luminance components share two chrominance components. To transfer one pixel including color information, you have to transfer two pixels, Y0+U as 2x12bit sample in one cycle of 24bit bus, and then Y1+V as 2x12bit sample in another cycle of 24bit bus (2 clock cycles total, 4 samples total). From that you can reconstruct the two top-left squares (purple pixels) in the rightmost YUV column of 4:2:2 row. The entire trick is that because eye is less sensitive to color than it is to light, you can transfer less color information and thus save bandwidth without anyone noticing (much of it). >> MEDIA_BUS_FMT_UYVY8_1X16 > > If YCbCr is UYVY (I still don't get this notation, sorry) then Packed > Pixel Stream, 24-bit YCbCr, 4:2:2 with 2 Pixels per packet from Table > 14 can be > > MEDIA_BUS_FMT_UYVY8_2X24 > (YCbCr 4:2:2 is UYVY8) > > " based on a reference example from media bus format doc > 4.13.3.4.1.1.3. Packed YUV Formats, For instance, a format where > pixels are encoded as 8-bit YUV values downsampled to 4:2:2 and > transferred as 2 8-bit bus samples per pixel in the U, Y, V, Y order > will be named MEDIA_BUS_FMT_UYVY8_2X8." The way I read the above is that the channel width of each channel is 8-bit , so you start with two pixels Y0/U/Y1/V which add up to 32bit total. That is transferred over 8-bit bus, in 4 bus cycles total. One pixel therefore takes 2 cycles of the 8 bit bus to transfer, even if you cannot transfer one pixel separately . > https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/subdev-formats.html > > _2X24 here 2 Pixels per packet is the exact packets to consider or we > can consider 1 Pixel per packet also. If later is true then _1X24 from > your notation is correct. Since the DSIM input bus is 32bit wide, to transfer one such 4:2:2 pixel, you need 1 bus cycle (2x12 bits per half of two pixels). [...] ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts 2022-11-03 18:58 ` Marek Vasut @ 2022-11-07 17:00 ` Jagan Teki 0 siblings, 0 replies; 53+ messages in thread From: Jagan Teki @ 2022-11-07 17:00 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski Hi Marek, On Fri, Nov 4, 2022 at 12:28 AM Marek Vasut <marex@denx.de> wrote: > > On 11/3/22 18:27, Jagan Teki wrote: > > On Thu, Nov 3, 2022 at 9:56 PM Marek Vasut <marex@denx.de> wrote: > >> > >> On 11/3/22 10:39, Jagan Teki wrote: > >>> On Sun, Oct 16, 2022 at 3:31 AM Marek Vasut <marex@denx.de> wrote: > >>>> > >>>> On 10/5/22 17:13, Jagan Teki wrote: > >>>> > >>>> [...] > >>>> > >>>>> @@ -1321,6 +1322,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; > >>>> > >>>> Is this the only supported format ? NXP AN13573 lists the following: > >>>> > >>>> i.MX 8/RT MIPI DSI/CSI-2, Rev. 0, 21 March 2022 > >>>> 3.7.4 Pixel formats > >>>> Table 14. DSI pixel packing formats > >>>> > >>>> Loosely Packed Pixel Stream, 20-bit YCbCr, 4:2:2 > >>>> Packed Pixel Stream, 24-bit YCbCr, 4:2:2 > >>>> Packed Pixel Stream, 16-bit YCbCr, 4:2:2 > >>> > >>> Look like these are unsupported in media-bus-format.h list. > >> > >> Aren't those: > >> > >> MEDIA_BUS_FMT_UYVY12_1X24 > > > > Why is UYVY12 - YCbCr, 4:2:2 is 4+2+2 = 8 then it has UYVY8 ? > > (someone please correct me if I'm totally wrong here) > > The 12 is channel width (12 bit for each Y1/Y2/U/V channel sample). > The 4:2:2 is subsampling (where are the color components sampled > relative to brightness component). > > Picture is here: > https://upload.wikimedia.org/wikipedia/commons/f/f2/Common_chroma_subsampling_ratios.svg > > Each Y square of the left is 12bit sample. > Each U+V square is 12bit sample for U and 12bit sample for V. > > In case of 4:4:4 subsampling, each luminance (brightness) component has > matching chrominance (color) components. > > In case of the 4:2:2 subsampling, two neighboring luminance components > share two chrominance components. To transfer one pixel including color > information, you have to transfer two pixels, Y0+U as 2x12bit sample in > one cycle of 24bit bus, and then Y1+V as 2x12bit sample in another cycle > of 24bit bus (2 clock cycles total, 4 samples total). From that you can > reconstruct the two top-left squares (purple pixels) in the rightmost > YUV column of 4:2:2 row. > > The entire trick is that because eye is less sensitive to color than it > is to light, you can transfer less color information and thus save > bandwidth without anyone noticing (much of it). > > >> MEDIA_BUS_FMT_UYVY8_1X16 > > > > If YCbCr is UYVY (I still don't get this notation, sorry) then Packed > > Pixel Stream, 24-bit YCbCr, 4:2:2 with 2 Pixels per packet from Table > > 14 can be > > > > MEDIA_BUS_FMT_UYVY8_2X24 > > (YCbCr 4:2:2 is UYVY8) > > > > " based on a reference example from media bus format doc > > 4.13.3.4.1.1.3. Packed YUV Formats, For instance, a format where > > pixels are encoded as 8-bit YUV values downsampled to 4:2:2 and > > transferred as 2 8-bit bus samples per pixel in the U, Y, V, Y order > > will be named MEDIA_BUS_FMT_UYVY8_2X8." > > The way I read the above is that the channel width of each channel is > 8-bit , so you start with two pixels Y0/U/Y1/V which add up to 32bit > total. That is transferred over 8-bit bus, in 4 bus cycles total. One > pixel therefore takes 2 cycles of the 8 bit bus to transfer, even if you > cannot transfer one pixel separately . > > > https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/subdev-formats.html > > > > _2X24 here 2 Pixels per packet is the exact packets to consider or we > > can consider 1 Pixel per packet also. If later is true then _1X24 from > > your notation is correct. > > Since the DSIM input bus is 32bit wide, to transfer one such 4:2:2 > pixel, you need 1 bus cycle (2x12 bits per half of two pixels). Thanks for your explanation. I need some time to understand and it looks worth waiting for others to comment on this. Meanwhile, I'm planning to send subsequent version patches with possible supported formats like, MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_RGB101010_1X30, MEDIA_BUS_FMT_RGB121212_1X36, MEDIA_BUS_FMT_RGB565_1X16, MEDIA_BUS_FMT_RGB666_1X18, MEDIA_BUS_FMT_RGB888_1X24, Let me know. Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 08/10] drm: bridge: samsung-dsim: Add input_bus_flags 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (6 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:37 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 09/10] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support Jagan Teki ` (7 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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. v7, v6: * none v5: * rebased based on updated bridge changes v4, v3, v2, 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 f714e49c1eab..f5cd80641cea 100644 --- a/drivers/gpu/drm/bridge/samsung-dsim.c +++ b/drivers/gpu/drm/bridge/samsung-dsim.c @@ -1601,6 +1601,10 @@ static const struct samsung_dsim_host_ops samsung_dsim_generic_host_ops = { .unregister_host = samsung_dsim_unregister_host, }; +static const struct drm_bridge_timings samsung_dsim_bridge_timings = { + .input_bus_flags = DRM_BUS_FLAG_DE_LOW, +}; + int samsung_dsim_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1681,6 +1685,7 @@ 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->plat_data->host_ops && dsi->plat_data->host_ops->register_host) -- 2.25.1 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH v7 08/10] drm: bridge: samsung-dsim: Add input_bus_flags 2022-10-05 15:13 ` [PATCH v7 08/10] drm: bridge: samsung-dsim: Add input_bus_flags Jagan Teki @ 2022-10-15 21:37 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:37 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: [...] > diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c > index f714e49c1eab..f5cd80641cea 100644 > --- a/drivers/gpu/drm/bridge/samsung-dsim.c > +++ b/drivers/gpu/drm/bridge/samsung-dsim.c > @@ -1601,6 +1601,10 @@ static const struct samsung_dsim_host_ops samsung_dsim_generic_host_ops = { > .unregister_host = samsung_dsim_unregister_host, > }; > > +static const struct drm_bridge_timings samsung_dsim_bridge_timings = { > + .input_bus_flags = DRM_BUS_FLAG_DE_LOW, > +}; > + > int samsung_dsim_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -1681,6 +1685,7 @@ 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; Is this really valid on Exynos too ? My impression is that the DE_LOW requirement is only needed for MX8MM/MN where the LCDIF-DSIM glue logic inverts the HS/VS/DE signals, while on all other platforms (at least MX8MP) the inversion does not take place, so DE is really active HIGH there. ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 09/10] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (7 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 08/10] drm: bridge: samsung-dsim: Add input_bus_flags Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 22:02 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 10/10] drm: bridge: samsung-dsim: Add " Jagan Teki ` (6 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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. v7, v6, v5, 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] 53+ messages in thread
* Re: [PATCH v7 09/10] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support 2022-10-05 15:13 ` [PATCH v7 09/10] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support Jagan Teki @ 2022-10-15 22:02 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-10-15 22:02 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: > Samsung MIPI DSIM bridge can also be found in i.MX8MM SoC. > > Add dt-bingings for it. > > v7, v6, v5, 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 */ This also covers Nano, can you add it into the comment ? ^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v7 10/10] drm: bridge: samsung-dsim: Add i.MX8MM support 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (8 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 09/10] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support Jagan Teki @ 2022-10-05 15:13 ` Jagan Teki 2022-10-15 21:30 ` Marek Vasut 2022-10-05 20:51 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Marek Szyprowski ` (5 subsequent siblings) 15 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-10-05 15:13 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. v7, v6: * none v3: * enable DSIM_QUIRK_FIXUP_SYNC_POL quirk v5: * [mszyprow] rebased and adjusted to the new driver initialization * drop quirk 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: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/gpu/drm/bridge/samsung-dsim.c | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge/samsung-dsim.c index f5cd80641cea..1b5ba33dc635 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, @@ -421,6 +439,23 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .reg_values = exynos5422_reg_values, }; +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, + /** + * FIXME: + * Offset value used from downstream drivers/gpu/drm/bridge/sec-dsim.c + * remove this comment if it is true else update the logic. + */ + .pll_p_offset = 14, + .reg_values = imx8mm_dsim_reg_values, +}; + static const struct samsung_dsim_driver_data * samsung_dsim_types[SAMSUNG_DSIM_TYPE_COUNT] = { [SAMSUNG_DSIM_TYPE_EXYNOS3250] = &exynos3_dsi_driver_data, @@ -428,6 +463,7 @@ samsung_dsim_types[SAMSUNG_DSIM_TYPE_COUNT] = { [SAMSUNG_DSIM_TYPE_EXYNOS5410] = &exynos5_dsi_driver_data, [SAMSUNG_DSIM_TYPE_EXYNOS5422] = &exynos5422_dsi_driver_data, [SAMSUNG_DSIM_TYPE_EXYNOS5433] = &exynos5433_dsi_driver_data, + [SAMSUNG_DSIM_TYPE_IMX8MM] = &imx8mm_dsi_driver_data, }; static inline struct samsung_dsim *host_to_dsi(struct mipi_dsi_host *h) @@ -1788,7 +1824,16 @@ const struct dev_pm_ops samsung_dsim_pm_ops = { }; EXPORT_SYMBOL_GPL(samsung_dsim_pm_ops); +static const struct samsung_dsim_plat_data samsung_dsim_imx8mm_pdata = { + .hw_type = SAMSUNG_DSIM_TYPE_IMX8MM, + .host_ops = &samsung_dsim_generic_host_ops, +}; + static const struct of_device_id samsung_dsim_of_match[] = { + { + .compatible = "fsl,imx8mm-mipi-dsim", + .data = &samsung_dsim_imx8mm_pdata, + }, { /* sentinel. */ } }; MODULE_DEVICE_TABLE(of, samsung_dsim_of_match); -- 2.25.1 ^ permalink raw reply related [flat|nested] 53+ messages in thread
* Re: [PATCH v7 10/10] drm: bridge: samsung-dsim: Add i.MX8MM support 2022-10-05 15:13 ` [PATCH v7 10/10] drm: bridge: samsung-dsim: Add " Jagan Teki @ 2022-10-15 21:30 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-10-15 21:30 UTC (permalink / raw) To: Jagan Teki, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 10/5/22 17:13, Jagan Teki wrote: [...] > +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, > + /** Should this really be kerneldoc style /** comment or plain /* comment ? If the later, please fix globally, there are multiple such FIXME comments. > + * FIXME: > + * Offset value used from downstream drivers/gpu/drm/bridge/sec-dsim.c > + * remove this comment if it is true else update the logic. > + */ > + .pll_p_offset = 14, > + .reg_values = imx8mm_dsim_reg_values, > +}; [...] ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (9 preceding siblings ...) 2022-10-05 15:13 ` [PATCH v7 10/10] drm: bridge: samsung-dsim: Add " Jagan Teki @ 2022-10-05 20:51 ` Marek Szyprowski 2022-10-06 14:21 ` Jagan Teki 2022-10-06 15:26 ` Tim Harvey 2022-10-19 10:16 ` Marcel Ziswiler ` (4 subsequent siblings) 15 siblings, 2 replies; 53+ messages in thread From: Marek Szyprowski @ 2022-10-05 20:51 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 Jagan, On 05.10.2022 17:12, Jagan Teki wrote: > This series supports common bridge support for Samsung MIPI DSIM > which is used in Exynos and i.MX8MM SoC's. > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > Changes for v7: > * fix the drm bridge attach chain for exynos drm dsi driver > * fix the hw_type checking logic > > Changes for v6: > * handle previous bridge for exynos dsi while attaching bridge > > Changes for v5: > * bridge changes to support multi-arch > * updated and clear commit messages > * add hw_type via plat data > * removed unneeded quirk > * rebased on linux-next > > Changes for v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > * update init handling to ensure host init done on first cmd transfer > > 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: Samsung DSIM bridge > > Patch 0002: PHY optional > > Patch 0003: OF-graph or Child node lookup > > Patch 0004: DSI host initialization > > Patch 0005: atomic check > > Patch 0006: PMS_P offset via plat data > > Patch 0007: atomic_get_input_bus_fmts > > Patch 0008: input_bus_flags > > Patch 0009: document fsl,imx8mm-mipi-dsim > > Patch 0010: add i.MX8MM DSIM support > > Tested in Engicam i.Core MX8M Mini SoM. This finally doesn't break Exynos DSI. :) Feel free to add: Acked-by: Marek Szyprowski Tested-by: Marek Szyprowski The next step would be to merge Dave's patchset and remove the hacks added here and there. Otherwise we will end up adding even more hacks soon. > Repo: > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > Any inputs? > Jagan. > > Jagan Teki (10): > drm: bridge: Add Samsung DSIM bridge driver > drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices > drm: bridge: samsung-dsim: Mark PHY as optional > drm: bridge: samsung-dsim: Handle proper DSI host initialization > drm: bridge: samsung-dsim: Add atomic_check > drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset > 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 > > .../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 | 1856 +++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- > include/drm/bridge/samsung-dsim.h | 115 + > 8 files changed, 2108 insertions(+), 1653 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] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 20:51 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Marek Szyprowski @ 2022-10-06 14:21 ` Jagan Teki 2022-10-06 15:26 ` Tim Harvey 1 sibling, 0 replies; 53+ messages in thread From: Jagan Teki @ 2022-10-06 14:21 UTC (permalink / raw) To: Marek Szyprowski Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, 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 Marek, On Thu, Oct 6, 2022 at 2:21 AM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 05.10.2022 17:12, Jagan Teki wrote: > > This series supports common bridge support for Samsung MIPI DSIM > > which is used in Exynos and i.MX8MM SoC's. > > > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > > > Changes for v7: > > * fix the drm bridge attach chain for exynos drm dsi driver > > * fix the hw_type checking logic > > > > Changes for v6: > > * handle previous bridge for exynos dsi while attaching bridge > > > > Changes for v5: > > * bridge changes to support multi-arch > > * updated and clear commit messages > > * add hw_type via plat data > > * removed unneeded quirk > > * rebased on linux-next > > > > Changes for v4: > > * include Inki Dae in MAINTAINERS > > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > * update init handling to ensure host init done on first cmd transfer > > > > 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: Samsung DSIM bridge > > > > Patch 0002: PHY optional > > > > Patch 0003: OF-graph or Child node lookup > > > > Patch 0004: DSI host initialization > > > > Patch 0005: atomic check > > > > Patch 0006: PMS_P offset via plat data > > > > Patch 0007: atomic_get_input_bus_fmts > > > > Patch 0008: input_bus_flags > > > > Patch 0009: document fsl,imx8mm-mipi-dsim > > > > Patch 0010: add i.MX8MM DSIM support > > > > Tested in Engicam i.Core MX8M Mini SoM. > > This finally doesn't break Exynos DSI. :) Feel free to add: > > Acked-by: Marek Szyprowski > > Tested-by: Marek Szyprowski > > The next step would be to merge Dave's patchset and remove the hacks > added here and there. Otherwise we will end up adding even more hacks soon. I've some concerns about one of those patches, I will try to comment on that patch in mailing list or will send updated changes on top of those. Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 20:51 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Marek Szyprowski 2022-10-06 14:21 ` Jagan Teki @ 2022-10-06 15:26 ` Tim Harvey 1 sibling, 0 replies; 53+ messages in thread From: Tim Harvey @ 2022-10-06 15:26 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Tommaso Merciai, linux-amarula, Matteo Lisi, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Robert Foss, Andrzej Hajda, Marek Szyprowski, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Laurent Pinchart On Wed, Oct 5, 2022 at 1:51 PM Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > Hi Jagan, > > On 05.10.2022 17:12, Jagan Teki wrote: > > This series supports common bridge support for Samsung MIPI DSIM > > which is used in Exynos and i.MX8MM SoC's. > > > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > > > Changes for v7: > > * fix the drm bridge attach chain for exynos drm dsi driver > > * fix the hw_type checking logic > > > > Changes for v6: > > * handle previous bridge for exynos dsi while attaching bridge > > > > Changes for v5: > > * bridge changes to support multi-arch > > * updated and clear commit messages > > * add hw_type via plat data > > * removed unneeded quirk > > * rebased on linux-next > > > > Changes for v4: > > * include Inki Dae in MAINTAINERS > > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > > * update init handling to ensure host init done on first cmd transfer > > > > 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: Samsung DSIM bridge > > > > Patch 0002: PHY optional > > > > Patch 0003: OF-graph or Child node lookup > > > > Patch 0004: DSI host initialization > > > > Patch 0005: atomic check > > > > Patch 0006: PMS_P offset via plat data > > > > Patch 0007: atomic_get_input_bus_fmts > > > > Patch 0008: input_bus_flags > > > > Patch 0009: document fsl,imx8mm-mipi-dsim > > > > Patch 0010: add i.MX8MM DSIM support > > > > Tested in Engicam i.Core MX8M Mini SoM. > > This finally doesn't break Exynos DSI. :) Feel free to add: > > Acked-by: Marek Szyprowski > > Tested-by: Marek Szyprowski > > The next step would be to merge Dave's patchset and remove the hacks > added here and there. Otherwise we will end up adding even more hacks soon. Jagan, I've also tested this latest series with a Gateworks imx8mm-venice-gw73xx-0x with a RaspberryPi MIPI DSI compatible DFR0550 display with the following dt overlay: /dts-v1/; /plugin/; &{/} { compatible = "gw,imx8mm-gw73xx-0x", "fsl,imx8mm"; panel { compatible = "powertip,ph800480t013-idf02"; power-supply = <&attiny>; backlight = <&attiny>; port { panel_out_bridge: endpoint { remote-endpoint = <&bridge_out_panel>; }; }; }; }; &i2c3 { #address-cells = <1>; #size-cells = <0>; attiny: regulator@45 { compatible = "raspberrypi,7inch-touchscreen-panel-regulator"; reg = <0x45>; }; }; &dsi { #address-cells = <1>; #size-cells = <0>; status = "okay"; bridge@0 { compatible = "toshiba,tc358762"; reg = <0>; vddc-supply = <&attiny>; status = "okay"; ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; bridge_in_dsi: endpoint { remote-endpoint = <&dsi_out_bridge>; }; }; port@1 { reg = <1>; bridge_out_panel: endpoint { remote-endpoint = <&panel_out_bridge>; }; }; }; }; ports { #address-cells = <1>; #size-cells = <0>; port@1 { reg = <1>; dsi_out_bridge: endpoint { remote-endpoint = <&bridge_in_dsi>; }; }; }; }; &lcdif { status = "okay"; }; Tested-by: Tim Harvey <tharvey@gateworks.com> # imx8mm-venice-gw73xx-0x Thanks for all your work on this! Best Regards, Tim > > > Repo: > > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > > > Any inputs? > > Jagan. > > > > Jagan Teki (10): > > drm: bridge: Add Samsung DSIM bridge driver > > drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices > > drm: bridge: samsung-dsim: Mark PHY as optional > > drm: bridge: samsung-dsim: Handle proper DSI host initialization > > drm: bridge: samsung-dsim: Add atomic_check > > drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset > > 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 > > > > .../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 | 1856 +++++++++++++++++ > > drivers/gpu/drm/exynos/Kconfig | 1 + > > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- > > include/drm/bridge/samsung-dsim.h | 115 + > > 8 files changed, 2108 insertions(+), 1653 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] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (10 preceding siblings ...) 2022-10-05 20:51 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Marek Szyprowski @ 2022-10-19 10:16 ` Marcel Ziswiler 2022-10-20 9:20 ` Robert Foss ` (3 subsequent siblings) 15 siblings, 0 replies; 53+ messages in thread From: Marcel Ziswiler @ 2022-10-19 10:16 UTC (permalink / raw) To: chen.fang, jagan, jy0922.shim, michael, inki.dae, Laurent.pinchart, kyungmin.park, marex, tharvey, andrzej.hajda, aford173, sw0312.kim, m.szyprowski, tommaso.merciai, robert.foss, frieder.schrempf, narmstrong Cc: linux-samsung-soc, matteo.lisi, dri-devel, linux-imx, linux-amarula, linux-arm-kernel Hi Jagan On Wed, 2022-10-05 at 20:42 +0530, Jagan Teki wrote: > This series supports common bridge support for Samsung MIPI DSIM > which is used in Exynos and i.MX8MM SoC's. > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > Changes for v7: > * fix the drm bridge attach chain for exynos drm dsi driver > * fix the hw_type checking logic > > Changes for v6: > * handle previous bridge for exynos dsi while attaching bridge > > Changes for v5: > * bridge changes to support multi-arch > * updated and clear commit messages > * add hw_type via plat data > * removed unneeded quirk > * rebased on linux-next > > Changes for v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > * update init handling to ensure host init done on first cmd transfer > > 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: Samsung DSIM bridge > > Patch 0002: PHY optional > > Patch 0003: OF-graph or Child node lookup > > Patch 0004: DSI host initialization > > Patch 0005: atomic check > > Patch 0006: PMS_P offset via plat data > > Patch 0007: atomic_get_input_bus_fmts > > Patch 0008: input_bus_flags > > Patch 0009: document fsl,imx8mm-mipi-dsim > > Patch 0010: add i.MX8MM DSIM support > > Tested in Engicam i.Core MX8M Mini SoM. Thanks for this work! This also works great on Verdin iMX8M Mini together with the SN65DSI84-based Verdin DSI to LVDS Adapter. Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Repo: > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > Any inputs? > Jagan. > > Jagan Teki (10): > drm: bridge: Add Samsung DSIM bridge driver > drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices > drm: bridge: samsung-dsim: Mark PHY as optional > drm: bridge: samsung-dsim: Handle proper DSI host initialization > drm: bridge: samsung-dsim: Add atomic_check > drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset > 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 > > .../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 | 1856 +++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- > include/drm/bridge/samsung-dsim.h | 115 + > 8 files changed, 2108 insertions(+), 1653 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h Cheers Marcel ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (11 preceding siblings ...) 2022-10-19 10:16 ` Marcel Ziswiler @ 2022-10-20 9:20 ` Robert Foss 2022-10-24 8:44 ` Alexander Stein ` (2 subsequent siblings) 15 siblings, 0 replies; 53+ messages in thread From: Robert Foss @ 2022-10-20 9:20 UTC (permalink / raw) To: Jagan Teki Cc: Marek Vasut, linux-samsung-soc, Joonyoung Shim, dri-devel, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Laurent Pinchart, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski Hey Jagan, On Wed, 5 Oct 2022 at 17:13, Jagan Teki <jagan@amarulasolutions.com> wrote: > > This series supports common bridge support for Samsung MIPI DSIM > which is used in Exynos and i.MX8MM SoC's. > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > Changes for v7: > * fix the drm bridge attach chain for exynos drm dsi driver > * fix the hw_type checking logic > > Changes for v6: > * handle previous bridge for exynos dsi while attaching bridge > > Changes for v5: > * bridge changes to support multi-arch > * updated and clear commit messages > * add hw_type via plat data > * removed unneeded quirk > * rebased on linux-next > > Changes for v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > * update init handling to ensure host init done on first cmd transfer > > 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: Samsung DSIM bridge > > Patch 0002: PHY optional > > Patch 0003: OF-graph or Child node lookup > > Patch 0004: DSI host initialization > > Patch 0005: atomic check > > Patch 0006: PMS_P offset via plat data > > Patch 0007: atomic_get_input_bus_fmts > > Patch 0008: input_bus_flags > > Patch 0009: document fsl,imx8mm-mipi-dsim > > Patch 0010: add i.MX8MM DSIM support > > Tested in Engicam i.Core MX8M Mini SoM. > > Repo: > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > Any inputs? > Jagan. > > Jagan Teki (10): > drm: bridge: Add Samsung DSIM bridge driver > drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices > drm: bridge: samsung-dsim: Mark PHY as optional > drm: bridge: samsung-dsim: Handle proper DSI host initialization > drm: bridge: samsung-dsim: Add atomic_check > drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset > 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 > > .../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 | 1856 +++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- > include/drm/bridge/samsung-dsim.h | 115 + > 8 files changed, 2108 insertions(+), 1653 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h I'm seeing some checkpatch --strict warnings throughout this series, do you mind having a look at them? ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (12 preceding siblings ...) 2022-10-20 9:20 ` Robert Foss @ 2022-10-24 8:44 ` Alexander Stein 2022-10-28 14:37 ` Sébastien Szymanski 2022-11-07 16:34 ` Frieder Schrempf 15 siblings, 0 replies; 53+ messages in thread From: Alexander Stein @ 2022-10-24 8:44 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, Laurent Pinchart, Andrzej Hajda, Fancy Fang, Marek Szyprowski, Marek Vasut, linux-samsung-soc, Joonyoung Shim, Neil Armstrong, Frieder Schrempf, Tommaso Merciai, NXP Linux Team, Michael Nazzareno Trimarchi, Jagan Teki, Matteo Lisi, Adam Ford, linux-arm-kernel, Seung-Woo Kim, Robert Foss, Kyungmin Park, linux-amarula Hi Jagan, Am Mittwoch, 5. Oktober 2022, 17:12:59 CEST schrieb Jagan Teki: > This series supports common bridge support for Samsung MIPI DSIM > which is used in Exynos and i.MX8MM SoC's. > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > Changes for v7: > * fix the drm bridge attach chain for exynos drm dsi driver > * fix the hw_type checking logic > > Changes for v6: > * handle previous bridge for exynos dsi while attaching bridge > > Changes for v5: > * bridge changes to support multi-arch > * updated and clear commit messages > * add hw_type via plat data > * removed unneeded quirk > * rebased on linux-next > > Changes for v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > * update init handling to ensure host init done on first cmd transfer > > 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: Samsung DSIM bridge > > Patch 0002: PHY optional > > Patch 0003: OF-graph or Child node lookup > > Patch 0004: DSI host initialization > > Patch 0005: atomic check > > Patch 0006: PMS_P offset via plat data > > Patch 0007: atomic_get_input_bus_fmts > > Patch 0008: input_bus_flags > > Patch 0009: document fsl,imx8mm-mipi-dsim > > Patch 0010: add i.MX8MM DSIM support > > Tested in Engicam i.Core MX8M Mini SoM. Thanks for working on this! This works on TQMa8MQML + MBa8Mx (imx8mm) using a SN65DSI83 DSI-LVDS-Bridge. Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> Best regards, Alexander > Repo: > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > Any inputs? > Jagan. > > Jagan Teki (10): > drm: bridge: Add Samsung DSIM bridge driver > drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices > drm: bridge: samsung-dsim: Mark PHY as optional > drm: bridge: samsung-dsim: Handle proper DSI host initialization > drm: bridge: samsung-dsim: Add atomic_check > drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset > 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 > > .../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 | 1856 +++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- > include/drm/bridge/samsung-dsim.h | 115 + > 8 files changed, 2108 insertions(+), 1653 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (13 preceding siblings ...) 2022-10-24 8:44 ` Alexander Stein @ 2022-10-28 14:37 ` Sébastien Szymanski 2022-11-07 16:34 ` Frieder Schrempf 15 siblings, 0 replies; 53+ messages in thread From: Sébastien Szymanski @ 2022-10-28 14:37 UTC (permalink / raw) To: Jagan Teki, 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 Hello Jagan, On 10/5/22 17:12, Jagan Teki wrote: > This series supports common bridge support for Samsung MIPI DSIM > which is used in Exynos and i.MX8MM SoC's. > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > Changes for v7: > * fix the drm bridge attach chain for exynos drm dsi driver > * fix the hw_type checking logic > > Changes for v6: > * handle previous bridge for exynos dsi while attaching bridge > > Changes for v5: > * bridge changes to support multi-arch > * updated and clear commit messages > * add hw_type via plat data > * removed unneeded quirk > * rebased on linux-next > > Changes for v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > * update init handling to ensure host init done on first cmd transfer > > 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: Samsung DSIM bridge > > Patch 0002: PHY optional > > Patch 0003: OF-graph or Child node lookup > > Patch 0004: DSI host initialization > > Patch 0005: atomic check > > Patch 0006: PMS_P offset via plat data > > Patch 0007: atomic_get_input_bus_fmts > > Patch 0008: input_bus_flags > > Patch 0009: document fsl,imx8mm-mipi-dsim > > Patch 0010: add i.MX8MM DSIM support > > Tested in Engicam i.Core MX8M Mini SoM. > > Repo: > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > Any inputs? I tried this series on Armadeus OPOS8MM Dev (i.MX8MM) board with the PowerTrip PH720128T004-ZBC02 DSI panel (720x1280, 2 lanes). It works after I fixed the logic of some video mode flags: in function samsung_dsim_init_link(struct samsung_dsim *dsi): -if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HFP)) +if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HFP) reg |= DSIM_HFP_MODE; The bit has to be set to disable HFP. Same logic for HPB, HSA and EOT packets. Regards, > Jagan. > > Jagan Teki (10): > drm: bridge: Add Samsung DSIM bridge driver > drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices > drm: bridge: samsung-dsim: Mark PHY as optional > drm: bridge: samsung-dsim: Handle proper DSI host initialization > drm: bridge: samsung-dsim: Add atomic_check > drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset > 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 > > .../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 | 1856 +++++++++++++++++ > drivers/gpu/drm/exynos/Kconfig | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1766 +--------------- > include/drm/bridge/samsung-dsim.h | 115 + > 8 files changed, 2108 insertions(+), 1653 deletions(-) > create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c > create mode 100644 include/drm/bridge/samsung-dsim.h > -- Sébastien Szymanski, Armadeus Systems Software engineer ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki ` (14 preceding siblings ...) 2022-10-28 14:37 ` Sébastien Szymanski @ 2022-11-07 16:34 ` Frieder Schrempf 2022-11-10 15:54 ` Fabio Estevam 15 siblings, 1 reply; 53+ messages in thread From: Frieder Schrempf @ 2022-11-07 16:34 UTC (permalink / raw) To: Jagan Teki, Andrzej Hajda, Inki Dae, Marek Szyprowski, 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 Cc: linux-samsung-soc, Matteo Lisi, dri-devel, NXP Linux Team, linux-amarula, linux-arm-kernel On 05.10.22 17:12, Jagan Teki wrote: > This series supports common bridge support for Samsung MIPI DSIM > which is used in Exynos and i.MX8MM SoC's. > > The final bridge supports both the Exynos and i.MX8MM DSI devices. > > Changes for v7: > * fix the drm bridge attach chain for exynos drm dsi driver > * fix the hw_type checking logic > > Changes for v6: > * handle previous bridge for exynos dsi while attaching bridge > > Changes for v5: > * bridge changes to support multi-arch > * updated and clear commit messages > * add hw_type via plat data > * removed unneeded quirk > * rebased on linux-next > > Changes for v4: > * include Inki Dae in MAINTAINERS > * remove dsi_driver probe in exynos_drm_drv to support multi-arch build > * update init handling to ensure host init done on first cmd transfer > > 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: Samsung DSIM bridge > > Patch 0002: PHY optional > > Patch 0003: OF-graph or Child node lookup > > Patch 0004: DSI host initialization > > Patch 0005: atomic check > > Patch 0006: PMS_P offset via plat data > > Patch 0007: atomic_get_input_bus_fmts > > Patch 0008: input_bus_flags > > Patch 0009: document fsl,imx8mm-mipi-dsim > > Patch 0010: add i.MX8MM DSIM support > > Tested in Engicam i.Core MX8M Mini SoM. > > Repo: > https://gitlab.com/openedev/kernel/-/commits/imx8mm-dsi-v7 > > Any inputs? > Jagan. I tested this on the Kontron DL i.MX8MM which uses a TI SN65DSI84 bridge and a Jenson 7" LVDS Display. Thanks for your work, Jagan! Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de> # Kontron DL i.MX8MM ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-11-07 16:34 ` Frieder Schrempf @ 2022-11-10 15:54 ` Fabio Estevam 2022-11-10 16:03 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Fabio Estevam @ 2022-11-10 15:54 UTC (permalink / raw) To: Frieder Schrempf Cc: dri-devel, Laurent Pinchart, Andrzej Hajda, Fancy Fang, Marek Szyprowski, Marek Vasut, linux-samsung-soc, Joonyoung Shim, Neil Armstrong, Tommaso Merciai, Jagan Teki, Michael Nazzareno Trimarchi, NXP Linux Team, Matteo Lisi, Adam Ford, linux-arm-kernel, Seung-Woo Kim, Robert Foss, Kyungmin Park, linux-amarula Hi, On Mon, Nov 7, 2022 at 1:34 PM Frieder Schrempf <frieder.schrempf@kontron.de> wrote: > I tested this on the Kontron DL i.MX8MM which uses a TI SN65DSI84 bridge > and a Jenson 7" LVDS Display. > > Thanks for your work, Jagan! > > Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de> # Kontron DL > i.MX8MM As this series has been successfully tested on multiple devices, is it possible to apply it so people can make further adjustments? Thanks ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-11-10 15:54 ` Fabio Estevam @ 2022-11-10 16:03 ` Jagan Teki 2022-11-10 16:59 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-11-10 16:03 UTC (permalink / raw) To: Fabio Estevam Cc: dri-devel, Laurent Pinchart, Andrzej Hajda, Fancy Fang, Marek Szyprowski, Marek Vasut, linux-samsung-soc, Joonyoung Shim, Neil Armstrong, Frieder Schrempf, Tommaso Merciai, NXP Linux Team, Michael Nazzareno Trimarchi, Matteo Lisi, Adam Ford, linux-arm-kernel, Seung-Woo Kim, Robert Foss, Kyungmin Park, linux-amarula On Thu, Nov 10, 2022 at 9:24 PM Fabio Estevam <festevam@gmail.com> wrote: > > Hi, > > On Mon, Nov 7, 2022 at 1:34 PM Frieder Schrempf > <frieder.schrempf@kontron.de> wrote: > > > I tested this on the Kontron DL i.MX8MM which uses a TI SN65DSI84 bridge > > and a Jenson 7" LVDS Display. > > > > Thanks for your work, Jagan! > > > > Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de> # Kontron DL > > i.MX8MM > > As this series has been successfully tested on multiple devices, is it possible > to apply it so people can make further adjustments? I think the next version patchset on this would be clean and properly address a few comments from Marek Vasut. However, I'm still waiting for Marek's response to my comment on the input bus formats - if it is Okay I will send the v8. https://lore.kernel.org/all/CAMty3ZAM+fetmBQWaSbfjME7-Up4h+Ln3BRHaPgg5tuSsObPdw@mail.gmail.com/ Thanks, Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-11-10 16:03 ` Jagan Teki @ 2022-11-10 16:59 ` Marek Vasut 2022-11-10 17:37 ` Jagan Teki 0 siblings, 1 reply; 53+ messages in thread From: Marek Vasut @ 2022-11-10 16:59 UTC (permalink / raw) To: Jagan Teki, Fabio Estevam Cc: dri-devel, linux-samsung-soc, Laurent Pinchart, Joonyoung Shim, Tommaso Merciai, linux-amarula, Seung-Woo Kim, Neil Armstrong, Frieder Schrempf, Kyungmin Park, Matteo Lisi, Robert Foss, Andrzej Hajda, NXP Linux Team, Fancy Fang, Michael Nazzareno Trimarchi, Adam Ford, linux-arm-kernel, Marek Szyprowski On 11/10/22 17:03, Jagan Teki wrote: > On Thu, Nov 10, 2022 at 9:24 PM Fabio Estevam <festevam@gmail.com> wrote: >> >> Hi, >> >> On Mon, Nov 7, 2022 at 1:34 PM Frieder Schrempf >> <frieder.schrempf@kontron.de> wrote: >> >>> I tested this on the Kontron DL i.MX8MM which uses a TI SN65DSI84 bridge >>> and a Jenson 7" LVDS Display. >>> >>> Thanks for your work, Jagan! >>> >>> Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de> # Kontron DL >>> i.MX8MM >> >> As this series has been successfully tested on multiple devices, is it possible >> to apply it so people can make further adjustments? > > I think the next version patchset on this would be clean and properly > address a few comments from Marek Vasut. However, I'm still waiting > for Marek's response to my comment on the input bus formats - if it is > Okay I will send the v8. > https://lore.kernel.org/all/CAMty3ZAM+fetmBQWaSbfjME7-Up4h+Ln3BRHaPgg5tuSsObPdw@mail.gmail.com/ Just send a V8 and let's see how that looks, no need to wait for me. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-11-10 16:59 ` Marek Vasut @ 2022-11-10 17:37 ` Jagan Teki 2022-11-10 17:41 ` Marek Vasut 0 siblings, 1 reply; 53+ messages in thread From: Jagan Teki @ 2022-11-10 17:37 UTC (permalink / raw) To: Marek Vasut Cc: dri-devel, Laurent Pinchart, Andrzej Hajda, Fancy Fang, Marek Szyprowski, linux-samsung-soc, Joonyoung Shim, Neil Armstrong, Frieder Schrempf, Tommaso Merciai, NXP Linux Team, Michael Nazzareno Trimarchi, Matteo Lisi, Adam Ford, linux-arm-kernel, Seung-Woo Kim, Robert Foss, Kyungmin Park, linux-amarula On Thu, Nov 10, 2022 at 10:29 PM Marek Vasut <marex@denx.de> wrote: > > On 11/10/22 17:03, Jagan Teki wrote: > > On Thu, Nov 10, 2022 at 9:24 PM Fabio Estevam <festevam@gmail.com> wrote: > >> > >> Hi, > >> > >> On Mon, Nov 7, 2022 at 1:34 PM Frieder Schrempf > >> <frieder.schrempf@kontron.de> wrote: > >> > >>> I tested this on the Kontron DL i.MX8MM which uses a TI SN65DSI84 bridge > >>> and a Jenson 7" LVDS Display. > >>> > >>> Thanks for your work, Jagan! > >>> > >>> Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de> # Kontron DL > >>> i.MX8MM > >> > >> As this series has been successfully tested on multiple devices, is it possible > >> to apply it so people can make further adjustments? > > > > I think the next version patchset on this would be clean and properly > > address a few comments from Marek Vasut. However, I'm still waiting > > for Marek's response to my comment on the input bus formats - if it is > > Okay I will send the v8. > > https://lore.kernel.org/all/CAMty3ZAM+fetmBQWaSbfjME7-Up4h+Ln3BRHaPgg5tuSsObPdw@mail.gmail.com/ > > Just send a V8 and let's see how that looks, no need to wait for me. Planning to include your 8M Plus patch as part of the v8, hope it's fine? Jagan. ^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge 2022-11-10 17:37 ` Jagan Teki @ 2022-11-10 17:41 ` Marek Vasut 0 siblings, 0 replies; 53+ messages in thread From: Marek Vasut @ 2022-11-10 17:41 UTC (permalink / raw) To: Jagan Teki Cc: dri-devel, Laurent Pinchart, Andrzej Hajda, Fancy Fang, Marek Szyprowski, linux-samsung-soc, Joonyoung Shim, Neil Armstrong, Frieder Schrempf, Tommaso Merciai, NXP Linux Team, Michael Nazzareno Trimarchi, Matteo Lisi, Adam Ford, linux-arm-kernel, Seung-Woo Kim, Robert Foss, Kyungmin Park, linux-amarula On 11/10/22 18:37, Jagan Teki wrote: > On Thu, Nov 10, 2022 at 10:29 PM Marek Vasut <marex@denx.de> wrote: >> >> On 11/10/22 17:03, Jagan Teki wrote: >>> On Thu, Nov 10, 2022 at 9:24 PM Fabio Estevam <festevam@gmail.com> wrote: >>>> >>>> Hi, >>>> >>>> On Mon, Nov 7, 2022 at 1:34 PM Frieder Schrempf >>>> <frieder.schrempf@kontron.de> wrote: >>>> >>>>> I tested this on the Kontron DL i.MX8MM which uses a TI SN65DSI84 bridge >>>>> and a Jenson 7" LVDS Display. >>>>> >>>>> Thanks for your work, Jagan! >>>>> >>>>> Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de> # Kontron DL >>>>> i.MX8MM >>>> >>>> As this series has been successfully tested on multiple devices, is it possible >>>> to apply it so people can make further adjustments? >>> >>> I think the next version patchset on this would be clean and properly >>> address a few comments from Marek Vasut. However, I'm still waiting >>> for Marek's response to my comment on the input bus formats - if it is >>> Okay I will send the v8. >>> https://lore.kernel.org/all/CAMty3ZAM+fetmBQWaSbfjME7-Up4h+Ln3BRHaPgg5tuSsObPdw@mail.gmail.com/ >> >> Just send a V8 and let's see how that looks, no need to wait for me. > > Planning to include your 8M Plus patch as part of the v8, hope it's fine? Fine ^ permalink raw reply [flat|nested] 53+ messages in thread
end of thread, other threads:[~2022-11-10 17:41 UTC | newest] Thread overview: 53+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <CGME20221005151323eucas1p2c69fc9989b84a9d74d568469ccd81f35@eucas1p2.samsung.com> 2022-10-05 15:12 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Jagan Teki 2022-10-05 15:13 ` [PATCH v7 01/10] drm: bridge: Add Samsung DSIM bridge driver Jagan Teki 2022-10-15 21:46 ` Marek Vasut 2022-10-17 2:49 ` Jagan Teki 2022-10-17 7:19 ` Marek Vasut 2022-10-17 7:43 ` Jagan Teki 2022-10-17 8:48 ` Marek Vasut 2022-10-17 9:01 ` Marek Szyprowski 2022-10-18 3:05 ` Jagan Teki 2022-10-28 12:12 ` Jagan Teki 2022-10-05 15:13 ` [PATCH v7 02/10] drm: bridge: samsung-dsim: Lookup OF-graph or Child node devices Jagan Teki 2022-10-15 21:48 ` Marek Vasut 2022-10-17 2:52 ` Jagan Teki 2022-10-05 15:13 ` [PATCH v7 03/10] drm: bridge: samsung-dsim: Mark PHY as optional Jagan Teki 2022-10-15 21:50 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 04/10] drm: bridge: samsung-dsim: Handle proper DSI host initialization Jagan Teki 2022-10-05 15:13 ` [PATCH v7 05/10] drm: bridge: samsung-dsim: Add atomic_check Jagan Teki 2022-10-15 21:23 ` Marek Vasut 2022-10-17 3:54 ` Jagan Teki 2022-10-17 7:23 ` Marek Vasut 2022-10-17 7:51 ` Jagan Teki 2022-10-05 15:13 ` [PATCH v7 06/10] drm: bridge: samsung-dsim: Add platform PLL_P (PMS_P) offset Jagan Teki 2022-10-15 21:56 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 07/10] drm: bridge: samsung-dsim: Add atomic_get_input_bus_fmts Jagan Teki 2022-10-15 22:01 ` Marek Vasut 2022-10-17 3:58 ` Jagan Teki 2022-10-17 7:24 ` Marek Vasut 2022-11-03 7:40 ` Jagan Teki 2022-11-03 16:03 ` Marek Vasut 2022-11-03 9:39 ` Jagan Teki 2022-11-03 16:02 ` Marek Vasut 2022-11-03 17:27 ` Jagan Teki 2022-11-03 18:58 ` Marek Vasut 2022-11-07 17:00 ` Jagan Teki 2022-10-05 15:13 ` [PATCH v7 08/10] drm: bridge: samsung-dsim: Add input_bus_flags Jagan Teki 2022-10-15 21:37 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 09/10] dt-bindings: display: exynos: dsim: Add NXP i.MX8MM support Jagan Teki 2022-10-15 22:02 ` Marek Vasut 2022-10-05 15:13 ` [PATCH v7 10/10] drm: bridge: samsung-dsim: Add " Jagan Teki 2022-10-15 21:30 ` Marek Vasut 2022-10-05 20:51 ` [PATCH v7 00/10] drm: bridge: Add Samsung MIPI DSIM bridge Marek Szyprowski 2022-10-06 14:21 ` Jagan Teki 2022-10-06 15:26 ` Tim Harvey 2022-10-19 10:16 ` Marcel Ziswiler 2022-10-20 9:20 ` Robert Foss 2022-10-24 8:44 ` Alexander Stein 2022-10-28 14:37 ` Sébastien Szymanski 2022-11-07 16:34 ` Frieder Schrempf 2022-11-10 15:54 ` Fabio Estevam 2022-11-10 16:03 ` Jagan Teki 2022-11-10 16:59 ` Marek Vasut 2022-11-10 17:37 ` Jagan Teki 2022-11-10 17:41 ` Marek Vasut
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).