| Message ID | 20241125093316.2357162-10-victor.liu@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add Freescale i.MX8qxp Display Controller support | expand |
Hi, On 2024/11/25 17:33, Liu Ying wrote: > i.MX8qxp Display Controller display engine consists of all processing > units that operate in a display clock domain. Add minimal feature > support with FrameGen and TCon so that the engine can output display > timings. The Frame Generator is used to generate video timings and constant video color images, traditionally this is sub-module of CRTC. CRTC itself is a minimal HW unit, shouldn't be divided further. IP blocks resides in the one display pipe ares ready to be drive once display subsystems of i.MX8qxp is identified. We won't suffer from the defer probe problems here. So, please consider to *squash* those three drivers into one, the split would cause too much fragmentation which will become constraints for you introduce support for variants. > The display engine driver as a master binds FrameGen and > TCon drivers as components. While at it, the display engine driver > is a component to be bound with the upcoming DRM driver. > > Signed-off-by: Liu Ying <victor.liu@nxp.com> > --- > v4: > * Use regmap to define register map for all registers. (Dmitry) > * Use regmap APIs to access registers. (Dmitry) > * Inline some small functions. (Dmitry) > * Move dc_fg_displaymode() and dc_fg_panic_displaymode() function calls from > KMS routine to initialization stage. (Dmitry) > * Use devm_kzalloc() to drmm_kzalloc() to allocate dc_* data strutures. > * Drop unnecessary private struct dc_*_priv. > * Set suppress_bind_attrs driver flag to true to avoid unnecessary sys > interfaces to bind/unbind the drivers. > > v3: > * No change. > > v2: > * Use OF alias id to get instance id. > * Add dev member to struct dc_tc. > > drivers/gpu/drm/imx/Kconfig | 1 + > drivers/gpu/drm/imx/Makefile | 1 + > drivers/gpu/drm/imx/dc/Kconfig | 5 + > drivers/gpu/drm/imx/dc/Makefile | 5 + > drivers/gpu/drm/imx/dc/dc-de.c | 153 +++++++++++++ > drivers/gpu/drm/imx/dc/dc-de.h | 57 +++++ > drivers/gpu/drm/imx/dc/dc-drv.c | 32 +++ > drivers/gpu/drm/imx/dc/dc-drv.h | 24 ++ > drivers/gpu/drm/imx/dc/dc-fg.c | 374 ++++++++++++++++++++++++++++++++ > drivers/gpu/drm/imx/dc/dc-tc.c | 138 ++++++++++++ > 10 files changed, 790 insertions(+) > create mode 100644 drivers/gpu/drm/imx/dc/Kconfig > create mode 100644 drivers/gpu/drm/imx/dc/Makefile > create mode 100644 drivers/gpu/drm/imx/dc/dc-de.c > create mode 100644 drivers/gpu/drm/imx/dc/dc-de.h > create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.c > create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.h > create mode 100644 drivers/gpu/drm/imx/dc/dc-fg.c > create mode 100644 drivers/gpu/drm/imx/dc/dc-tc.c > > diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig > index 03535a15dd8f..3e8c6edbc17c 100644 > --- a/drivers/gpu/drm/imx/Kconfig > +++ b/drivers/gpu/drm/imx/Kconfig > @@ -1,5 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0-only > > +source "drivers/gpu/drm/imx/dc/Kconfig" > source "drivers/gpu/drm/imx/dcss/Kconfig" > source "drivers/gpu/drm/imx/ipuv3/Kconfig" > source "drivers/gpu/drm/imx/lcdc/Kconfig" > diff --git a/drivers/gpu/drm/imx/Makefile b/drivers/gpu/drm/imx/Makefile > index 86f38e7c7422..c7b317640d71 100644 > --- a/drivers/gpu/drm/imx/Makefile > +++ b/drivers/gpu/drm/imx/Makefile > @@ -1,5 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > > +obj-$(CONFIG_DRM_IMX8_DC) += dc/ > obj-$(CONFIG_DRM_IMX_DCSS) += dcss/ > obj-$(CONFIG_DRM_IMX) += ipuv3/ > obj-$(CONFIG_DRM_IMX_LCDC) += lcdc/ > diff --git a/drivers/gpu/drm/imx/dc/Kconfig b/drivers/gpu/drm/imx/dc/Kconfig > new file mode 100644 > index 000000000000..32d7471c49d0 > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/Kconfig > @@ -0,0 +1,5 @@ > +config DRM_IMX8_DC > + tristate "Freescale i.MX8 Display Controller Graphics" > + depends on DRM && COMMON_CLK && OF && (ARCH_MXC || COMPILE_TEST) > + help > + enable Freescale i.MX8 Display Controller(DC) graphics support > diff --git a/drivers/gpu/drm/imx/dc/Makefile b/drivers/gpu/drm/imx/dc/Makefile > new file mode 100644 > index 000000000000..56de82d53d4d > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/Makefile > @@ -0,0 +1,5 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +imx8-dc-drm-objs := dc-de.o dc-drv.o dc-fg.o dc-tc.o > + > +obj-$(CONFIG_DRM_IMX8_DC) += imx8-dc-drm.o > diff --git a/drivers/gpu/drm/imx/dc/dc-de.c b/drivers/gpu/drm/imx/dc/dc-de.c > new file mode 100644 > index 000000000000..66b8918dc156 > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/dc-de.c > @@ -0,0 +1,153 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright 2024 NXP > + */ > + > +#include <linux/component.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/pm.h> > +#include <linux/pm_runtime.h> > +#include <linux/regmap.h> > + > +#include "dc-de.h" > +#include "dc-drv.h" > + > +#define POLARITYCTRL 0xc > +#define POLEN_HIGH BIT(2) > + > +static const struct regmap_range dc_de_regmap_ranges[] = { > + regmap_reg_range(POLARITYCTRL, POLARITYCTRL), > +}; > + > +static const struct regmap_access_table dc_de_regmap_access_table = { > + .yes_ranges = dc_de_regmap_ranges, > + .n_yes_ranges = ARRAY_SIZE(dc_de_regmap_ranges), > +}; > + > +static const struct regmap_config dc_de_top_regmap_config = { > + .name = "display-engine-top", > + .reg_bits = 32, > + .reg_stride = 4, > + .val_bits = 32, > + .fast_io = true, > + .wr_table = &dc_de_regmap_access_table, > + .rd_table = &dc_de_regmap_access_table, > +}; > + > +static inline void dc_dec_init(struct dc_de *de) > +{ > + regmap_write_bits(de->reg_top, POLARITYCTRL, POLARITYCTRL, POLEN_HIGH); > +} > + > +static int dc_de_bind(struct device *dev, struct device *master, void *data) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct dc_drm_device *dc_drm = data; > + void __iomem *base_top; > + struct dc_de *de; > + int ret; > + > + de = devm_kzalloc(dev, sizeof(*de), GFP_KERNEL); > + if (!de) > + return -ENOMEM; > + > + base_top = devm_platform_ioremap_resource_byname(pdev, "top"); > + if (IS_ERR(base_top)) > + return PTR_ERR(base_top); > + > + de->reg_top = devm_regmap_init_mmio(dev, base_top, > + &dc_de_top_regmap_config); > + if (IS_ERR(de->reg_top)) > + return PTR_ERR(de->reg_top); > + > + de->irq_shdld = platform_get_irq_byname(pdev, "shdload"); > + if (de->irq_shdld < 0) > + return de->irq_shdld; > + > + de->irq_framecomplete = platform_get_irq_byname(pdev, "framecomplete"); > + if (de->irq_framecomplete < 0) > + return de->irq_framecomplete; > + > + de->irq_seqcomplete = platform_get_irq_byname(pdev, "seqcomplete"); > + if (de->irq_seqcomplete < 0) > + return de->irq_seqcomplete; > + > + de->id = of_alias_get_id(dev->of_node, "dc0-display-engine"); > + if (de->id < 0) { > + dev_err(dev, "failed to get alias id: %d\n", de->id); > + return de->id; > + } > + > + de->dev = dev; > + > + dev_set_drvdata(dev, de); > + > + ret = devm_pm_runtime_enable(dev); > + if (ret) > + return ret; > + > + dc_drm->de[de->id] = de; > + > + return 0; > +} > + > +static const struct component_ops dc_de_ops = { > + .bind = dc_de_bind, > +}; > + > +static int dc_de_probe(struct platform_device *pdev) > +{ > + int ret; > + > + ret = devm_of_platform_populate(&pdev->dev); > + if (ret < 0) > + return ret; > + > + ret = component_add(&pdev->dev, &dc_de_ops); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, > + "failed to add component\n"); > + > + return 0; > +} > + > +static void dc_de_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &dc_de_ops); > +} > + > +static int dc_de_runtime_resume(struct device *dev) > +{ > + struct dc_de *de = dev_get_drvdata(dev); > + > + dc_dec_init(de); > + dc_fg_init(de->fg); > + dc_tc_init(de->tc); > + > + return 0; > +} > + > +static const struct dev_pm_ops dc_de_pm_ops = { > + RUNTIME_PM_OPS(NULL, dc_de_runtime_resume, NULL) > +}; > + > +static const struct of_device_id dc_de_dt_ids[] = { > + { .compatible = "fsl,imx8qxp-dc-display-engine", }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, dc_de_dt_ids); > + > +struct platform_driver dc_de_driver = { > + .probe = dc_de_probe, > + .remove_new = dc_de_remove, > + .driver = { > + .name = "imx8-dc-display-engine", > + .suppress_bind_attrs = true, > + .of_match_table = dc_de_dt_ids, > + .pm = pm_sleep_ptr(&dc_de_pm_ops), > + }, > +}; > diff --git a/drivers/gpu/drm/imx/dc/dc-de.h b/drivers/gpu/drm/imx/dc/dc-de.h > new file mode 100644 > index 000000000000..17a44362118e > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/dc-de.h > @@ -0,0 +1,57 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright 2024 NXP > + */ > + > +#ifndef __DC_DISPLAY_ENGINE_H__ > +#define __DC_DISPLAY_ENGINE_H__ > + > +#include <linux/clk.h> > +#include <linux/device.h> > +#include <linux/regmap.h> > +#include <drm/drm_modes.h> > + > +#define DC_DISPLAYS 2 > + > +struct dc_fg { > + struct device *dev; > + struct regmap *reg; > + struct clk *clk_disp; > +}; > + > +struct dc_tc { > + struct device *dev; > + struct regmap *reg; > +}; > + > +struct dc_de { > + struct device *dev; > + struct regmap *reg_top; > + struct dc_fg *fg; > + struct dc_tc *tc; > + int irq_shdld; > + int irq_framecomplete; > + int irq_seqcomplete; > + int id; > +}; > + > +/* Frame Generator Unit */ > +void dc_fg_cfg_videomode(struct dc_fg *fg, struct drm_display_mode *m); > +void dc_fg_enable(struct dc_fg *fg); > +void dc_fg_disable(struct dc_fg *fg); > +void dc_fg_shdtokgen(struct dc_fg *fg); > +u32 dc_fg_get_frame_index(struct dc_fg *fg); > +u32 dc_fg_get_line_index(struct dc_fg *fg); > +bool dc_fg_wait_for_frame_index_moving(struct dc_fg *fg); > +bool dc_fg_secondary_requests_to_read_empty_fifo(struct dc_fg *fg); > +void dc_fg_secondary_clear_channel_status(struct dc_fg *fg); > +int dc_fg_wait_for_secondary_syncup(struct dc_fg *fg); > +void dc_fg_enable_clock(struct dc_fg *fg); > +void dc_fg_disable_clock(struct dc_fg *fg); > +enum drm_mode_status dc_fg_check_clock(struct dc_fg *fg, int clk_khz); > +void dc_fg_init(struct dc_fg *fg); > + > +/* Timing Controller Unit */ > +void dc_tc_init(struct dc_tc *tc); > + > +#endif /* __DC_DISPLAY_ENGINE_H__ */ > diff --git a/drivers/gpu/drm/imx/dc/dc-drv.c b/drivers/gpu/drm/imx/dc/dc-drv.c > new file mode 100644 > index 000000000000..e5910a82dd4d > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/dc-drv.c > @@ -0,0 +1,32 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright 2024 NXP > + */ > + > +#include <linux/module.h> > +#include <linux/platform_device.h> > + > +#include "dc-drv.h" > + > +static struct platform_driver * const dc_drivers[] = { > + &dc_de_driver, > + &dc_fg_driver, > + &dc_tc_driver, > +}; > + > +static int __init dc_drm_init(void) > +{ > + return platform_register_drivers(dc_drivers, ARRAY_SIZE(dc_drivers)); > +} > + > +static void __exit dc_drm_exit(void) > +{ > + platform_unregister_drivers(dc_drivers, ARRAY_SIZE(dc_drivers)); > +} > + > +module_init(dc_drm_init); > +module_exit(dc_drm_exit); > + > +MODULE_DESCRIPTION("i.MX8 Display Controller DRM Driver"); > +MODULE_AUTHOR("Liu Ying <victor.liu@nxp.com>"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/imx/dc/dc-drv.h b/drivers/gpu/drm/imx/dc/dc-drv.h > new file mode 100644 > index 000000000000..e1290d9a0a99 > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/dc-drv.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright 2024 NXP > + */ > + > +#ifndef __DC_DRV_H__ > +#define __DC_DRV_H__ > + > +#include <linux/platform_device.h> > + > +#include <drm/drm_device.h> > + > +#include "dc-de.h" > + > +struct dc_drm_device { > + struct drm_device base; > + struct dc_de *de[DC_DISPLAYS]; > +}; > + > +extern struct platform_driver dc_de_driver; > +extern struct platform_driver dc_fg_driver; > +extern struct platform_driver dc_tc_driver; > + > +#endif /* __DC_DRV_H__ */ > diff --git a/drivers/gpu/drm/imx/dc/dc-fg.c b/drivers/gpu/drm/imx/dc/dc-fg.c > new file mode 100644 > index 000000000000..eebbafe39d7f > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/dc-fg.c > @@ -0,0 +1,374 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright 2024 NXP > + */ > + > +#include <linux/bitfield.h> > +#include <linux/bits.h> > +#include <linux/clk.h> > +#include <linux/component.h> > +#include <linux/device.h> > +#include <linux/jiffies.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > +#include <linux/units.h> > + > +#include <drm/drm_modes.h> > + > +#include "dc-de.h" > +#include "dc-drv.h" > + > +#define FGSTCTRL 0x8 > +#define FGSYNCMODE_MASK GENMASK(2, 1) > +#define FGSYNCMODE(x) FIELD_PREP(FGSYNCMODE_MASK, (x)) > +#define SHDEN BIT(0) > + > +#define HTCFG1 0xc > +#define HTOTAL(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) > +#define HACT(x) FIELD_PREP(GENMASK(13, 0), (x)) > + > +#define HTCFG2 0x10 > +#define HSEN BIT(31) > +#define HSBP(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) > +#define HSYNC(x) FIELD_PREP(GENMASK(13, 0), ((x) - 1)) > + > +#define VTCFG1 0x14 > +#define VTOTAL(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) > +#define VACT(x) FIELD_PREP(GENMASK(13, 0), (x)) > + > +#define VTCFG2 0x18 > +#define VSEN BIT(31) > +#define VSBP(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) > +#define VSYNC(x) FIELD_PREP(GENMASK(13, 0), ((x) - 1)) > + > +#define PKICKCONFIG 0x2c > +#define SKICKCONFIG 0x30 > +#define EN BIT(31) > +#define ROW(x) FIELD_PREP(GENMASK(29, 16), (x)) > +#define COL(x) FIELD_PREP(GENMASK(13, 0), (x)) > + > +#define PACFG 0x54 > +#define SACFG 0x58 > +#define STARTY(x) FIELD_PREP(GENMASK(29, 16), ((x) + 1)) > +#define STARTX(x) FIELD_PREP(GENMASK(13, 0), ((x) + 1)) > + > +#define FGINCTRL 0x5c > +#define FGINCTRLPANIC 0x60 > +#define FGDM_MASK GENMASK(2, 0) > +#define ENPRIMALPHA BIT(3) > +#define ENSECALPHA BIT(4) > + > +#define FGCCR 0x64 > +#define CCGREEN(x) FIELD_PREP(GENMASK(19, 10), (x)) > + > +#define FGENABLE 0x68 > +#define FGEN BIT(0) > + > +#define FGSLR 0x6c > +#define SHDTOKGEN BIT(0) > + > +#define FGTIMESTAMP 0x74 > +#define FRAMEINDEX(x) FIELD_GET(GENMASK(31, 14), (x)) > +#define LINEINDEX(x) FIELD_GET(GENMASK(13, 0), (x)) > + > +#define FGCHSTAT 0x78 > +#define SECSYNCSTAT BIT(24) > +#define SFIFOEMPTY BIT(16) > + > +#define FGCHSTATCLR 0x7c > +#define CLRSECSTAT BIT(16) > + > +enum dc_fg_syncmode { > + FG_SYNCMODE_OFF, /* No side-by-side synchronization. */ > +}; > + > +enum dc_fg_dm { > + FG_DM_CONSTCOL = 0x1, /* Constant Color Background is shown. */ > + FG_DM_SEC_ON_TOP = 0x5, /* Both inputs overlaid with secondary on top. */ > +}; > + > +static const struct regmap_range dc_fg_regmap_wr_ranges[] = { > + regmap_reg_range(FGSTCTRL, VTCFG2), > + regmap_reg_range(PKICKCONFIG, SKICKCONFIG), > + regmap_reg_range(PACFG, FGSLR), > + regmap_reg_range(FGCHSTATCLR, FGCHSTATCLR), > +}; > + > +static const struct regmap_range dc_fg_regmap_rd_ranges[] = { > + regmap_reg_range(FGSTCTRL, VTCFG2), > + regmap_reg_range(PKICKCONFIG, SKICKCONFIG), > + regmap_reg_range(PACFG, FGSLR), > + regmap_reg_range(FGTIMESTAMP, FGCHSTATCLR), > +}; > + > +static const struct regmap_access_table dc_fg_regmap_wr_table = { > + .yes_ranges = dc_fg_regmap_wr_ranges, > + .n_yes_ranges = ARRAY_SIZE(dc_fg_regmap_wr_ranges), > +}; > + > +static const struct regmap_access_table dc_fg_regmap_rd_table = { > + .yes_ranges = dc_fg_regmap_rd_ranges, > + .n_yes_ranges = ARRAY_SIZE(dc_fg_regmap_rd_ranges), > +}; > + > +static const struct regmap_config dc_fg_regmap_config = { > + .name = "framegen", > + .reg_bits = 32, > + .reg_stride = 4, > + .val_bits = 32, > + .fast_io = true, > + .wr_table = &dc_fg_regmap_wr_table, > + .rd_table = &dc_fg_regmap_rd_table, > +}; > + > +static inline void dc_fg_enable_shden(struct dc_fg *fg) > +{ > + regmap_write_bits(fg->reg, FGSTCTRL, SHDEN, SHDEN); > +} > + > +static inline void dc_fg_syncmode(struct dc_fg *fg, enum dc_fg_syncmode mode) > +{ > + regmap_write_bits(fg->reg, FGSTCTRL, FGSYNCMODE_MASK, FGSYNCMODE(mode)); > +} > + > +void dc_fg_cfg_videomode(struct dc_fg *fg, struct drm_display_mode *m) > +{ > + u32 hact, htotal, hsync, hsbp; > + u32 vact, vtotal, vsync, vsbp; > + u32 kick_row, kick_col; > + int ret; > + > + hact = m->crtc_hdisplay; > + htotal = m->crtc_htotal; > + hsync = m->crtc_hsync_end - m->crtc_hsync_start; > + hsbp = m->crtc_htotal - m->crtc_hsync_start; > + > + vact = m->crtc_vdisplay; > + vtotal = m->crtc_vtotal; > + vsync = m->crtc_vsync_end - m->crtc_vsync_start; > + vsbp = m->crtc_vtotal - m->crtc_vsync_start; > + > + /* video mode */ > + regmap_write(fg->reg, HTCFG1, HACT(hact) | HTOTAL(htotal)); > + regmap_write(fg->reg, HTCFG2, HSYNC(hsync) | HSBP(hsbp) | HSEN); > + regmap_write(fg->reg, VTCFG1, VACT(vact) | VTOTAL(vtotal)); > + regmap_write(fg->reg, VTCFG2, VSYNC(vsync) | VSBP(vsbp) | VSEN); > + > + kick_col = hact + 1; > + kick_row = vact; > + > + /* pkickconfig */ > + regmap_write(fg->reg, PKICKCONFIG, COL(kick_col) | ROW(kick_row) | EN); > + > + /* skikconfig */ > + regmap_write(fg->reg, SKICKCONFIG, COL(kick_col) | ROW(kick_row) | EN); > + > + /* primary and secondary area position configuration */ > + regmap_write(fg->reg, PACFG, STARTX(0) | STARTY(0)); > + regmap_write(fg->reg, SACFG, STARTX(0) | STARTY(0)); > + > + /* alpha */ > + regmap_write_bits(fg->reg, FGINCTRL, ENPRIMALPHA | ENSECALPHA, 0); > + regmap_write_bits(fg->reg, FGINCTRLPANIC, ENPRIMALPHA | ENSECALPHA, 0); > + > + /* constant color is green(used in panic mode) */ > + regmap_write(fg->reg, FGCCR, CCGREEN(0x3ff)); > + > + ret = clk_set_rate(fg->clk_disp, m->clock * HZ_PER_KHZ); > + if (ret < 0) > + dev_err(fg->dev, "failed to set display clock rate: %d\n", ret); > +} > + > +static inline void dc_fg_displaymode(struct dc_fg *fg, enum dc_fg_dm mode) > +{ > + regmap_write_bits(fg->reg, FGINCTRL, FGDM_MASK, mode); > +} > + > +static inline void dc_fg_panic_displaymode(struct dc_fg *fg, enum dc_fg_dm mode) > +{ > + regmap_write_bits(fg->reg, FGINCTRLPANIC, FGDM_MASK, mode); > +} > + > +void dc_fg_enable(struct dc_fg *fg) > +{ > + regmap_write(fg->reg, FGENABLE, FGEN); > +} > + > +void dc_fg_disable(struct dc_fg *fg) > +{ > + regmap_write(fg->reg, FGENABLE, 0); > +} > + > +void dc_fg_shdtokgen(struct dc_fg *fg) > +{ > + regmap_write(fg->reg, FGSLR, SHDTOKGEN); > +} > + > +u32 dc_fg_get_frame_index(struct dc_fg *fg) > +{ > + u32 val; > + > + regmap_read(fg->reg, FGTIMESTAMP, &val); > + > + return FRAMEINDEX(val); > +} > + > +u32 dc_fg_get_line_index(struct dc_fg *fg) > +{ > + u32 val; > + > + regmap_read(fg->reg, FGTIMESTAMP, &val); > + > + return LINEINDEX(val); > +} > + > +bool dc_fg_wait_for_frame_index_moving(struct dc_fg *fg) > +{ > + unsigned long timeout = jiffies + msecs_to_jiffies(100); > + u32 frame_index, last_frame_index; > + > + frame_index = dc_fg_get_frame_index(fg); > + do { > + last_frame_index = frame_index; > + frame_index = dc_fg_get_frame_index(fg); > + } while (last_frame_index == frame_index && > + time_before(jiffies, timeout)); > + > + return last_frame_index != frame_index; > +} > + > +bool dc_fg_secondary_requests_to_read_empty_fifo(struct dc_fg *fg) > +{ > + u32 val; > + > + regmap_read(fg->reg, FGCHSTAT, &val); > + > + return !!(val & SFIFOEMPTY); > +} > + > +void dc_fg_secondary_clear_channel_status(struct dc_fg *fg) > +{ > + regmap_write(fg->reg, FGCHSTATCLR, CLRSECSTAT); > +} > + > +int dc_fg_wait_for_secondary_syncup(struct dc_fg *fg) > +{ > + unsigned int val; > + > + return regmap_read_poll_timeout(fg->reg, FGCHSTAT, val, > + val & SECSYNCSTAT, 5, 100000); > +} > + > +void dc_fg_enable_clock(struct dc_fg *fg) > +{ > + int ret; > + > + ret = clk_prepare_enable(fg->clk_disp); > + if (ret) > + dev_err(fg->dev, "failed to enable display clock: %d\n", ret); > +} > + > +void dc_fg_disable_clock(struct dc_fg *fg) > +{ > + clk_disable_unprepare(fg->clk_disp); > +} > + > +enum drm_mode_status dc_fg_check_clock(struct dc_fg *fg, int clk_khz) > +{ > + unsigned long rounded_rate; > + > + rounded_rate = clk_round_rate(fg->clk_disp, clk_khz * HZ_PER_KHZ); > + > + if (rounded_rate != clk_khz * HZ_PER_KHZ) > + return MODE_NOCLOCK; > + > + return MODE_OK; > +} > + > +void dc_fg_init(struct dc_fg *fg) > +{ > + dc_fg_enable_shden(fg); > + dc_fg_syncmode(fg, FG_SYNCMODE_OFF); > + dc_fg_displaymode(fg, FG_DM_SEC_ON_TOP); > + dc_fg_panic_displaymode(fg, FG_DM_CONSTCOL); > +} > + > +static int dc_fg_bind(struct device *dev, struct device *master, void *data) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct dc_drm_device *dc_drm = data; > + void __iomem *base; > + struct dc_fg *fg; > + struct dc_de *de; > + int id; > + > + fg = devm_kzalloc(dev, sizeof(*fg), GFP_KERNEL); > + if (!fg) > + return -ENOMEM; > + > + base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(base)) > + return PTR_ERR(base); > + > + fg->reg = devm_regmap_init_mmio(dev, base, &dc_fg_regmap_config); > + if (IS_ERR(fg->reg)) > + return PTR_ERR(fg->reg); > + > + fg->clk_disp = devm_clk_get(dev, NULL); > + if (IS_ERR(fg->clk_disp)) > + return dev_err_probe(dev, PTR_ERR(fg->clk_disp), > + "failed to get display clock\n"); > + > + id = of_alias_get_id(dev->of_node, "dc0-framegen"); > + if (id < 0) { > + dev_err(dev, "failed to get alias id: %d\n", id); > + return id; > + } > + > + fg->dev = dev; > + > + de = dc_drm->de[id]; > + de->fg = fg; > + > + return 0; > +} > + > +static const struct component_ops dc_fg_ops = { > + .bind = dc_fg_bind, > +}; > + > +static int dc_fg_probe(struct platform_device *pdev) > +{ > + int ret; > + > + ret = component_add(&pdev->dev, &dc_fg_ops); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, > + "failed to add component\n"); > + > + return 0; > +} > + > +static void dc_fg_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &dc_fg_ops); > +} > + > +static const struct of_device_id dc_fg_dt_ids[] = { > + { .compatible = "fsl,imx8qxp-dc-framegen", }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, dc_fg_dt_ids); > + > +struct platform_driver dc_fg_driver = { > + .probe = dc_fg_probe, > + .remove_new = dc_fg_remove, > + .driver = { > + .name = "imx8-dc-framegen", > + .suppress_bind_attrs = true, > + .of_match_table = dc_fg_dt_ids, > + }, > +}; > diff --git a/drivers/gpu/drm/imx/dc/dc-tc.c b/drivers/gpu/drm/imx/dc/dc-tc.c > new file mode 100644 > index 000000000000..05b86f41ae9e > --- /dev/null > +++ b/drivers/gpu/drm/imx/dc/dc-tc.c > @@ -0,0 +1,138 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright 2024 NXP > + */ > + > +#include <linux/component.h> > +#include <linux/mod_devicetable.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +#include "dc-drv.h" > +#include "dc-de.h" > + > +#define TCON_CTRL 0x410 > +#define CTRL_RST_VAL 0x01401408 > + > +/* red: MAPBIT 29-20, green: MAPBIT 19-10, blue: MAPBIT 9-0 */ > +#define MAPBIT3_0 0x418 > +#define MAPBIT7_4 0x41c > +#define MAPBIT11_8 0x420 > +#define MAPBIT15_12 0x424 > +#define MAPBIT19_16 0x428 > +#define MAPBIT23_20 0x42c > +#define MAPBIT27_24 0x430 > +#define MAPBIT31_28 0x434 > + > +static const struct regmap_range dc_tc_regmap_ranges[] = { > + regmap_reg_range(TCON_CTRL, TCON_CTRL), > + regmap_reg_range(MAPBIT3_0, MAPBIT31_28), > +}; > + > +static const struct regmap_access_table dc_tc_regmap_access_table = { > + .yes_ranges = dc_tc_regmap_ranges, > + .n_yes_ranges = ARRAY_SIZE(dc_tc_regmap_ranges), > +}; > + > +static const struct regmap_config dc_tc_regmap_config = { > + .name = "tcon", > + .reg_bits = 32, > + .reg_stride = 4, > + .val_bits = 32, > + .fast_io = true, > + .wr_table = &dc_tc_regmap_access_table, > + .rd_table = &dc_tc_regmap_access_table, > +}; > + > +/* > + * The pixels reach TCON are always in 30-bit BGR format. > + * The first bridge always receives pixels in 30-bit RGB format. > + * So, map the format to MEDIA_BUS_FMT_RGB101010_1X30. > + */ > +static const u32 dc_tc_mapbit[] = { > + 0x17161514, 0x1b1a1918, 0x0b0a1d1c, 0x0f0e0d0c, > + 0x13121110, 0x03020100, 0x07060504, 0x00000908, > +}; > + > +void dc_tc_init(struct dc_tc *tc) > +{ > + /* reset TCON_CTRL to POR default so that TCON works in bypass mode */ > + regmap_write(tc->reg, TCON_CTRL, CTRL_RST_VAL); > + > + /* set format */ > + regmap_bulk_write(tc->reg, MAPBIT3_0, dc_tc_mapbit, > + ARRAY_SIZE(dc_tc_mapbit)); > +} > + > +static int dc_tc_bind(struct device *dev, struct device *master, void *data) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct dc_drm_device *dc_drm = data; > + void __iomem *base; > + struct dc_tc *tc; > + struct dc_de *de; > + int id; > + > + tc = devm_kzalloc(dev, sizeof(*tc), GFP_KERNEL); > + if (!tc) > + return -ENOMEM; > + > + base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(base)) > + return PTR_ERR(base); > + > + tc->reg = devm_regmap_init_mmio(dev, base, &dc_tc_regmap_config); > + if (IS_ERR(tc->reg)) > + return PTR_ERR(tc->reg); > + > + id = of_alias_get_id(dev->of_node, "dc0-tcon"); > + if (id < 0) { > + dev_err(dev, "failed to get alias id: %d\n", id); > + return id; > + } > + > + de = dc_drm->de[id]; > + de->tc = tc; > + de->tc->dev = dev; > + > + return 0; > +} > + > +static const struct component_ops dc_tc_ops = { > + .bind = dc_tc_bind, > +}; > + > +static int dc_tc_probe(struct platform_device *pdev) > +{ > + int ret; > + > + ret = component_add(&pdev->dev, &dc_tc_ops); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, > + "failed to add component\n"); > + > + return 0; > +} > + > +static void dc_tc_remove(struct platform_device *pdev) > +{ > + component_del(&pdev->dev, &dc_tc_ops); > +} > + > +static const struct of_device_id dc_tc_dt_ids[] = { > + { .compatible = "fsl,imx8qxp-dc-tcon", }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, dc_tc_dt_ids); > + > +struct platform_driver dc_tc_driver = { > + .probe = dc_tc_probe, > + .remove_new = dc_tc_remove, > + .driver = { > + .name = "imx8-dc-tcon", > + .suppress_bind_attrs = true, > + .of_match_table = dc_tc_dt_ids, > + }, > +};
Hi, On 2024/11/25 17:33, Liu Ying wrote: > i.MX8qxp Display Controller display engine consists of all processing > units that operate in a display clock domain. Add minimal feature > support with FrameGen and TCon so that the engine can output display > timings. The display engine driver as a master binds FrameGen and > TCon drivers as components. While at it, the display engine driver > is a component to be bound with the upcoming DRM driver. > > Signed-off-by: Liu Ying <victor.liu@nxp.com> > --- > v4: > * Use regmap to define register map for all registers. (Dmitry) > * Use regmap APIs to access registers. (Dmitry) > * Inline some small functions. (Dmitry) Why? Its seems that the switch to regmap APIs is not very necessary, as ioremap/writel/readl are simple enough and easier to use. Isn't that this just introduce an intermediate layer? It's okay for display bridges/panels that behind I2C bus or SPI bus. But then, why drm/msm still haven't be converted to use the regmap APIs ? Just a few questions, has no opinions to your patch.
On Thu, Nov 28, 2024 at 04:46:53PM +0800, Sui Jingfeng wrote: > Hi, > > On 2024/11/25 17:33, Liu Ying wrote: > > i.MX8qxp Display Controller display engine consists of all processing > > units that operate in a display clock domain. Add minimal feature > > support with FrameGen and TCon so that the engine can output display > > timings. The display engine driver as a master binds FrameGen and > > TCon drivers as components. While at it, the display engine driver > > is a component to be bound with the upcoming DRM driver. > > > > Signed-off-by: Liu Ying <victor.liu@nxp.com> > > --- > > v4: > > * Use regmap to define register map for all registers. (Dmitry) > > * Use regmap APIs to access registers. (Dmitry) > > * Inline some small functions. (Dmitry) > > > Why? > > Its seems that the switch to regmap APIs is not very necessary, > as ioremap/writel/readl are simple enough and easier to use. > > Isn't that this just introduce an intermediate layer? It's okay > for display bridges/panels that behind I2C bus or SPI bus. But > then, why drm/msm still haven't be converted to use the regmap > APIs ? > > Just a few questions, has no opinions to your patch. Please respond to the original review comment. Then we might be able to discuss if the suggested change was logical or not. Discussing changelog doesn't make sense becasue there is no context here.
On 11/28/2024, Sui Jingfeng wrote: > Hi, Hi, > > On 2024/11/25 17:33, Liu Ying wrote: >> i.MX8qxp Display Controller display engine consists of all processing >> units that operate in a display clock domain. Add minimal feature >> support with FrameGen and TCon so that the engine can output display >> timings. > > The Frame Generator is used to generate video timings and constant > video color images, traditionally this is sub-module of CRTC. CRTC > itself is a minimal HW unit, shouldn't be divided further. I think we've kind of agreed that all i.MX8qxp Display Controller internal processing units are separated devices, including the units in pixel engine and display engine. This is reflected by the DT bindings added by patch 1-8. > > IP blocks resides in the one display pipe ares ready to be drive > once display subsystems of i.MX8qxp is identified. We won't suffer > from the defer probe problems here. I don't see any probe deferral problem. > > So, please consider to *squash* those three drivers into one, the The drivers follow the device-oriented programming model, i.e., each device documented with DT bindings has it's own driver. Squashing them into one defeats this programming model. > split would cause too much fragmentation which will become constraints > for you introduce support for variants. The drivers use the component helper(component.c) to be aggregated by the master registered in dc-drv.c. I don't see any obvious problem or constraints if we use the components to support potential variants. > >> The display engine driver as a master binds FrameGen and >> TCon drivers as components. While at it, the display engine driver >> is a component to be bound with the upcoming DRM driver. >> >> Signed-off-by: Liu Ying <victor.liu@nxp.com> >> --- >> v4: >> * Use regmap to define register map for all registers. (Dmitry) >> * Use regmap APIs to access registers. (Dmitry) >> * Inline some small functions. (Dmitry) >> * Move dc_fg_displaymode() and dc_fg_panic_displaymode() function calls from >> KMS routine to initialization stage. (Dmitry) >> * Use devm_kzalloc() to drmm_kzalloc() to allocate dc_* data strutures. >> * Drop unnecessary private struct dc_*_priv. >> * Set suppress_bind_attrs driver flag to true to avoid unnecessary sys >> interfaces to bind/unbind the drivers. >> >> v3: >> * No change. >> >> v2: >> * Use OF alias id to get instance id. >> * Add dev member to struct dc_tc. >> >> drivers/gpu/drm/imx/Kconfig | 1 + >> drivers/gpu/drm/imx/Makefile | 1 + >> drivers/gpu/drm/imx/dc/Kconfig | 5 + >> drivers/gpu/drm/imx/dc/Makefile | 5 + >> drivers/gpu/drm/imx/dc/dc-de.c | 153 +++++++++++++ >> drivers/gpu/drm/imx/dc/dc-de.h | 57 +++++ >> drivers/gpu/drm/imx/dc/dc-drv.c | 32 +++ >> drivers/gpu/drm/imx/dc/dc-drv.h | 24 ++ >> drivers/gpu/drm/imx/dc/dc-fg.c | 374 ++++++++++++++++++++++++++++++++ >> drivers/gpu/drm/imx/dc/dc-tc.c | 138 ++++++++++++ >> 10 files changed, 790 insertions(+) >> create mode 100644 drivers/gpu/drm/imx/dc/Kconfig >> create mode 100644 drivers/gpu/drm/imx/dc/Makefile >> create mode 100644 drivers/gpu/drm/imx/dc/dc-de.c >> create mode 100644 drivers/gpu/drm/imx/dc/dc-de.h >> create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.c >> create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.h >> create mode 100644 drivers/gpu/drm/imx/dc/dc-fg.c >> create mode 100644 drivers/gpu/drm/imx/dc/dc-tc.c >> >> diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig >> index 03535a15dd8f..3e8c6edbc17c 100644 >> --- a/drivers/gpu/drm/imx/Kconfig >> +++ b/drivers/gpu/drm/imx/Kconfig >> @@ -1,5 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0-only >> +source "drivers/gpu/drm/imx/dc/Kconfig" >> source "drivers/gpu/drm/imx/dcss/Kconfig" >> source "drivers/gpu/drm/imx/ipuv3/Kconfig" >> source "drivers/gpu/drm/imx/lcdc/Kconfig" >> diff --git a/drivers/gpu/drm/imx/Makefile b/drivers/gpu/drm/imx/Makefile >> index 86f38e7c7422..c7b317640d71 100644 >> --- a/drivers/gpu/drm/imx/Makefile >> +++ b/drivers/gpu/drm/imx/Makefile >> @@ -1,5 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0 >> +obj-$(CONFIG_DRM_IMX8_DC) += dc/ >> obj-$(CONFIG_DRM_IMX_DCSS) += dcss/ >> obj-$(CONFIG_DRM_IMX) += ipuv3/ >> obj-$(CONFIG_DRM_IMX_LCDC) += lcdc/ >> diff --git a/drivers/gpu/drm/imx/dc/Kconfig b/drivers/gpu/drm/imx/dc/Kconfig >> new file mode 100644 >> index 000000000000..32d7471c49d0 >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/Kconfig >> @@ -0,0 +1,5 @@ >> +config DRM_IMX8_DC >> + tristate "Freescale i.MX8 Display Controller Graphics" >> + depends on DRM && COMMON_CLK && OF && (ARCH_MXC || COMPILE_TEST) >> + help >> + enable Freescale i.MX8 Display Controller(DC) graphics support >> diff --git a/drivers/gpu/drm/imx/dc/Makefile b/drivers/gpu/drm/imx/dc/Makefile >> new file mode 100644 >> index 000000000000..56de82d53d4d >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/Makefile >> @@ -0,0 +1,5 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> + >> +imx8-dc-drm-objs := dc-de.o dc-drv.o dc-fg.o dc-tc.o >> + >> +obj-$(CONFIG_DRM_IMX8_DC) += imx8-dc-drm.o >> diff --git a/drivers/gpu/drm/imx/dc/dc-de.c b/drivers/gpu/drm/imx/dc/dc-de.c >> new file mode 100644 >> index 000000000000..66b8918dc156 >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/dc-de.c >> @@ -0,0 +1,153 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* >> + * Copyright 2024 NXP >> + */ >> + >> +#include <linux/component.h> >> +#include <linux/mod_devicetable.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/of_platform.h> >> +#include <linux/platform_device.h> >> +#include <linux/pm.h> >> +#include <linux/pm_runtime.h> >> +#include <linux/regmap.h> >> + >> +#include "dc-de.h" >> +#include "dc-drv.h" >> + >> +#define POLARITYCTRL 0xc >> +#define POLEN_HIGH BIT(2) >> + >> +static const struct regmap_range dc_de_regmap_ranges[] = { >> + regmap_reg_range(POLARITYCTRL, POLARITYCTRL), >> +}; >> + >> +static const struct regmap_access_table dc_de_regmap_access_table = { >> + .yes_ranges = dc_de_regmap_ranges, >> + .n_yes_ranges = ARRAY_SIZE(dc_de_regmap_ranges), >> +}; >> + >> +static const struct regmap_config dc_de_top_regmap_config = { >> + .name = "display-engine-top", >> + .reg_bits = 32, >> + .reg_stride = 4, >> + .val_bits = 32, >> + .fast_io = true, >> + .wr_table = &dc_de_regmap_access_table, >> + .rd_table = &dc_de_regmap_access_table, >> +}; >> + >> +static inline void dc_dec_init(struct dc_de *de) >> +{ >> + regmap_write_bits(de->reg_top, POLARITYCTRL, POLARITYCTRL, POLEN_HIGH); >> +} >> + >> +static int dc_de_bind(struct device *dev, struct device *master, void *data) >> +{ >> + struct platform_device *pdev = to_platform_device(dev); >> + struct dc_drm_device *dc_drm = data; >> + void __iomem *base_top; >> + struct dc_de *de; >> + int ret; >> + >> + de = devm_kzalloc(dev, sizeof(*de), GFP_KERNEL); >> + if (!de) >> + return -ENOMEM; >> + >> + base_top = devm_platform_ioremap_resource_byname(pdev, "top"); >> + if (IS_ERR(base_top)) >> + return PTR_ERR(base_top); >> + >> + de->reg_top = devm_regmap_init_mmio(dev, base_top, >> + &dc_de_top_regmap_config); >> + if (IS_ERR(de->reg_top)) >> + return PTR_ERR(de->reg_top); >> + >> + de->irq_shdld = platform_get_irq_byname(pdev, "shdload"); >> + if (de->irq_shdld < 0) >> + return de->irq_shdld; >> + >> + de->irq_framecomplete = platform_get_irq_byname(pdev, "framecomplete"); >> + if (de->irq_framecomplete < 0) >> + return de->irq_framecomplete; >> + >> + de->irq_seqcomplete = platform_get_irq_byname(pdev, "seqcomplete"); >> + if (de->irq_seqcomplete < 0) >> + return de->irq_seqcomplete; >> + >> + de->id = of_alias_get_id(dev->of_node, "dc0-display-engine"); >> + if (de->id < 0) { >> + dev_err(dev, "failed to get alias id: %d\n", de->id); >> + return de->id; >> + } >> + >> + de->dev = dev; >> + >> + dev_set_drvdata(dev, de); >> + >> + ret = devm_pm_runtime_enable(dev); >> + if (ret) >> + return ret; >> + >> + dc_drm->de[de->id] = de; >> + >> + return 0; >> +} >> + >> +static const struct component_ops dc_de_ops = { >> + .bind = dc_de_bind, >> +}; >> + >> +static int dc_de_probe(struct platform_device *pdev) >> +{ >> + int ret; >> + >> + ret = devm_of_platform_populate(&pdev->dev); >> + if (ret < 0) >> + return ret; >> + >> + ret = component_add(&pdev->dev, &dc_de_ops); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, >> + "failed to add component\n"); >> + >> + return 0; >> +} >> + >> +static void dc_de_remove(struct platform_device *pdev) >> +{ >> + component_del(&pdev->dev, &dc_de_ops); >> +} >> + >> +static int dc_de_runtime_resume(struct device *dev) >> +{ >> + struct dc_de *de = dev_get_drvdata(dev); >> + >> + dc_dec_init(de); >> + dc_fg_init(de->fg); >> + dc_tc_init(de->tc); >> + >> + return 0; >> +} >> + >> +static const struct dev_pm_ops dc_de_pm_ops = { >> + RUNTIME_PM_OPS(NULL, dc_de_runtime_resume, NULL) >> +}; >> + >> +static const struct of_device_id dc_de_dt_ids[] = { >> + { .compatible = "fsl,imx8qxp-dc-display-engine", }, >> + { /* sentinel */ } >> +}; >> +MODULE_DEVICE_TABLE(of, dc_de_dt_ids); >> + >> +struct platform_driver dc_de_driver = { >> + .probe = dc_de_probe, >> + .remove_new = dc_de_remove, >> + .driver = { >> + .name = "imx8-dc-display-engine", >> + .suppress_bind_attrs = true, >> + .of_match_table = dc_de_dt_ids, >> + .pm = pm_sleep_ptr(&dc_de_pm_ops), >> + }, >> +}; >> diff --git a/drivers/gpu/drm/imx/dc/dc-de.h b/drivers/gpu/drm/imx/dc/dc-de.h >> new file mode 100644 >> index 000000000000..17a44362118e >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/dc-de.h >> @@ -0,0 +1,57 @@ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> +/* >> + * Copyright 2024 NXP >> + */ >> + >> +#ifndef __DC_DISPLAY_ENGINE_H__ >> +#define __DC_DISPLAY_ENGINE_H__ >> + >> +#include <linux/clk.h> >> +#include <linux/device.h> >> +#include <linux/regmap.h> >> +#include <drm/drm_modes.h> >> + >> +#define DC_DISPLAYS 2 >> + >> +struct dc_fg { >> + struct device *dev; >> + struct regmap *reg; >> + struct clk *clk_disp; >> +}; >> + >> +struct dc_tc { >> + struct device *dev; >> + struct regmap *reg; >> +}; >> + >> +struct dc_de { >> + struct device *dev; >> + struct regmap *reg_top; >> + struct dc_fg *fg; >> + struct dc_tc *tc; >> + int irq_shdld; >> + int irq_framecomplete; >> + int irq_seqcomplete; >> + int id; >> +}; >> + >> +/* Frame Generator Unit */ >> +void dc_fg_cfg_videomode(struct dc_fg *fg, struct drm_display_mode *m); >> +void dc_fg_enable(struct dc_fg *fg); >> +void dc_fg_disable(struct dc_fg *fg); >> +void dc_fg_shdtokgen(struct dc_fg *fg); >> +u32 dc_fg_get_frame_index(struct dc_fg *fg); >> +u32 dc_fg_get_line_index(struct dc_fg *fg); >> +bool dc_fg_wait_for_frame_index_moving(struct dc_fg *fg); >> +bool dc_fg_secondary_requests_to_read_empty_fifo(struct dc_fg *fg); >> +void dc_fg_secondary_clear_channel_status(struct dc_fg *fg); >> +int dc_fg_wait_for_secondary_syncup(struct dc_fg *fg); >> +void dc_fg_enable_clock(struct dc_fg *fg); >> +void dc_fg_disable_clock(struct dc_fg *fg); >> +enum drm_mode_status dc_fg_check_clock(struct dc_fg *fg, int clk_khz); >> +void dc_fg_init(struct dc_fg *fg); >> + >> +/* Timing Controller Unit */ >> +void dc_tc_init(struct dc_tc *tc); >> + >> +#endif /* __DC_DISPLAY_ENGINE_H__ */ >> diff --git a/drivers/gpu/drm/imx/dc/dc-drv.c b/drivers/gpu/drm/imx/dc/dc-drv.c >> new file mode 100644 >> index 000000000000..e5910a82dd4d >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/dc-drv.c >> @@ -0,0 +1,32 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* >> + * Copyright 2024 NXP >> + */ >> + >> +#include <linux/module.h> >> +#include <linux/platform_device.h> >> + >> +#include "dc-drv.h" >> + >> +static struct platform_driver * const dc_drivers[] = { >> + &dc_de_driver, >> + &dc_fg_driver, >> + &dc_tc_driver, >> +}; >> + >> +static int __init dc_drm_init(void) >> +{ >> + return platform_register_drivers(dc_drivers, ARRAY_SIZE(dc_drivers)); >> +} >> + >> +static void __exit dc_drm_exit(void) >> +{ >> + platform_unregister_drivers(dc_drivers, ARRAY_SIZE(dc_drivers)); >> +} >> + >> +module_init(dc_drm_init); >> +module_exit(dc_drm_exit); >> + >> +MODULE_DESCRIPTION("i.MX8 Display Controller DRM Driver"); >> +MODULE_AUTHOR("Liu Ying <victor.liu@nxp.com>"); >> +MODULE_LICENSE("GPL"); >> diff --git a/drivers/gpu/drm/imx/dc/dc-drv.h b/drivers/gpu/drm/imx/dc/dc-drv.h >> new file mode 100644 >> index 000000000000..e1290d9a0a99 >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/dc-drv.h >> @@ -0,0 +1,24 @@ >> +/* SPDX-License-Identifier: GPL-2.0+ */ >> +/* >> + * Copyright 2024 NXP >> + */ >> + >> +#ifndef __DC_DRV_H__ >> +#define __DC_DRV_H__ >> + >> +#include <linux/platform_device.h> >> + >> +#include <drm/drm_device.h> >> + >> +#include "dc-de.h" >> + >> +struct dc_drm_device { >> + struct drm_device base; >> + struct dc_de *de[DC_DISPLAYS]; >> +}; >> + >> +extern struct platform_driver dc_de_driver; >> +extern struct platform_driver dc_fg_driver; >> +extern struct platform_driver dc_tc_driver; >> + >> +#endif /* __DC_DRV_H__ */ >> diff --git a/drivers/gpu/drm/imx/dc/dc-fg.c b/drivers/gpu/drm/imx/dc/dc-fg.c >> new file mode 100644 >> index 000000000000..eebbafe39d7f >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/dc-fg.c >> @@ -0,0 +1,374 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* >> + * Copyright 2024 NXP >> + */ >> + >> +#include <linux/bitfield.h> >> +#include <linux/bits.h> >> +#include <linux/clk.h> >> +#include <linux/component.h> >> +#include <linux/device.h> >> +#include <linux/jiffies.h> >> +#include <linux/mod_devicetable.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/platform_device.h> >> +#include <linux/regmap.h> >> +#include <linux/units.h> >> + >> +#include <drm/drm_modes.h> >> + >> +#include "dc-de.h" >> +#include "dc-drv.h" >> + >> +#define FGSTCTRL 0x8 >> +#define FGSYNCMODE_MASK GENMASK(2, 1) >> +#define FGSYNCMODE(x) FIELD_PREP(FGSYNCMODE_MASK, (x)) >> +#define SHDEN BIT(0) >> + >> +#define HTCFG1 0xc >> +#define HTOTAL(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) >> +#define HACT(x) FIELD_PREP(GENMASK(13, 0), (x)) >> + >> +#define HTCFG2 0x10 >> +#define HSEN BIT(31) >> +#define HSBP(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) >> +#define HSYNC(x) FIELD_PREP(GENMASK(13, 0), ((x) - 1)) >> + >> +#define VTCFG1 0x14 >> +#define VTOTAL(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) >> +#define VACT(x) FIELD_PREP(GENMASK(13, 0), (x)) >> + >> +#define VTCFG2 0x18 >> +#define VSEN BIT(31) >> +#define VSBP(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) >> +#define VSYNC(x) FIELD_PREP(GENMASK(13, 0), ((x) - 1)) >> + >> +#define PKICKCONFIG 0x2c >> +#define SKICKCONFIG 0x30 >> +#define EN BIT(31) >> +#define ROW(x) FIELD_PREP(GENMASK(29, 16), (x)) >> +#define COL(x) FIELD_PREP(GENMASK(13, 0), (x)) >> + >> +#define PACFG 0x54 >> +#define SACFG 0x58 >> +#define STARTY(x) FIELD_PREP(GENMASK(29, 16), ((x) + 1)) >> +#define STARTX(x) FIELD_PREP(GENMASK(13, 0), ((x) + 1)) >> + >> +#define FGINCTRL 0x5c >> +#define FGINCTRLPANIC 0x60 >> +#define FGDM_MASK GENMASK(2, 0) >> +#define ENPRIMALPHA BIT(3) >> +#define ENSECALPHA BIT(4) >> + >> +#define FGCCR 0x64 >> +#define CCGREEN(x) FIELD_PREP(GENMASK(19, 10), (x)) >> + >> +#define FGENABLE 0x68 >> +#define FGEN BIT(0) >> + >> +#define FGSLR 0x6c >> +#define SHDTOKGEN BIT(0) >> + >> +#define FGTIMESTAMP 0x74 >> +#define FRAMEINDEX(x) FIELD_GET(GENMASK(31, 14), (x)) >> +#define LINEINDEX(x) FIELD_GET(GENMASK(13, 0), (x)) >> + >> +#define FGCHSTAT 0x78 >> +#define SECSYNCSTAT BIT(24) >> +#define SFIFOEMPTY BIT(16) >> + >> +#define FGCHSTATCLR 0x7c >> +#define CLRSECSTAT BIT(16) >> + >> +enum dc_fg_syncmode { >> + FG_SYNCMODE_OFF, /* No side-by-side synchronization. */ >> +}; >> + >> +enum dc_fg_dm { >> + FG_DM_CONSTCOL = 0x1, /* Constant Color Background is shown. */ >> + FG_DM_SEC_ON_TOP = 0x5, /* Both inputs overlaid with secondary on top. */ >> +}; >> + >> +static const struct regmap_range dc_fg_regmap_wr_ranges[] = { >> + regmap_reg_range(FGSTCTRL, VTCFG2), >> + regmap_reg_range(PKICKCONFIG, SKICKCONFIG), >> + regmap_reg_range(PACFG, FGSLR), >> + regmap_reg_range(FGCHSTATCLR, FGCHSTATCLR), >> +}; >> + >> +static const struct regmap_range dc_fg_regmap_rd_ranges[] = { >> + regmap_reg_range(FGSTCTRL, VTCFG2), >> + regmap_reg_range(PKICKCONFIG, SKICKCONFIG), >> + regmap_reg_range(PACFG, FGSLR), >> + regmap_reg_range(FGTIMESTAMP, FGCHSTATCLR), >> +}; >> + >> +static const struct regmap_access_table dc_fg_regmap_wr_table = { >> + .yes_ranges = dc_fg_regmap_wr_ranges, >> + .n_yes_ranges = ARRAY_SIZE(dc_fg_regmap_wr_ranges), >> +}; >> + >> +static const struct regmap_access_table dc_fg_regmap_rd_table = { >> + .yes_ranges = dc_fg_regmap_rd_ranges, >> + .n_yes_ranges = ARRAY_SIZE(dc_fg_regmap_rd_ranges), >> +}; >> + >> +static const struct regmap_config dc_fg_regmap_config = { >> + .name = "framegen", >> + .reg_bits = 32, >> + .reg_stride = 4, >> + .val_bits = 32, >> + .fast_io = true, >> + .wr_table = &dc_fg_regmap_wr_table, >> + .rd_table = &dc_fg_regmap_rd_table, >> +}; >> + >> +static inline void dc_fg_enable_shden(struct dc_fg *fg) >> +{ >> + regmap_write_bits(fg->reg, FGSTCTRL, SHDEN, SHDEN); >> +} >> + >> +static inline void dc_fg_syncmode(struct dc_fg *fg, enum dc_fg_syncmode mode) >> +{ >> + regmap_write_bits(fg->reg, FGSTCTRL, FGSYNCMODE_MASK, FGSYNCMODE(mode)); >> +} >> + >> +void dc_fg_cfg_videomode(struct dc_fg *fg, struct drm_display_mode *m) >> +{ >> + u32 hact, htotal, hsync, hsbp; >> + u32 vact, vtotal, vsync, vsbp; >> + u32 kick_row, kick_col; >> + int ret; >> + >> + hact = m->crtc_hdisplay; >> + htotal = m->crtc_htotal; >> + hsync = m->crtc_hsync_end - m->crtc_hsync_start; >> + hsbp = m->crtc_htotal - m->crtc_hsync_start; >> + >> + vact = m->crtc_vdisplay; >> + vtotal = m->crtc_vtotal; >> + vsync = m->crtc_vsync_end - m->crtc_vsync_start; >> + vsbp = m->crtc_vtotal - m->crtc_vsync_start; >> + >> + /* video mode */ >> + regmap_write(fg->reg, HTCFG1, HACT(hact) | HTOTAL(htotal)); >> + regmap_write(fg->reg, HTCFG2, HSYNC(hsync) | HSBP(hsbp) | HSEN); >> + regmap_write(fg->reg, VTCFG1, VACT(vact) | VTOTAL(vtotal)); >> + regmap_write(fg->reg, VTCFG2, VSYNC(vsync) | VSBP(vsbp) | VSEN); >> + >> + kick_col = hact + 1; >> + kick_row = vact; >> + >> + /* pkickconfig */ >> + regmap_write(fg->reg, PKICKCONFIG, COL(kick_col) | ROW(kick_row) | EN); >> + >> + /* skikconfig */ >> + regmap_write(fg->reg, SKICKCONFIG, COL(kick_col) | ROW(kick_row) | EN); >> + >> + /* primary and secondary area position configuration */ >> + regmap_write(fg->reg, PACFG, STARTX(0) | STARTY(0)); >> + regmap_write(fg->reg, SACFG, STARTX(0) | STARTY(0)); >> + >> + /* alpha */ >> + regmap_write_bits(fg->reg, FGINCTRL, ENPRIMALPHA | ENSECALPHA, 0); >> + regmap_write_bits(fg->reg, FGINCTRLPANIC, ENPRIMALPHA | ENSECALPHA, 0); >> + >> + /* constant color is green(used in panic mode) */ >> + regmap_write(fg->reg, FGCCR, CCGREEN(0x3ff)); >> + >> + ret = clk_set_rate(fg->clk_disp, m->clock * HZ_PER_KHZ); >> + if (ret < 0) >> + dev_err(fg->dev, "failed to set display clock rate: %d\n", ret); >> +} >> + >> +static inline void dc_fg_displaymode(struct dc_fg *fg, enum dc_fg_dm mode) >> +{ >> + regmap_write_bits(fg->reg, FGINCTRL, FGDM_MASK, mode); >> +} >> + >> +static inline void dc_fg_panic_displaymode(struct dc_fg *fg, enum dc_fg_dm mode) >> +{ >> + regmap_write_bits(fg->reg, FGINCTRLPANIC, FGDM_MASK, mode); >> +} >> + >> +void dc_fg_enable(struct dc_fg *fg) >> +{ >> + regmap_write(fg->reg, FGENABLE, FGEN); >> +} >> + >> +void dc_fg_disable(struct dc_fg *fg) >> +{ >> + regmap_write(fg->reg, FGENABLE, 0); >> +} >> + >> +void dc_fg_shdtokgen(struct dc_fg *fg) >> +{ >> + regmap_write(fg->reg, FGSLR, SHDTOKGEN); >> +} >> + >> +u32 dc_fg_get_frame_index(struct dc_fg *fg) >> +{ >> + u32 val; >> + >> + regmap_read(fg->reg, FGTIMESTAMP, &val); >> + >> + return FRAMEINDEX(val); >> +} >> + >> +u32 dc_fg_get_line_index(struct dc_fg *fg) >> +{ >> + u32 val; >> + >> + regmap_read(fg->reg, FGTIMESTAMP, &val); >> + >> + return LINEINDEX(val); >> +} >> + >> +bool dc_fg_wait_for_frame_index_moving(struct dc_fg *fg) >> +{ >> + unsigned long timeout = jiffies + msecs_to_jiffies(100); >> + u32 frame_index, last_frame_index; >> + >> + frame_index = dc_fg_get_frame_index(fg); >> + do { >> + last_frame_index = frame_index; >> + frame_index = dc_fg_get_frame_index(fg); >> + } while (last_frame_index == frame_index && >> + time_before(jiffies, timeout)); >> + >> + return last_frame_index != frame_index; >> +} >> + >> +bool dc_fg_secondary_requests_to_read_empty_fifo(struct dc_fg *fg) >> +{ >> + u32 val; >> + >> + regmap_read(fg->reg, FGCHSTAT, &val); >> + >> + return !!(val & SFIFOEMPTY); >> +} >> + >> +void dc_fg_secondary_clear_channel_status(struct dc_fg *fg) >> +{ >> + regmap_write(fg->reg, FGCHSTATCLR, CLRSECSTAT); >> +} >> + >> +int dc_fg_wait_for_secondary_syncup(struct dc_fg *fg) >> +{ >> + unsigned int val; >> + >> + return regmap_read_poll_timeout(fg->reg, FGCHSTAT, val, >> + val & SECSYNCSTAT, 5, 100000); >> +} >> + >> +void dc_fg_enable_clock(struct dc_fg *fg) >> +{ >> + int ret; >> + >> + ret = clk_prepare_enable(fg->clk_disp); >> + if (ret) >> + dev_err(fg->dev, "failed to enable display clock: %d\n", ret); >> +} >> + >> +void dc_fg_disable_clock(struct dc_fg *fg) >> +{ >> + clk_disable_unprepare(fg->clk_disp); >> +} >> + >> +enum drm_mode_status dc_fg_check_clock(struct dc_fg *fg, int clk_khz) >> +{ >> + unsigned long rounded_rate; >> + >> + rounded_rate = clk_round_rate(fg->clk_disp, clk_khz * HZ_PER_KHZ); >> + >> + if (rounded_rate != clk_khz * HZ_PER_KHZ) >> + return MODE_NOCLOCK; >> + >> + return MODE_OK; >> +} >> + >> +void dc_fg_init(struct dc_fg *fg) >> +{ >> + dc_fg_enable_shden(fg); >> + dc_fg_syncmode(fg, FG_SYNCMODE_OFF); >> + dc_fg_displaymode(fg, FG_DM_SEC_ON_TOP); >> + dc_fg_panic_displaymode(fg, FG_DM_CONSTCOL); >> +} >> + >> +static int dc_fg_bind(struct device *dev, struct device *master, void *data) >> +{ >> + struct platform_device *pdev = to_platform_device(dev); >> + struct dc_drm_device *dc_drm = data; >> + void __iomem *base; >> + struct dc_fg *fg; >> + struct dc_de *de; >> + int id; >> + >> + fg = devm_kzalloc(dev, sizeof(*fg), GFP_KERNEL); >> + if (!fg) >> + return -ENOMEM; >> + >> + base = devm_platform_ioremap_resource(pdev, 0); >> + if (IS_ERR(base)) >> + return PTR_ERR(base); >> + >> + fg->reg = devm_regmap_init_mmio(dev, base, &dc_fg_regmap_config); >> + if (IS_ERR(fg->reg)) >> + return PTR_ERR(fg->reg); >> + >> + fg->clk_disp = devm_clk_get(dev, NULL); >> + if (IS_ERR(fg->clk_disp)) >> + return dev_err_probe(dev, PTR_ERR(fg->clk_disp), >> + "failed to get display clock\n"); >> + >> + id = of_alias_get_id(dev->of_node, "dc0-framegen"); >> + if (id < 0) { >> + dev_err(dev, "failed to get alias id: %d\n", id); >> + return id; >> + } >> + >> + fg->dev = dev; >> + >> + de = dc_drm->de[id]; >> + de->fg = fg; >> + >> + return 0; >> +} >> + >> +static const struct component_ops dc_fg_ops = { >> + .bind = dc_fg_bind, >> +}; >> + >> +static int dc_fg_probe(struct platform_device *pdev) >> +{ >> + int ret; >> + >> + ret = component_add(&pdev->dev, &dc_fg_ops); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, >> + "failed to add component\n"); >> + >> + return 0; >> +} >> + >> +static void dc_fg_remove(struct platform_device *pdev) >> +{ >> + component_del(&pdev->dev, &dc_fg_ops); >> +} >> + >> +static const struct of_device_id dc_fg_dt_ids[] = { >> + { .compatible = "fsl,imx8qxp-dc-framegen", }, >> + { /* sentinel */ } >> +}; >> +MODULE_DEVICE_TABLE(of, dc_fg_dt_ids); >> + >> +struct platform_driver dc_fg_driver = { >> + .probe = dc_fg_probe, >> + .remove_new = dc_fg_remove, >> + .driver = { >> + .name = "imx8-dc-framegen", >> + .suppress_bind_attrs = true, >> + .of_match_table = dc_fg_dt_ids, >> + }, >> +}; >> diff --git a/drivers/gpu/drm/imx/dc/dc-tc.c b/drivers/gpu/drm/imx/dc/dc-tc.c >> new file mode 100644 >> index 000000000000..05b86f41ae9e >> --- /dev/null >> +++ b/drivers/gpu/drm/imx/dc/dc-tc.c >> @@ -0,0 +1,138 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +/* >> + * Copyright 2024 NXP >> + */ >> + >> +#include <linux/component.h> >> +#include <linux/mod_devicetable.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/platform_device.h> >> +#include <linux/regmap.h> >> + >> +#include "dc-drv.h" >> +#include "dc-de.h" >> + >> +#define TCON_CTRL 0x410 >> +#define CTRL_RST_VAL 0x01401408 >> + >> +/* red: MAPBIT 29-20, green: MAPBIT 19-10, blue: MAPBIT 9-0 */ >> +#define MAPBIT3_0 0x418 >> +#define MAPBIT7_4 0x41c >> +#define MAPBIT11_8 0x420 >> +#define MAPBIT15_12 0x424 >> +#define MAPBIT19_16 0x428 >> +#define MAPBIT23_20 0x42c >> +#define MAPBIT27_24 0x430 >> +#define MAPBIT31_28 0x434 >> + >> +static const struct regmap_range dc_tc_regmap_ranges[] = { >> + regmap_reg_range(TCON_CTRL, TCON_CTRL), >> + regmap_reg_range(MAPBIT3_0, MAPBIT31_28), >> +}; >> + >> +static const struct regmap_access_table dc_tc_regmap_access_table = { >> + .yes_ranges = dc_tc_regmap_ranges, >> + .n_yes_ranges = ARRAY_SIZE(dc_tc_regmap_ranges), >> +}; >> + >> +static const struct regmap_config dc_tc_regmap_config = { >> + .name = "tcon", >> + .reg_bits = 32, >> + .reg_stride = 4, >> + .val_bits = 32, >> + .fast_io = true, >> + .wr_table = &dc_tc_regmap_access_table, >> + .rd_table = &dc_tc_regmap_access_table, >> +}; >> + >> +/* >> + * The pixels reach TCON are always in 30-bit BGR format. >> + * The first bridge always receives pixels in 30-bit RGB format. >> + * So, map the format to MEDIA_BUS_FMT_RGB101010_1X30. >> + */ >> +static const u32 dc_tc_mapbit[] = { >> + 0x17161514, 0x1b1a1918, 0x0b0a1d1c, 0x0f0e0d0c, >> + 0x13121110, 0x03020100, 0x07060504, 0x00000908, >> +}; >> + >> +void dc_tc_init(struct dc_tc *tc) >> +{ >> + /* reset TCON_CTRL to POR default so that TCON works in bypass mode */ >> + regmap_write(tc->reg, TCON_CTRL, CTRL_RST_VAL); >> + >> + /* set format */ >> + regmap_bulk_write(tc->reg, MAPBIT3_0, dc_tc_mapbit, >> + ARRAY_SIZE(dc_tc_mapbit)); >> +} >> + >> +static int dc_tc_bind(struct device *dev, struct device *master, void *data) >> +{ >> + struct platform_device *pdev = to_platform_device(dev); >> + struct dc_drm_device *dc_drm = data; >> + void __iomem *base; >> + struct dc_tc *tc; >> + struct dc_de *de; >> + int id; >> + >> + tc = devm_kzalloc(dev, sizeof(*tc), GFP_KERNEL); >> + if (!tc) >> + return -ENOMEM; >> + >> + base = devm_platform_ioremap_resource(pdev, 0); >> + if (IS_ERR(base)) >> + return PTR_ERR(base); >> + >> + tc->reg = devm_regmap_init_mmio(dev, base, &dc_tc_regmap_config); >> + if (IS_ERR(tc->reg)) >> + return PTR_ERR(tc->reg); >> + >> + id = of_alias_get_id(dev->of_node, "dc0-tcon"); >> + if (id < 0) { >> + dev_err(dev, "failed to get alias id: %d\n", id); >> + return id; >> + } >> + >> + de = dc_drm->de[id]; >> + de->tc = tc; >> + de->tc->dev = dev; >> + >> + return 0; >> +} >> + >> +static const struct component_ops dc_tc_ops = { >> + .bind = dc_tc_bind, >> +}; >> + >> +static int dc_tc_probe(struct platform_device *pdev) >> +{ >> + int ret; >> + >> + ret = component_add(&pdev->dev, &dc_tc_ops); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, >> + "failed to add component\n"); >> + >> + return 0; >> +} >> + >> +static void dc_tc_remove(struct platform_device *pdev) >> +{ >> + component_del(&pdev->dev, &dc_tc_ops); >> +} >> + >> +static const struct of_device_id dc_tc_dt_ids[] = { >> + { .compatible = "fsl,imx8qxp-dc-tcon", }, >> + { /* sentinel */ } >> +}; >> +MODULE_DEVICE_TABLE(of, dc_tc_dt_ids); >> + >> +struct platform_driver dc_tc_driver = { >> + .probe = dc_tc_probe, >> + .remove_new = dc_tc_remove, >> + .driver = { >> + .name = "imx8-dc-tcon", >> + .suppress_bind_attrs = true, >> + .of_match_table = dc_tc_dt_ids, >> + }, >> +}; >
Hello, On Mon, Nov 25, 2024 at 05:33:06PM +0800, Liu Ying wrote: > +struct platform_driver dc_de_driver = { > + .probe = dc_de_probe, > + .remove_new = dc_de_remove, Please use .remove here. Also in a few other patches of this series. Best regards Uwe > + .driver = { > + .name = "imx8-dc-display-engine", > + .suppress_bind_attrs = true, > + .of_match_table = dc_de_dt_ids, > + .pm = pm_sleep_ptr(&dc_de_pm_ops), > + }, > +};
On 12/01/2024, Uwe Kleine-König wrote: > Hello, Hello, > > On Mon, Nov 25, 2024 at 05:33:06PM +0800, Liu Ying wrote: >> +struct platform_driver dc_de_driver = { >> + .probe = dc_de_probe, >> + .remove_new = dc_de_remove, > > Please use .remove here. Also in a few other patches of this series. Will use .remove in next version. Thanks. > > Best regards > Uwe > >> + .driver = { >> + .name = "imx8-dc-display-engine", >> + .suppress_bind_attrs = true, >> + .of_match_table = dc_de_dt_ids, >> + .pm = pm_sleep_ptr(&dc_de_pm_ops), >> + }, >> +};
diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig index 03535a15dd8f..3e8c6edbc17c 100644 --- a/drivers/gpu/drm/imx/Kconfig +++ b/drivers/gpu/drm/imx/Kconfig @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +source "drivers/gpu/drm/imx/dc/Kconfig" source "drivers/gpu/drm/imx/dcss/Kconfig" source "drivers/gpu/drm/imx/ipuv3/Kconfig" source "drivers/gpu/drm/imx/lcdc/Kconfig" diff --git a/drivers/gpu/drm/imx/Makefile b/drivers/gpu/drm/imx/Makefile index 86f38e7c7422..c7b317640d71 100644 --- a/drivers/gpu/drm/imx/Makefile +++ b/drivers/gpu/drm/imx/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_DRM_IMX8_DC) += dc/ obj-$(CONFIG_DRM_IMX_DCSS) += dcss/ obj-$(CONFIG_DRM_IMX) += ipuv3/ obj-$(CONFIG_DRM_IMX_LCDC) += lcdc/ diff --git a/drivers/gpu/drm/imx/dc/Kconfig b/drivers/gpu/drm/imx/dc/Kconfig new file mode 100644 index 000000000000..32d7471c49d0 --- /dev/null +++ b/drivers/gpu/drm/imx/dc/Kconfig @@ -0,0 +1,5 @@ +config DRM_IMX8_DC + tristate "Freescale i.MX8 Display Controller Graphics" + depends on DRM && COMMON_CLK && OF && (ARCH_MXC || COMPILE_TEST) + help + enable Freescale i.MX8 Display Controller(DC) graphics support diff --git a/drivers/gpu/drm/imx/dc/Makefile b/drivers/gpu/drm/imx/dc/Makefile new file mode 100644 index 000000000000..56de82d53d4d --- /dev/null +++ b/drivers/gpu/drm/imx/dc/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + +imx8-dc-drm-objs := dc-de.o dc-drv.o dc-fg.o dc-tc.o + +obj-$(CONFIG_DRM_IMX8_DC) += imx8-dc-drm.o diff --git a/drivers/gpu/drm/imx/dc/dc-de.c b/drivers/gpu/drm/imx/dc/dc-de.c new file mode 100644 index 000000000000..66b8918dc156 --- /dev/null +++ b/drivers/gpu/drm/imx/dc/dc-de.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2024 NXP + */ + +#include <linux/component.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> + +#include "dc-de.h" +#include "dc-drv.h" + +#define POLARITYCTRL 0xc +#define POLEN_HIGH BIT(2) + +static const struct regmap_range dc_de_regmap_ranges[] = { + regmap_reg_range(POLARITYCTRL, POLARITYCTRL), +}; + +static const struct regmap_access_table dc_de_regmap_access_table = { + .yes_ranges = dc_de_regmap_ranges, + .n_yes_ranges = ARRAY_SIZE(dc_de_regmap_ranges), +}; + +static const struct regmap_config dc_de_top_regmap_config = { + .name = "display-engine-top", + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .fast_io = true, + .wr_table = &dc_de_regmap_access_table, + .rd_table = &dc_de_regmap_access_table, +}; + +static inline void dc_dec_init(struct dc_de *de) +{ + regmap_write_bits(de->reg_top, POLARITYCTRL, POLARITYCTRL, POLEN_HIGH); +} + +static int dc_de_bind(struct device *dev, struct device *master, void *data) +{ + struct platform_device *pdev = to_platform_device(dev); + struct dc_drm_device *dc_drm = data; + void __iomem *base_top; + struct dc_de *de; + int ret; + + de = devm_kzalloc(dev, sizeof(*de), GFP_KERNEL); + if (!de) + return -ENOMEM; + + base_top = devm_platform_ioremap_resource_byname(pdev, "top"); + if (IS_ERR(base_top)) + return PTR_ERR(base_top); + + de->reg_top = devm_regmap_init_mmio(dev, base_top, + &dc_de_top_regmap_config); + if (IS_ERR(de->reg_top)) + return PTR_ERR(de->reg_top); + + de->irq_shdld = platform_get_irq_byname(pdev, "shdload"); + if (de->irq_shdld < 0) + return de->irq_shdld; + + de->irq_framecomplete = platform_get_irq_byname(pdev, "framecomplete"); + if (de->irq_framecomplete < 0) + return de->irq_framecomplete; + + de->irq_seqcomplete = platform_get_irq_byname(pdev, "seqcomplete"); + if (de->irq_seqcomplete < 0) + return de->irq_seqcomplete; + + de->id = of_alias_get_id(dev->of_node, "dc0-display-engine"); + if (de->id < 0) { + dev_err(dev, "failed to get alias id: %d\n", de->id); + return de->id; + } + + de->dev = dev; + + dev_set_drvdata(dev, de); + + ret = devm_pm_runtime_enable(dev); + if (ret) + return ret; + + dc_drm->de[de->id] = de; + + return 0; +} + +static const struct component_ops dc_de_ops = { + .bind = dc_de_bind, +}; + +static int dc_de_probe(struct platform_device *pdev) +{ + int ret; + + ret = devm_of_platform_populate(&pdev->dev); + if (ret < 0) + return ret; + + ret = component_add(&pdev->dev, &dc_de_ops); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "failed to add component\n"); + + return 0; +} + +static void dc_de_remove(struct platform_device *pdev) +{ + component_del(&pdev->dev, &dc_de_ops); +} + +static int dc_de_runtime_resume(struct device *dev) +{ + struct dc_de *de = dev_get_drvdata(dev); + + dc_dec_init(de); + dc_fg_init(de->fg); + dc_tc_init(de->tc); + + return 0; +} + +static const struct dev_pm_ops dc_de_pm_ops = { + RUNTIME_PM_OPS(NULL, dc_de_runtime_resume, NULL) +}; + +static const struct of_device_id dc_de_dt_ids[] = { + { .compatible = "fsl,imx8qxp-dc-display-engine", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, dc_de_dt_ids); + +struct platform_driver dc_de_driver = { + .probe = dc_de_probe, + .remove_new = dc_de_remove, + .driver = { + .name = "imx8-dc-display-engine", + .suppress_bind_attrs = true, + .of_match_table = dc_de_dt_ids, + .pm = pm_sleep_ptr(&dc_de_pm_ops), + }, +}; diff --git a/drivers/gpu/drm/imx/dc/dc-de.h b/drivers/gpu/drm/imx/dc/dc-de.h new file mode 100644 index 000000000000..17a44362118e --- /dev/null +++ b/drivers/gpu/drm/imx/dc/dc-de.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2024 NXP + */ + +#ifndef __DC_DISPLAY_ENGINE_H__ +#define __DC_DISPLAY_ENGINE_H__ + +#include <linux/clk.h> +#include <linux/device.h> +#include <linux/regmap.h> +#include <drm/drm_modes.h> + +#define DC_DISPLAYS 2 + +struct dc_fg { + struct device *dev; + struct regmap *reg; + struct clk *clk_disp; +}; + +struct dc_tc { + struct device *dev; + struct regmap *reg; +}; + +struct dc_de { + struct device *dev; + struct regmap *reg_top; + struct dc_fg *fg; + struct dc_tc *tc; + int irq_shdld; + int irq_framecomplete; + int irq_seqcomplete; + int id; +}; + +/* Frame Generator Unit */ +void dc_fg_cfg_videomode(struct dc_fg *fg, struct drm_display_mode *m); +void dc_fg_enable(struct dc_fg *fg); +void dc_fg_disable(struct dc_fg *fg); +void dc_fg_shdtokgen(struct dc_fg *fg); +u32 dc_fg_get_frame_index(struct dc_fg *fg); +u32 dc_fg_get_line_index(struct dc_fg *fg); +bool dc_fg_wait_for_frame_index_moving(struct dc_fg *fg); +bool dc_fg_secondary_requests_to_read_empty_fifo(struct dc_fg *fg); +void dc_fg_secondary_clear_channel_status(struct dc_fg *fg); +int dc_fg_wait_for_secondary_syncup(struct dc_fg *fg); +void dc_fg_enable_clock(struct dc_fg *fg); +void dc_fg_disable_clock(struct dc_fg *fg); +enum drm_mode_status dc_fg_check_clock(struct dc_fg *fg, int clk_khz); +void dc_fg_init(struct dc_fg *fg); + +/* Timing Controller Unit */ +void dc_tc_init(struct dc_tc *tc); + +#endif /* __DC_DISPLAY_ENGINE_H__ */ diff --git a/drivers/gpu/drm/imx/dc/dc-drv.c b/drivers/gpu/drm/imx/dc/dc-drv.c new file mode 100644 index 000000000000..e5910a82dd4d --- /dev/null +++ b/drivers/gpu/drm/imx/dc/dc-drv.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2024 NXP + */ + +#include <linux/module.h> +#include <linux/platform_device.h> + +#include "dc-drv.h" + +static struct platform_driver * const dc_drivers[] = { + &dc_de_driver, + &dc_fg_driver, + &dc_tc_driver, +}; + +static int __init dc_drm_init(void) +{ + return platform_register_drivers(dc_drivers, ARRAY_SIZE(dc_drivers)); +} + +static void __exit dc_drm_exit(void) +{ + platform_unregister_drivers(dc_drivers, ARRAY_SIZE(dc_drivers)); +} + +module_init(dc_drm_init); +module_exit(dc_drm_exit); + +MODULE_DESCRIPTION("i.MX8 Display Controller DRM Driver"); +MODULE_AUTHOR("Liu Ying <victor.liu@nxp.com>"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/imx/dc/dc-drv.h b/drivers/gpu/drm/imx/dc/dc-drv.h new file mode 100644 index 000000000000..e1290d9a0a99 --- /dev/null +++ b/drivers/gpu/drm/imx/dc/dc-drv.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2024 NXP + */ + +#ifndef __DC_DRV_H__ +#define __DC_DRV_H__ + +#include <linux/platform_device.h> + +#include <drm/drm_device.h> + +#include "dc-de.h" + +struct dc_drm_device { + struct drm_device base; + struct dc_de *de[DC_DISPLAYS]; +}; + +extern struct platform_driver dc_de_driver; +extern struct platform_driver dc_fg_driver; +extern struct platform_driver dc_tc_driver; + +#endif /* __DC_DRV_H__ */ diff --git a/drivers/gpu/drm/imx/dc/dc-fg.c b/drivers/gpu/drm/imx/dc/dc-fg.c new file mode 100644 index 000000000000..eebbafe39d7f --- /dev/null +++ b/drivers/gpu/drm/imx/dc/dc-fg.c @@ -0,0 +1,374 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2024 NXP + */ + +#include <linux/bitfield.h> +#include <linux/bits.h> +#include <linux/clk.h> +#include <linux/component.h> +#include <linux/device.h> +#include <linux/jiffies.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/units.h> + +#include <drm/drm_modes.h> + +#include "dc-de.h" +#include "dc-drv.h" + +#define FGSTCTRL 0x8 +#define FGSYNCMODE_MASK GENMASK(2, 1) +#define FGSYNCMODE(x) FIELD_PREP(FGSYNCMODE_MASK, (x)) +#define SHDEN BIT(0) + +#define HTCFG1 0xc +#define HTOTAL(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) +#define HACT(x) FIELD_PREP(GENMASK(13, 0), (x)) + +#define HTCFG2 0x10 +#define HSEN BIT(31) +#define HSBP(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) +#define HSYNC(x) FIELD_PREP(GENMASK(13, 0), ((x) - 1)) + +#define VTCFG1 0x14 +#define VTOTAL(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) +#define VACT(x) FIELD_PREP(GENMASK(13, 0), (x)) + +#define VTCFG2 0x18 +#define VSEN BIT(31) +#define VSBP(x) FIELD_PREP(GENMASK(29, 16), ((x) - 1)) +#define VSYNC(x) FIELD_PREP(GENMASK(13, 0), ((x) - 1)) + +#define PKICKCONFIG 0x2c +#define SKICKCONFIG 0x30 +#define EN BIT(31) +#define ROW(x) FIELD_PREP(GENMASK(29, 16), (x)) +#define COL(x) FIELD_PREP(GENMASK(13, 0), (x)) + +#define PACFG 0x54 +#define SACFG 0x58 +#define STARTY(x) FIELD_PREP(GENMASK(29, 16), ((x) + 1)) +#define STARTX(x) FIELD_PREP(GENMASK(13, 0), ((x) + 1)) + +#define FGINCTRL 0x5c +#define FGINCTRLPANIC 0x60 +#define FGDM_MASK GENMASK(2, 0) +#define ENPRIMALPHA BIT(3) +#define ENSECALPHA BIT(4) + +#define FGCCR 0x64 +#define CCGREEN(x) FIELD_PREP(GENMASK(19, 10), (x)) + +#define FGENABLE 0x68 +#define FGEN BIT(0) + +#define FGSLR 0x6c +#define SHDTOKGEN BIT(0) + +#define FGTIMESTAMP 0x74 +#define FRAMEINDEX(x) FIELD_GET(GENMASK(31, 14), (x)) +#define LINEINDEX(x) FIELD_GET(GENMASK(13, 0), (x)) + +#define FGCHSTAT 0x78 +#define SECSYNCSTAT BIT(24) +#define SFIFOEMPTY BIT(16) + +#define FGCHSTATCLR 0x7c +#define CLRSECSTAT BIT(16) + +enum dc_fg_syncmode { + FG_SYNCMODE_OFF, /* No side-by-side synchronization. */ +}; + +enum dc_fg_dm { + FG_DM_CONSTCOL = 0x1, /* Constant Color Background is shown. */ + FG_DM_SEC_ON_TOP = 0x5, /* Both inputs overlaid with secondary on top. */ +}; + +static const struct regmap_range dc_fg_regmap_wr_ranges[] = { + regmap_reg_range(FGSTCTRL, VTCFG2), + regmap_reg_range(PKICKCONFIG, SKICKCONFIG), + regmap_reg_range(PACFG, FGSLR), + regmap_reg_range(FGCHSTATCLR, FGCHSTATCLR), +}; + +static const struct regmap_range dc_fg_regmap_rd_ranges[] = { + regmap_reg_range(FGSTCTRL, VTCFG2), + regmap_reg_range(PKICKCONFIG, SKICKCONFIG), + regmap_reg_range(PACFG, FGSLR), + regmap_reg_range(FGTIMESTAMP, FGCHSTATCLR), +}; + +static const struct regmap_access_table dc_fg_regmap_wr_table = { + .yes_ranges = dc_fg_regmap_wr_ranges, + .n_yes_ranges = ARRAY_SIZE(dc_fg_regmap_wr_ranges), +}; + +static const struct regmap_access_table dc_fg_regmap_rd_table = { + .yes_ranges = dc_fg_regmap_rd_ranges, + .n_yes_ranges = ARRAY_SIZE(dc_fg_regmap_rd_ranges), +}; + +static const struct regmap_config dc_fg_regmap_config = { + .name = "framegen", + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .fast_io = true, + .wr_table = &dc_fg_regmap_wr_table, + .rd_table = &dc_fg_regmap_rd_table, +}; + +static inline void dc_fg_enable_shden(struct dc_fg *fg) +{ + regmap_write_bits(fg->reg, FGSTCTRL, SHDEN, SHDEN); +} + +static inline void dc_fg_syncmode(struct dc_fg *fg, enum dc_fg_syncmode mode) +{ + regmap_write_bits(fg->reg, FGSTCTRL, FGSYNCMODE_MASK, FGSYNCMODE(mode)); +} + +void dc_fg_cfg_videomode(struct dc_fg *fg, struct drm_display_mode *m) +{ + u32 hact, htotal, hsync, hsbp; + u32 vact, vtotal, vsync, vsbp; + u32 kick_row, kick_col; + int ret; + + hact = m->crtc_hdisplay; + htotal = m->crtc_htotal; + hsync = m->crtc_hsync_end - m->crtc_hsync_start; + hsbp = m->crtc_htotal - m->crtc_hsync_start; + + vact = m->crtc_vdisplay; + vtotal = m->crtc_vtotal; + vsync = m->crtc_vsync_end - m->crtc_vsync_start; + vsbp = m->crtc_vtotal - m->crtc_vsync_start; + + /* video mode */ + regmap_write(fg->reg, HTCFG1, HACT(hact) | HTOTAL(htotal)); + regmap_write(fg->reg, HTCFG2, HSYNC(hsync) | HSBP(hsbp) | HSEN); + regmap_write(fg->reg, VTCFG1, VACT(vact) | VTOTAL(vtotal)); + regmap_write(fg->reg, VTCFG2, VSYNC(vsync) | VSBP(vsbp) | VSEN); + + kick_col = hact + 1; + kick_row = vact; + + /* pkickconfig */ + regmap_write(fg->reg, PKICKCONFIG, COL(kick_col) | ROW(kick_row) | EN); + + /* skikconfig */ + regmap_write(fg->reg, SKICKCONFIG, COL(kick_col) | ROW(kick_row) | EN); + + /* primary and secondary area position configuration */ + regmap_write(fg->reg, PACFG, STARTX(0) | STARTY(0)); + regmap_write(fg->reg, SACFG, STARTX(0) | STARTY(0)); + + /* alpha */ + regmap_write_bits(fg->reg, FGINCTRL, ENPRIMALPHA | ENSECALPHA, 0); + regmap_write_bits(fg->reg, FGINCTRLPANIC, ENPRIMALPHA | ENSECALPHA, 0); + + /* constant color is green(used in panic mode) */ + regmap_write(fg->reg, FGCCR, CCGREEN(0x3ff)); + + ret = clk_set_rate(fg->clk_disp, m->clock * HZ_PER_KHZ); + if (ret < 0) + dev_err(fg->dev, "failed to set display clock rate: %d\n", ret); +} + +static inline void dc_fg_displaymode(struct dc_fg *fg, enum dc_fg_dm mode) +{ + regmap_write_bits(fg->reg, FGINCTRL, FGDM_MASK, mode); +} + +static inline void dc_fg_panic_displaymode(struct dc_fg *fg, enum dc_fg_dm mode) +{ + regmap_write_bits(fg->reg, FGINCTRLPANIC, FGDM_MASK, mode); +} + +void dc_fg_enable(struct dc_fg *fg) +{ + regmap_write(fg->reg, FGENABLE, FGEN); +} + +void dc_fg_disable(struct dc_fg *fg) +{ + regmap_write(fg->reg, FGENABLE, 0); +} + +void dc_fg_shdtokgen(struct dc_fg *fg) +{ + regmap_write(fg->reg, FGSLR, SHDTOKGEN); +} + +u32 dc_fg_get_frame_index(struct dc_fg *fg) +{ + u32 val; + + regmap_read(fg->reg, FGTIMESTAMP, &val); + + return FRAMEINDEX(val); +} + +u32 dc_fg_get_line_index(struct dc_fg *fg) +{ + u32 val; + + regmap_read(fg->reg, FGTIMESTAMP, &val); + + return LINEINDEX(val); +} + +bool dc_fg_wait_for_frame_index_moving(struct dc_fg *fg) +{ + unsigned long timeout = jiffies + msecs_to_jiffies(100); + u32 frame_index, last_frame_index; + + frame_index = dc_fg_get_frame_index(fg); + do { + last_frame_index = frame_index; + frame_index = dc_fg_get_frame_index(fg); + } while (last_frame_index == frame_index && + time_before(jiffies, timeout)); + + return last_frame_index != frame_index; +} + +bool dc_fg_secondary_requests_to_read_empty_fifo(struct dc_fg *fg) +{ + u32 val; + + regmap_read(fg->reg, FGCHSTAT, &val); + + return !!(val & SFIFOEMPTY); +} + +void dc_fg_secondary_clear_channel_status(struct dc_fg *fg) +{ + regmap_write(fg->reg, FGCHSTATCLR, CLRSECSTAT); +} + +int dc_fg_wait_for_secondary_syncup(struct dc_fg *fg) +{ + unsigned int val; + + return regmap_read_poll_timeout(fg->reg, FGCHSTAT, val, + val & SECSYNCSTAT, 5, 100000); +} + +void dc_fg_enable_clock(struct dc_fg *fg) +{ + int ret; + + ret = clk_prepare_enable(fg->clk_disp); + if (ret) + dev_err(fg->dev, "failed to enable display clock: %d\n", ret); +} + +void dc_fg_disable_clock(struct dc_fg *fg) +{ + clk_disable_unprepare(fg->clk_disp); +} + +enum drm_mode_status dc_fg_check_clock(struct dc_fg *fg, int clk_khz) +{ + unsigned long rounded_rate; + + rounded_rate = clk_round_rate(fg->clk_disp, clk_khz * HZ_PER_KHZ); + + if (rounded_rate != clk_khz * HZ_PER_KHZ) + return MODE_NOCLOCK; + + return MODE_OK; +} + +void dc_fg_init(struct dc_fg *fg) +{ + dc_fg_enable_shden(fg); + dc_fg_syncmode(fg, FG_SYNCMODE_OFF); + dc_fg_displaymode(fg, FG_DM_SEC_ON_TOP); + dc_fg_panic_displaymode(fg, FG_DM_CONSTCOL); +} + +static int dc_fg_bind(struct device *dev, struct device *master, void *data) +{ + struct platform_device *pdev = to_platform_device(dev); + struct dc_drm_device *dc_drm = data; + void __iomem *base; + struct dc_fg *fg; + struct dc_de *de; + int id; + + fg = devm_kzalloc(dev, sizeof(*fg), GFP_KERNEL); + if (!fg) + return -ENOMEM; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + fg->reg = devm_regmap_init_mmio(dev, base, &dc_fg_regmap_config); + if (IS_ERR(fg->reg)) + return PTR_ERR(fg->reg); + + fg->clk_disp = devm_clk_get(dev, NULL); + if (IS_ERR(fg->clk_disp)) + return dev_err_probe(dev, PTR_ERR(fg->clk_disp), + "failed to get display clock\n"); + + id = of_alias_get_id(dev->of_node, "dc0-framegen"); + if (id < 0) { + dev_err(dev, "failed to get alias id: %d\n", id); + return id; + } + + fg->dev = dev; + + de = dc_drm->de[id]; + de->fg = fg; + + return 0; +} + +static const struct component_ops dc_fg_ops = { + .bind = dc_fg_bind, +}; + +static int dc_fg_probe(struct platform_device *pdev) +{ + int ret; + + ret = component_add(&pdev->dev, &dc_fg_ops); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "failed to add component\n"); + + return 0; +} + +static void dc_fg_remove(struct platform_device *pdev) +{ + component_del(&pdev->dev, &dc_fg_ops); +} + +static const struct of_device_id dc_fg_dt_ids[] = { + { .compatible = "fsl,imx8qxp-dc-framegen", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, dc_fg_dt_ids); + +struct platform_driver dc_fg_driver = { + .probe = dc_fg_probe, + .remove_new = dc_fg_remove, + .driver = { + .name = "imx8-dc-framegen", + .suppress_bind_attrs = true, + .of_match_table = dc_fg_dt_ids, + }, +}; diff --git a/drivers/gpu/drm/imx/dc/dc-tc.c b/drivers/gpu/drm/imx/dc/dc-tc.c new file mode 100644 index 000000000000..05b86f41ae9e --- /dev/null +++ b/drivers/gpu/drm/imx/dc/dc-tc.c @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2024 NXP + */ + +#include <linux/component.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include "dc-drv.h" +#include "dc-de.h" + +#define TCON_CTRL 0x410 +#define CTRL_RST_VAL 0x01401408 + +/* red: MAPBIT 29-20, green: MAPBIT 19-10, blue: MAPBIT 9-0 */ +#define MAPBIT3_0 0x418 +#define MAPBIT7_4 0x41c +#define MAPBIT11_8 0x420 +#define MAPBIT15_12 0x424 +#define MAPBIT19_16 0x428 +#define MAPBIT23_20 0x42c +#define MAPBIT27_24 0x430 +#define MAPBIT31_28 0x434 + +static const struct regmap_range dc_tc_regmap_ranges[] = { + regmap_reg_range(TCON_CTRL, TCON_CTRL), + regmap_reg_range(MAPBIT3_0, MAPBIT31_28), +}; + +static const struct regmap_access_table dc_tc_regmap_access_table = { + .yes_ranges = dc_tc_regmap_ranges, + .n_yes_ranges = ARRAY_SIZE(dc_tc_regmap_ranges), +}; + +static const struct regmap_config dc_tc_regmap_config = { + .name = "tcon", + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .fast_io = true, + .wr_table = &dc_tc_regmap_access_table, + .rd_table = &dc_tc_regmap_access_table, +}; + +/* + * The pixels reach TCON are always in 30-bit BGR format. + * The first bridge always receives pixels in 30-bit RGB format. + * So, map the format to MEDIA_BUS_FMT_RGB101010_1X30. + */ +static const u32 dc_tc_mapbit[] = { + 0x17161514, 0x1b1a1918, 0x0b0a1d1c, 0x0f0e0d0c, + 0x13121110, 0x03020100, 0x07060504, 0x00000908, +}; + +void dc_tc_init(struct dc_tc *tc) +{ + /* reset TCON_CTRL to POR default so that TCON works in bypass mode */ + regmap_write(tc->reg, TCON_CTRL, CTRL_RST_VAL); + + /* set format */ + regmap_bulk_write(tc->reg, MAPBIT3_0, dc_tc_mapbit, + ARRAY_SIZE(dc_tc_mapbit)); +} + +static int dc_tc_bind(struct device *dev, struct device *master, void *data) +{ + struct platform_device *pdev = to_platform_device(dev); + struct dc_drm_device *dc_drm = data; + void __iomem *base; + struct dc_tc *tc; + struct dc_de *de; + int id; + + tc = devm_kzalloc(dev, sizeof(*tc), GFP_KERNEL); + if (!tc) + return -ENOMEM; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + tc->reg = devm_regmap_init_mmio(dev, base, &dc_tc_regmap_config); + if (IS_ERR(tc->reg)) + return PTR_ERR(tc->reg); + + id = of_alias_get_id(dev->of_node, "dc0-tcon"); + if (id < 0) { + dev_err(dev, "failed to get alias id: %d\n", id); + return id; + } + + de = dc_drm->de[id]; + de->tc = tc; + de->tc->dev = dev; + + return 0; +} + +static const struct component_ops dc_tc_ops = { + .bind = dc_tc_bind, +}; + +static int dc_tc_probe(struct platform_device *pdev) +{ + int ret; + + ret = component_add(&pdev->dev, &dc_tc_ops); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "failed to add component\n"); + + return 0; +} + +static void dc_tc_remove(struct platform_device *pdev) +{ + component_del(&pdev->dev, &dc_tc_ops); +} + +static const struct of_device_id dc_tc_dt_ids[] = { + { .compatible = "fsl,imx8qxp-dc-tcon", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, dc_tc_dt_ids); + +struct platform_driver dc_tc_driver = { + .probe = dc_tc_probe, + .remove_new = dc_tc_remove, + .driver = { + .name = "imx8-dc-tcon", + .suppress_bind_attrs = true, + .of_match_table = dc_tc_dt_ids, + }, +};
i.MX8qxp Display Controller display engine consists of all processing units that operate in a display clock domain. Add minimal feature support with FrameGen and TCon so that the engine can output display timings. The display engine driver as a master binds FrameGen and TCon drivers as components. While at it, the display engine driver is a component to be bound with the upcoming DRM driver. Signed-off-by: Liu Ying <victor.liu@nxp.com> --- v4: * Use regmap to define register map for all registers. (Dmitry) * Use regmap APIs to access registers. (Dmitry) * Inline some small functions. (Dmitry) * Move dc_fg_displaymode() and dc_fg_panic_displaymode() function calls from KMS routine to initialization stage. (Dmitry) * Use devm_kzalloc() to drmm_kzalloc() to allocate dc_* data strutures. * Drop unnecessary private struct dc_*_priv. * Set suppress_bind_attrs driver flag to true to avoid unnecessary sys interfaces to bind/unbind the drivers. v3: * No change. v2: * Use OF alias id to get instance id. * Add dev member to struct dc_tc. drivers/gpu/drm/imx/Kconfig | 1 + drivers/gpu/drm/imx/Makefile | 1 + drivers/gpu/drm/imx/dc/Kconfig | 5 + drivers/gpu/drm/imx/dc/Makefile | 5 + drivers/gpu/drm/imx/dc/dc-de.c | 153 +++++++++++++ drivers/gpu/drm/imx/dc/dc-de.h | 57 +++++ drivers/gpu/drm/imx/dc/dc-drv.c | 32 +++ drivers/gpu/drm/imx/dc/dc-drv.h | 24 ++ drivers/gpu/drm/imx/dc/dc-fg.c | 374 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/imx/dc/dc-tc.c | 138 ++++++++++++ 10 files changed, 790 insertions(+) create mode 100644 drivers/gpu/drm/imx/dc/Kconfig create mode 100644 drivers/gpu/drm/imx/dc/Makefile create mode 100644 drivers/gpu/drm/imx/dc/dc-de.c create mode 100644 drivers/gpu/drm/imx/dc/dc-de.h create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.c create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.h create mode 100644 drivers/gpu/drm/imx/dc/dc-fg.c create mode 100644 drivers/gpu/drm/imx/dc/dc-tc.c