From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Biju Das <biju.das.jz@bp.renesas.com> Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Philipp Zabel <p.zabel@pengutronix.de>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>, Chris Paterson <Chris.Paterson2@renesas.com>, Biju Das <biju.das@bp.renesas.com>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> Subject: Re: [RFC 22/28] drm: rcar-du: Add RZ/G2L DSI driver Date: Sun, 23 Jan 2022 15:51:00 +0200 [thread overview] Message-ID: <Ye1dRA0s2qKfOwMt@pendragon.ideasonboard.com> (raw) In-Reply-To: <20220112174612.10773-23-biju.das.jz@bp.renesas.com> Hi Biju, Thank you for the patch. On Wed, Jan 12, 2022 at 05:46:06PM +0000, Biju Das wrote: > This driver supports the MIPI DSI encoder found in the RZ/G2L > SoC. It currently supports DSI mode only. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > drivers/gpu/drm/rcar-du/Kconfig | 7 + > drivers/gpu/drm/rcar-du/Makefile | 1 + > drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c | 676 ++++++++++++++++++ > drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h | 151 ++++ > 4 files changed, 835 insertions(+) > create mode 100644 drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c > create mode 100644 drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h > > diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig > index f6e6a6d5d987..ca87fb186f02 100644 > --- a/drivers/gpu/drm/rcar-du/Kconfig > +++ b/drivers/gpu/drm/rcar-du/Kconfig > @@ -51,6 +51,13 @@ config DRM_RCAR_MIPI_DSI > help > Enable support for the R-Car Display Unit embedded MIPI DSI encoders. > > +config DRM_RZG2L_MIPI_DSI > + tristate "RZ/G2L MIPI DSI Encoder Support" > + depends on DRM && DRM_BRIDGE && OF > + select DRM_MIPI_DSI > + help > + Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > + > config DRM_RCAR_VSP > bool "R-Car DU VSP Compositor Support" if ARM > default y if ARM64 > diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile > index 286bc81b3e7c..3b5fd7610282 100644 > --- a/drivers/gpu/drm/rcar-du/Makefile > +++ b/drivers/gpu/drm/rcar-du/Makefile > @@ -20,6 +20,7 @@ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o > obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o > obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o > obj-$(CONFIG_DRM_RCAR_MIPI_DSI) += rcar_mipi_dsi.o > +obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > > # 'remote-endpoint' is fixed up at run-time > DTC_FLAGS_rcar_du_of_lvds_r8a7790 += -Wno-graph_endpoint > diff --git a/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c > new file mode 100644 > index 000000000000..8a11fedd7cd7 > --- /dev/null > +++ b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c > @@ -0,0 +1,676 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * RZ/G2L MIPI DSI Encoder Driver > + * > + * Copyright (C) 2021 Renesas Electronics Corporation > + */ > +#include <linux/clk.h> > +#include <linux/delay.h> > +#include <linux/io.h> > +#include <linux/iopoll.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_graph.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > +#include <linux/reset.h> > +#include <linux/slab.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > +#include <drm/drm_mipi_dsi.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_probe_helper.h> > + > +#include "rzg2l_mipi_dsi_regs.h" > + > +struct rzg2l_mipi_dsi { > + struct device *dev; > + void __iomem *link_mmio; > + void __iomem *phy_mmio; > + > + struct reset_control *rstc; > + struct reset_control *arstc; > + struct reset_control *prstc; > + > + struct mipi_dsi_host host; > + struct drm_bridge bridge; > + struct drm_bridge *next_bridge; > + > + struct clk *vclk; > + > + enum mipi_dsi_pixel_format format; > + unsigned int num_data_lanes; > + unsigned int lanes; > + unsigned long mode_flags; > + > + bool hsclkmode; /* 0 for non-continuous and 1 for continuous clock mode */ Booleans should be true or false, not 0 or 1. A bool value named hsclkmode isn't very readable, without this comment, it's not easy to tell which value corresponds to which mode. I would drop this field, and replace its usage with mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS. > +}; > + > +static inline struct rzg2l_mipi_dsi * > +bridge_to_rzg2l_mipi_dsi(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct rzg2l_mipi_dsi, bridge); > +} > + > +static inline struct rzg2l_mipi_dsi * > +host_to_rzg2l_mipi_dsi(struct mipi_dsi_host *host) > +{ > + return container_of(host, struct rzg2l_mipi_dsi, host); > +} > + > +static void rzg2l_mipi_dsi_write(void __iomem *mem, u32 reg, u32 data) > +{ > + iowrite32(data, mem + reg); > +} > + > +static u32 rzg2l_mipi_dsi_read(void __iomem *mem, u32 reg) > +{ > + return ioread32(mem + reg); > +} > + > +static void rzg2l_mipi_dsi_clr(void __iomem *mem, u32 reg, u32 clr) > +{ > + rzg2l_mipi_dsi_write(mem, reg, rzg2l_mipi_dsi_read(mem, reg) & ~clr); > +} > + > +/* ----------------------------------------------------------------------------- > + * Hardware Setup > + */ > + > +static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi *dsi, > + const struct drm_display_mode *mode) > +{ > + unsigned long hsfreq; > + u32 txsetr; > + u32 clstptsetr; > + u32 lptrnstsetr; > + u8 max_num_lanes; > + u32 clkkpt; > + u32 clkbfht; > + u32 clkstpt; > + u32 golpbkt; > + unsigned int bpp; > + struct { > + u32 tclk_miss; > + u32 t_init; > + u32 tclk_prepare; > + u32 tclk_settle; > + u32 tclk_trail; > + u32 tclk_post; > + u32 tclk_pre; > + u32 tclk_zero; > + u32 tlpx; > + u32 ths_prepare; > + u32 ths_settle; > + u32 ths_exit; > + u32 ths_trail; > + u32 ths_zero; > + } timings; > + u32 dphyctrl0; > + u32 dphytim0; > + u32 dphytim1; > + u32 dphytim2; > + u32 dphytim3; > + > + /* Relationship between hsclk and vclk must follow > + * vclk * bpp = hsclk * 8 * lanes > + * where vclk: video clock (Hz) > + * bpp: video pixel bit depth > + * hsclk: DSI HS Byte clock frequency (Hz) > + * lanes: number of data lanes > + * > + * hsclk(bit) = hsclk(byte) * 8 > + */ > + > + bpp = mipi_dsi_pixel_format_to_bpp(dsi->format); > + hsfreq = (mode->clock * bpp * 8) / (8 * dsi->lanes); > + > + /* Initializing DPHY before accessing LINK */ > + > + /* All DSI global operation timings are set with recommended setting */ > + if (hsfreq > 250000) { > + timings.tclk_miss = 1; > + timings.t_init = 79801; > + timings.tclk_prepare = 8; > + timings.tclk_settle = 9; > + timings.tclk_trail = 7; > + timings.tclk_post = 35; > + timings.tclk_pre = 4; > + timings.tclk_zero = 33; > + timings.tlpx = 6; > + timings.ths_prepare = 9; > + timings.ths_settle = 9; > + timings.ths_exit = 13; > + timings.ths_trail = 9; > + timings.ths_zero = 16; > + } else { > + timings.tclk_miss = 1; > + timings.t_init = 79801; > + timings.tclk_prepare = 8; > + timings.tclk_settle = 9; > + timings.tclk_trail = 10; > + timings.tclk_post = 94; > + timings.tclk_pre = 13; > + timings.tclk_zero = 33; > + timings.tlpx = 6; > + timings.ths_prepare = 12; > + timings.ths_settle = 9; > + timings.ths_exit = 13; > + timings.ths_trail = 17; > + timings.ths_zero = 23; > + } > + > + reset_control_deassert(dsi->arstc); > + reset_control_deassert(dsi->prstc); > + > + pm_runtime_get_sync(dsi->dev); Error check, and use pm_runtime_resume_and_get() instead. pm_runtime_get_sync() requires a call to pm_runtime_put_noidle() even on failure, which makes error handling more complex. > + > + clk_set_rate(dsi->vclk, mode->clock * 1000); > + > + dphyctrl0 = DSIDPHYCTRL0_CAL_EN_HSRX_OFS | DSIDPHYCTRL0_CMN_MASTER_EN | > + DSIDPHYCTRL0_RE_VDD_DETVCCQLV18 | DSIDPHYCTRL0_EN_BGR; > + > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYCTRL0, dphyctrl0); > + usleep_range(20, 30); > + > + dphyctrl0 |= DSIDPHYCTRL0_EN_LDO1200; > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYCTRL0, dphyctrl0); > + usleep_range(10, 20); > + > + dphytim0 = DSIDPHYTIM0_TCLK_MISS(timings.tclk_miss) | > + DSIDPHYTIM0_T_INIT(timings.t_init); > + dphytim1 = DSIDPHYTIM1_THS_PREPARE(timings.ths_prepare) | > + DSIDPHYTIM1_TCLK_PREPARE(timings.tclk_prepare) | > + DSIDPHYTIM1_THS_SETTLE(timings.ths_settle) | > + DSIDPHYTIM1_TCLK_SETTLE(timings.tclk_settle); > + dphytim2 = DSIDPHYTIM2_TCLK_TRAIL(timings.tclk_trail) | > + DSIDPHYTIM2_TCLK_POST(timings.tclk_post) | > + DSIDPHYTIM2_TCLK_PRE(timings.tclk_pre) | > + DSIDPHYTIM2_TCLK_ZERO(timings.tclk_zero); > + dphytim3 = DSIDPHYTIM3_TLPX(timings.tlpx) | > + DSIDPHYTIM3_THS_EXIT(timings.ths_exit) | > + DSIDPHYTIM3_THS_TRAIL(timings.ths_trail) | > + DSIDPHYTIM3_THS_ZERO(timings.ths_zero); > + > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM0, dphytim0); > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM1, dphytim1); > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM2, dphytim2); > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM3, dphytim3); > + > + reset_control_deassert(dsi->rstc); > + udelay(1); > + > + /* Check number of lanes capability */ > + max_num_lanes = rzg2l_mipi_dsi_read(dsi->link_mmio, TXSETR) >> 16; > + max_num_lanes = (max_num_lanes & 0x3) + 1; > + if (max_num_lanes < dsi->lanes) { > + dev_err(dsi->dev, "DPHY can not support %d lanes", dsi->lanes); > + return -EINVAL; > + } > + > + /* Enable Data lanes and Clock lanes */ > + txsetr = TXSETR_DLEN | TXSETR_NUMLANEUSE(dsi->lanes - 1) | TXSETR_CLEN; > + rzg2l_mipi_dsi_write(dsi->link_mmio, TXSETR, txsetr); > + > + /* > + * Global timings characteristic depends on high speed Clock Frequency > + * Currently MIPI DSI-IF just supports maximum FHD@60 with: > + * - videoclock = 148.5 (MHz) > + * - bpp: maximum 24bpp > + * - data lanes: maximum 4 lanes > + * Therefore maximum hsclk will be 891 Mbps. > + */ > + > + if (hsfreq > 445500) { > + clkkpt = 12; > + clkbfht = 15; > + clkstpt = 48; > + golpbkt = 75; > + } else if (hsfreq > 250000) { > + clkkpt = 7; > + clkbfht = 8; > + clkstpt = 27; > + golpbkt = 40; > + } else { > + clkkpt = 8; > + clkbfht = 6; > + clkstpt = 24; > + golpbkt = 29; > + } > + > + clstptsetr = CLSTPTSETR_CLKKPT(clkkpt) | CLSTPTSETR_CLKBFHT(clkbfht) | > + CLSTPTSETR_CLKSTPT(clkstpt); > + rzg2l_mipi_dsi_write(dsi->link_mmio, CLSTPTSETR, clstptsetr); > + > + lptrnstsetr = LPTRNSTSETR_GOLPBKT(golpbkt); > + rzg2l_mipi_dsi_write(dsi->link_mmio, LPTRNSTSETR, lptrnstsetr); > + > + return 0; > +} > + > +static void rzg2l_mipi_dsi_set_display_timing(struct rzg2l_mipi_dsi *dsi, > + const struct drm_display_mode *mode) > +{ > + u32 vich1ppsetr; > + u32 vich1vssetr; > + u32 vich1vpsetr; > + u32 vich1hssetr; > + u32 vich1hpsetr; > + int dsi_format; > + u32 delay[2]; > + > + /* Configuration for Pixel Packet */ > + dsi_format = mipi_dsi_pixel_format_to_bpp(dsi->format); > + switch (dsi_format) { > + case 24: > + vich1ppsetr = VICH1PPSETR_DT_RGB24; > + break; > + case 18: > + vich1ppsetr = VICH1PPSETR_DT_RGB18; > + break; > + case 16: > + vich1ppsetr = VICH1PPSETR_DT_RGB16; > + break; > + default: > + dev_warn(dsi->dev, "unsupported format"); > + return; Could you check for unsupported formats in rzg2l_mipi_dsi_host_attach() instead, so that the error can be propagated ? > + } > + > + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) > + vich1ppsetr |= VICH1PPSETR_TXESYNC_PULSE; > + > + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) > + vich1ppsetr &= ~VICH1PPSETR_TXESYNC_PULSE; > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1PPSETR, vich1ppsetr); > + > + /* Configuration for Video Parameters */ > + vich1vssetr = VICH1VSSETR_VACTIVE(mode->vdisplay) | > + VICH1VSSETR_VSA(mode->vsync_end - mode->vsync_start); > + vich1vssetr |= (mode->flags & DRM_MODE_FLAG_PVSYNC) ? > + VICH1VSSETR_VSPOL_HIGH : VICH1VSSETR_VSPOL_LOW; > + > + vich1vpsetr = VICH1VPSETR_VFP(mode->vsync_start - mode->vdisplay) | > + VICH1VPSETR_VBP(mode->vtotal - mode->vsync_end); > + > + vich1hssetr = VICH1HSSETR_HACTIVE(mode->hdisplay) | > + VICH1HSSETR_HSA(mode->hsync_end - mode->hsync_start); > + vich1hssetr |= (mode->flags & DRM_MODE_FLAG_PHSYNC) ? > + VICH1HSSETR_HSPOL_HIGH : VICH1HSSETR_HSPOL_LOW; > + > + vich1hpsetr = VICH1HPSETR_HFP(mode->hsync_start - mode->hdisplay) | > + VICH1HPSETR_HBP(mode->htotal - mode->hsync_end); > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1VSSETR, vich1vssetr); > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1VPSETR, vich1vpsetr); > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1HSSETR, vich1hssetr); > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1HPSETR, vich1hpsetr); > + > + if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) > + dsi->hsclkmode = 0; > + else > + dsi->hsclkmode = 1; > + > + /* > + * Configuration for Delay Value > + * Delay value based on 2 ranges of video clock. > + * 74.25MHz is videoclock of HD@60p or FHD@30p > + */ > + > + if (mode->clock > 74250) { > + delay[0] = 231; > + delay[1] = 216; > + } else { > + delay[0] = 220; > + delay[1] = 212; > + } > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1SET1R, > + VICH1SET1R_DLY(delay[dsi->hsclkmode])); > +} > + > +static int rzg2l_mipi_dsi_start_hs_clock(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 hsclksetr; > + u32 status; > + int ret; > + > + /* Start HS clock */ > + hsclksetr = HSCLKSETR_HSCLKRUN_HS | > + (dsi->hsclkmode ? HSCLKSETR_HSCLKMODE_CONT : > + HSCLKSETR_HSCLKMODE_NON_CONT); > + rzg2l_mipi_dsi_write(dsi->link_mmio, HSCLKSETR, hsclksetr); > + > + if (dsi->hsclkmode) { > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + status & PLSR_CLLP2HS, > + 2000, 20000, false, dsi->link_mmio, PLSR); > + if (ret < 0) { > + dev_err(dsi->dev, "failed to start HS clock\n"); > + return ret; > + } > + } > + > + dev_dbg(dsi->dev, "Start High Speed Clock with %s clock mode", > + dsi->hsclkmode ? "continuous" : "non-continuous"); > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_stop_hs_clock(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 status; > + int ret; > + > + /* Stop HS clock */ > + rzg2l_mipi_dsi_clr(dsi->link_mmio, HSCLKSETR, HSCLKSETR_HSCLKRUN_HS); As HSCLKSETR has been written in rzg2l_mipi_dsi_start_hs_clock(), I think you can write the register directly here too, without a read-modify-write sequence: rzg2l_mipi_dsi_write(dsi->link_mmio, HSCLKSETR, dsi->hsclkmode ? HSCLKSETR_HSCLKMODE_CONT : HSCLKSETR_HSCLKMODE_NON_CONT); (you can store the result of dsi->hsclkmode ? HSCLKSETR_HSCLKMODE_CONT in a local variable, as it's used on the next line too, or just copy the check, up to you). > + > + if (dsi->hsclkmode) { > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + status & PLSR_CLHS2LP, > + 2000, 20000, false, dsi->link_mmio, PLSR); > + if (ret < 0) { > + dev_err(dsi->dev, "failed to stop HS clock\n"); > + return ret; > + } > + } > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_start_video(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 vich1set0r; > + u32 status; > + int ret; > + > + /* Configuration for Blanking sequence and start video input*/ > + vich1set0r = VICH1SET0R_HFPNOLP | VICH1SET0R_HBPNOLP | > + VICH1SET0R_HSANOLP | VICH1SET0R_VSTART; > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1SET0R, vich1set0r); > + > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + status & VICH1SR_VIRDY, > + 2000, 20000, false, dsi->link_mmio, VICH1SR); > + if (ret < 0) { > + dev_err(dsi->dev, "Failed to start video signal input\n"); > + return ret; > + } > + > + dev_dbg(dsi->dev, "Start video transferring"); > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_stop_video(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 status; > + int ret; > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1SET0R, VICH1SET0R_VSTPAFT); > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + (status & VICH1SR_STOP) && (!(status & VICH1SR_RUNNING)), > + 2000, 20000, false, dsi->link_mmio, VICH1SR); > + if (ret < 0) > + goto err; > + > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + !(status & LINKSR_HSBUSY), > + 2000, 20000, false, dsi->link_mmio, LINKSR); > + if (ret < 0) > + goto err; > + > + return 0; > +err: > + dev_err(dsi->dev, "Failed to stop video signal input\n"); > + return ret; > +} > + > +/* ----------------------------------------------------------------------------- > + * Bridge > + */ > + > +static int rzg2l_mipi_dsi_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct rzg2l_mipi_dsi *dsi = bridge_to_rzg2l_mipi_dsi(bridge); > + > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, bridge, > + flags); > +} > + > +static void rzg2l_mipi_dsi_atomic_enable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > +{ > + struct drm_atomic_state *state = old_bridge_state->base.state; > + struct rzg2l_mipi_dsi *dsi = bridge_to_rzg2l_mipi_dsi(bridge); > + const struct drm_display_mode *mode; > + struct drm_connector *connector; > + struct drm_crtc *crtc; > + int ret; > + > + connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder); > + crtc = drm_atomic_get_new_connector_state(state, connector)->crtc; > + mode = &drm_atomic_get_new_crtc_state(state, crtc)->adjusted_mode; > + > + ret = rzg2l_mipi_dsi_startup(dsi, mode); > + if (ret < 0) > + return; > + > + rzg2l_mipi_dsi_set_display_timing(dsi, mode); > + > + ret = rzg2l_mipi_dsi_start_hs_clock(dsi); > + if (ret < 0) > + return; > + > + ret = rzg2l_mipi_dsi_start_video(dsi); > + if (ret < 0) > + return; > +} > + > +static void rzg2l_mipi_dsi_atomic_disable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > +{ > + struct rzg2l_mipi_dsi *dsi = bridge_to_rzg2l_mipi_dsi(bridge); > + > + rzg2l_mipi_dsi_stop_video(dsi); > + rzg2l_mipi_dsi_stop_hs_clock(dsi); > + pm_runtime_put(dsi->dev); > + reset_control_assert(dsi->rstc); > + reset_control_assert(dsi->arstc); > + reset_control_assert(dsi->prstc); > +} > + > +static enum drm_mode_status > +rzg2l_mipi_dsi_bridge_mode_valid(struct drm_bridge *bridge, > + const struct drm_display_info *info, > + const struct drm_display_mode *mode) > +{ > + if (mode->clock > 148500) > + return MODE_CLOCK_HIGH; > + > + return MODE_OK; > +} > + > +static const struct drm_bridge_funcs rzg2l_mipi_dsi_bridge_ops = { > + .attach = rzg2l_mipi_dsi_attach, > + .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_enable = rzg2l_mipi_dsi_atomic_enable, > + .atomic_disable = rzg2l_mipi_dsi_atomic_disable, > + .mode_valid = rzg2l_mipi_dsi_bridge_mode_valid, > +}; > + > +/* ----------------------------------------------------------------------------- > + * Host setting > + */ > + > +static int rzg2l_mipi_dsi_host_attach(struct mipi_dsi_host *host, > + struct mipi_dsi_device *device) > +{ > + struct rzg2l_mipi_dsi *dsi = host_to_rzg2l_mipi_dsi(host); > + int ret; > + > + if (device->lanes > dsi->num_data_lanes) > + return -EINVAL; > + > + dsi->lanes = device->lanes; > + dsi->format = device->format; > + dsi->mode_flags = device->mode_flags; > + > + dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, > + 1, 0); > + if (IS_ERR(dsi->next_bridge)) { > + ret = PTR_ERR(dsi->next_bridge); > + dev_err(dsi->dev, "failed to get next bridge: %d\n", ret); > + return ret; > + } > + > + /* Initialize the DRM bridge. */ > + dsi->bridge.funcs = &rzg2l_mipi_dsi_bridge_ops; > + dsi->bridge.of_node = dsi->dev->of_node; > + drm_bridge_add(&dsi->bridge); > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_host_detach(struct mipi_dsi_host *host, > + struct mipi_dsi_device *device) > +{ > + struct rzg2l_mipi_dsi *dsi = host_to_rzg2l_mipi_dsi(host); > + > + drm_bridge_remove(&dsi->bridge); > + return 0; > +} > + > +static const struct mipi_dsi_host_ops rzg2l_mipi_dsi_host_ops = { > + .attach = rzg2l_mipi_dsi_host_attach, > + .detach = rzg2l_mipi_dsi_host_detach, > +}; > + > +/* ----------------------------------------------------------------------------- > + * Probe & Remove > + */ > + > +static int rzg2l_mipi_dsi_parse_dt(struct rzg2l_mipi_dsi *dsi) > +{ > + struct device_node *ep; > + u32 data_lanes[4]; > + int ret; > + > + ep = of_graph_get_endpoint_by_regs(dsi->dev->of_node, 1, 0); > + if (!ep) { > + dev_dbg(dsi->dev, "unconnected port@1\n"); > + return -ENODEV; > + } > + > + ret = of_property_read_variable_u32_array(ep, "data-lanes", data_lanes, > + 1, 4); > + of_node_put(ep); > + > + if (ret < 0) { > + dev_err(dsi->dev, "missing or invalid data-lanes property\n"); > + return -ENODEV; > + } > + > + dsi->num_data_lanes = ret; > + return 0; > +} > + > +static int rzg2l_mipi_dsi_probe(struct platform_device *pdev) > +{ > + struct rzg2l_mipi_dsi *dsi; > + struct resource *mem; > + int ret; > + > + dsi = devm_kzalloc(&pdev->dev, sizeof(*dsi), GFP_KERNEL); > + if (!dsi) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, dsi); > + dsi->dev = &pdev->dev; > + > + ret = rzg2l_mipi_dsi_parse_dt(dsi); > + if (ret < 0) > + return ret; > + > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + dsi->link_mmio = devm_ioremap_resource(dsi->dev, mem); You can use devm_platform_ioremap_resource(), here and below. > + if (IS_ERR(dsi->link_mmio)) > + return PTR_ERR(dsi->link_mmio); > + > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + dsi->phy_mmio = devm_ioremap_resource(dsi->dev, mem); > + if (IS_ERR(dsi->phy_mmio)) > + return PTR_ERR(dsi->phy_mmio); > + > + dsi->vclk = devm_clk_get(dsi->dev, "vclk"); > + if (IS_ERR(dsi->vclk)) > + return PTR_ERR(dsi->vclk); > + > + dsi->rstc = devm_reset_control_get(dsi->dev, "rst"); > + if (IS_ERR(dsi->rstc)) > + return dev_err_probe(dsi->dev, PTR_ERR(dsi->rstc), "failed to get cpg reset\n"); I'd wrap the line after the PTR_ERR(). > + > + dsi->arstc = devm_reset_control_get(dsi->dev, "arst"); > + if (IS_ERR(dsi->arstc)) > + return dev_err_probe(&pdev->dev, PTR_ERR(dsi->arstc), "failed to get cpg reset\n"); Should the error message be different than the previous one ? Otherwise it's hard to tell which reset can't be acquired. > + > + dsi->prstc = devm_reset_control_get(dsi->dev, "prst"); > + if (IS_ERR(dsi->arstc)) s/arstc/prstc/ > + return dev_err_probe(dsi->dev, PTR_ERR(dsi->prstc), "failed to get cpg reset\n"); > + > + pm_runtime_enable(dsi->dev); > + > + /* Init host device */ > + dsi->host.dev = dsi->dev; > + dsi->host.ops = &rzg2l_mipi_dsi_host_ops; > + ret = mipi_dsi_host_register(&dsi->host); > + if (ret < 0) > + goto out_pm_get; > + > + return 0; > +out_pm_get: > + pm_runtime_disable(dsi->dev); > + reset_control_assert(dsi->rstc); > + reset_control_assert(dsi->arstc); > + reset_control_assert(dsi->prstc); The reset line hasn't been deasserted in probe(), does it need to be asserted in the error path here ? > + return ret; > +} > + > +static int rzg2l_mipi_dsi_remove(struct platform_device *pdev) > +{ > + struct rzg2l_mipi_dsi *dsi = platform_get_drvdata(pdev); > + > + mipi_dsi_host_unregister(&dsi->host); > + pm_runtime_disable(&pdev->dev); > + reset_control_assert(dsi->rstc); > + reset_control_assert(dsi->arstc); > + reset_control_assert(dsi->prstc); Same here, I don't think this is needed. > + return 0; > +} > + > +static const struct of_device_id rzg2l_mipi_dsi_of_table[] = { > + { .compatible = "renesas,r9a07g044-mipi-dsi" }, > + { /* sentinel */ } > +}; > + > +static struct platform_driver rzg2l_mipi_dsi_platform_driver = { > + .driver = { > + .name = "rzg2l-mipi-dsi", > + .of_match_table = rzg2l_mipi_dsi_of_table, > + }, > + .probe = rzg2l_mipi_dsi_probe, > + .remove = rzg2l_mipi_dsi_remove, > +}; > + > +module_platform_driver(rzg2l_mipi_dsi_platform_driver); > + > +MODULE_AUTHOR("Biju Das <biju.das.jz@bp.renesas.com"); > +MODULE_DESCRIPTION("Renesas RZ/G2L MIPI DSI Encoder Driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h > new file mode 100644 > index 000000000000..bf81187388bd > --- /dev/null > +++ b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h > @@ -0,0 +1,151 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * RZ/G2L MIPI DSI Interface Registers Definitions > + * > + * Copyright (C) 2021 Renesas Electronics Corporation > + */ > + > +#ifndef __RZG2L_MIPI_DSI_REGS_H__ > +#define __RZG2L_MIPI_DSI_REGS_H__ > + > +/* DPHY Registers */ > +#define DSIDPHYCTRL0 0x00 > +#define DSIDPHYCTRL0_CAL_EN_HSRX_OFS BIT(16) > +#define DSIDPHYCTRL0_CMN_MASTER_EN BIT(8) > +#define DSIDPHYCTRL0_RE_VDD_DETVCCQLV18 BIT(2) > +#define DSIDPHYCTRL0_EN_LDO1200 BIT(1) > +#define DSIDPHYCTRL0_EN_BGR BIT(0) > + > +#define DSIDPHYTIM0 0x04 > +#define DSIDPHYTIM0_TCLK_MISS(x) ((x) << 24) > +#define DSIDPHYTIM0_T_INIT(x) ((x) << 0) > + > +#define DSIDPHYTIM1 0x08 > +#define DSIDPHYTIM1_THS_PREPARE(x) ((x) << 24) > +#define DSIDPHYTIM1_TCLK_PREPARE(x) ((x) << 16) > +#define DSIDPHYTIM1_THS_SETTLE(x) ((x) << 8) > +#define DSIDPHYTIM1_TCLK_SETTLE(x) ((x) << 0) > + > +#define DSIDPHYTIM2 0x0C Some hex constants are upper case, some are lower case. Could you make that consistent ? I personally prefer lower case, and that matches the style of drivers in this directory. > +#define DSIDPHYTIM2_TCLK_TRAIL(x) ((x) << 24) > +#define DSIDPHYTIM2_TCLK_POST(x) ((x) << 16) > +#define DSIDPHYTIM2_TCLK_PRE(x) ((x) << 8) > +#define DSIDPHYTIM2_TCLK_ZERO(x) ((x) << 0) > + > +#define DSIDPHYTIM3 0x10 > +#define DSIDPHYTIM3_TLPX(x) ((x) << 24) > +#define DSIDPHYTIM3_THS_EXIT(x) ((x) << 16) > +#define DSIDPHYTIM3_THS_TRAIL(x) ((x) << 8) > +#define DSIDPHYTIM3_THS_ZERO(x) ((x) << 0) > + > +/* --------------------------------------------------------*/ > +/* Link Registers */ > +/* Link Status Register */ > +#define LINKSR 0x10 > +#define LINKSR_LPBUSY BIT(13) > +#define LINKSR_HSBUSY BIT(12) > +#define LINKSR_VICHRUN1 BIT(8) > +#define LINKSR_SQCHRUN1 BIT(4) > +#define LINKSR_SQCHRUN0 BIT(0) > + > +/* Tx Set Register */ > +#define TXSETR 0x100 > +#define TXSETR_NUMLANECAP (0x3 << 16) > +#define TXSETR_DLEN BIT(9) > +#define TXSETR_CLEN BIT(8) > +#define TXSETR_NUMLANEUSE(x) (((x) & 0x3) << 0) > + > +/* HS Clock Set Register */ > +#define HSCLKSETR 0x104 > +#define HSCLKSETR_HSCLKMODE_CONT BIT(1) > +#define HSCLKSETR_HSCLKMODE_NON_CONT (0 << 1) > +#define HSCLKSETR_HSCLKRUN_HS BIT(0) > +#define HSCLKSETR_HSCLKRUN_LP (0 << 0) > + > +/* Reset Control Register */ > +#define RSTCR 0x110 > +#define RSTCR_SWRST BIT(0) > +#define RSTCR_FCETXSTP BIT(16) > + > +/* Reset Status Register */ > +#define RSTSR 0x114 > +#define RSTSR_DL0DIR BIT(15) > +#define RSTSR_DLSTPST (0xf << 8) > +#define RSTSR_SWRSTV1 BIT(4) > +#define RSTSR_SWRSTIB BIT(3) > +#define RSTSR_SWRSTAPB BIT(2) > +#define RSTSR_SWRSTLP BIT(1) > +#define RSTSR_SWRSTHS BIT(0) > + > +/* Clock Lane Stop Time Set Register */ > +#define CLSTPTSETR 0x314 > +#define CLSTPTSETR_CLKKPT(x) ((x) << 24) > +#define CLSTPTSETR_CLKBFHT(x) ((x) << 16) > +#define CLSTPTSETR_CLKSTPT(x) ((x) << 2) > + > +/* LP Transition Time Set Register */ > +#define LPTRNSTSETR 0x318 > +#define LPTRNSTSETR_GOLPBKT(x) ((x) << 0) > + > +/* Physical Lane Status Register */ > +#define PLSR 0x320 > +#define PLSR_CLHS2LP BIT(27) > +#define PLSR_CLLP2HS BIT(26) > + > +/* Video-Input Channel 1 Set 0 Register */ > +#define VICH1SET0R 0x400 > +#define VICH1SET0R_VSEN BIT(12) > +#define VICH1SET0R_HFPNOLP BIT(10) > +#define VICH1SET0R_HBPNOLP BIT(9) > +#define VICH1SET0R_HSANOLP BIT(8) > +#define VICH1SET0R_VSTPAFT BIT(1) > +#define VICH1SET0R_VSTART BIT(0) > + > +/* Video-Input Channel 1 Set 1 Register */ > +#define VICH1SET1R 0x404 > +#define VICH1SET1R_DLY(x) (((x) & 0xfff) << 2) > + > +/* Video-Input Channel 1 Status Register */ > +#define VICH1SR 0x410 > +#define VICH1SR_VIRDY BIT(3) > +#define VICH1SR_RUNNING BIT(2) > +#define VICH1SR_STOP BIT(1) > +#define VICH1SR_START BIT(0) > + > +/* Video-Input Channel 1 Pixel Packet Set Register */ > +#define VICH1PPSETR 0x420 > +#define VICH1PPSETR_DT_RGB16 (0x0E << 16) > +#define VICH1PPSETR_DT_RGB18 (0x1E << 16) > +#define VICH1PPSETR_DT_RGB18_LS (0x2E << 16) > +#define VICH1PPSETR_DT_RGB24 (0x3E << 16) > +#define VICH1PPSETR_DT_YCbCr16 (0x2C << 16) > +#define VICH1PPSETR_DT_YCbCr20_LS (0x0C << 16) > +#define VICH1PPSETR_DT_YCbCr24 (0x1C << 16) > +#define VICH1PPSETR_TXESYNC_PULSE BIT(15) > +#define VICH1PPSETR_VC(x) ((x) << 22) > + > +/* Video-Input Channel 1 Vertical Size Set Register */ > +#define VICH1VSSETR 0x428 > +#define VICH1VSSETR_VACTIVE(x) (((x) & 0x7fff) << 16) > +#define VICH1VSSETR_VSPOL_LOW BIT(15) > +#define VICH1VSSETR_VSPOL_HIGH (0 << 15) > +#define VICH1VSSETR_VSA(x) (((x) & 0xfff) << 0) > + > +/* Video-Input Channel 1 Vertical Porch Set Register */ > +#define VICH1VPSETR 0x42C > +#define VICH1VPSETR_VFP(x) (((x) & 0x1fff) << 16) > +#define VICH1VPSETR_VBP(x) (((x) & 0x1fff) << 0) > + > +/* Video-Input Channel 1 Horizontal Size Set Register */ > +#define VICH1HSSETR 0x430 > +#define VICH1HSSETR_HACTIVE(x) (((x) & 0x7fff) << 16) > +#define VICH1HSSETR_HSPOL_LOW BIT(15) > +#define VICH1HSSETR_HSPOL_HIGH (0 << 15) > +#define VICH1HSSETR_HSA(x) (((x) & 0xfff) << 0) > + > +/* Video-Input Channel 1 Horizontal Porch Set Register */ > +#define VICH1HPSETR 0x434 > +#define VICH1HPSETR_HFP(x) (((x) & 0x1fff) << 16) > +#define VICH1HPSETR_HBP(x) (((x) & 0x1fff) << 0) > + > +#endif /* __RZG2L_MIPI_DSI_REGS_H__ */ -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Biju Das <biju.das.jz@bp.renesas.com> Cc: Chris Paterson <Chris.Paterson2@renesas.com>, Geert Uytterhoeven <geert+renesas@glider.be>, David Airlie <airlied@linux.ie>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>, dri-devel@lists.freedesktop.org, Biju Das <biju.das@bp.renesas.com>, linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Subject: Re: [RFC 22/28] drm: rcar-du: Add RZ/G2L DSI driver Date: Sun, 23 Jan 2022 15:51:00 +0200 [thread overview] Message-ID: <Ye1dRA0s2qKfOwMt@pendragon.ideasonboard.com> (raw) In-Reply-To: <20220112174612.10773-23-biju.das.jz@bp.renesas.com> Hi Biju, Thank you for the patch. On Wed, Jan 12, 2022 at 05:46:06PM +0000, Biju Das wrote: > This driver supports the MIPI DSI encoder found in the RZ/G2L > SoC. It currently supports DSI mode only. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > drivers/gpu/drm/rcar-du/Kconfig | 7 + > drivers/gpu/drm/rcar-du/Makefile | 1 + > drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c | 676 ++++++++++++++++++ > drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h | 151 ++++ > 4 files changed, 835 insertions(+) > create mode 100644 drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c > create mode 100644 drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h > > diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig > index f6e6a6d5d987..ca87fb186f02 100644 > --- a/drivers/gpu/drm/rcar-du/Kconfig > +++ b/drivers/gpu/drm/rcar-du/Kconfig > @@ -51,6 +51,13 @@ config DRM_RCAR_MIPI_DSI > help > Enable support for the R-Car Display Unit embedded MIPI DSI encoders. > > +config DRM_RZG2L_MIPI_DSI > + tristate "RZ/G2L MIPI DSI Encoder Support" > + depends on DRM && DRM_BRIDGE && OF > + select DRM_MIPI_DSI > + help > + Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders. > + > config DRM_RCAR_VSP > bool "R-Car DU VSP Compositor Support" if ARM > default y if ARM64 > diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile > index 286bc81b3e7c..3b5fd7610282 100644 > --- a/drivers/gpu/drm/rcar-du/Makefile > +++ b/drivers/gpu/drm/rcar-du/Makefile > @@ -20,6 +20,7 @@ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du-drm.o > obj-$(CONFIG_DRM_RCAR_DW_HDMI) += rcar_dw_hdmi.o > obj-$(CONFIG_DRM_RCAR_LVDS) += rcar_lvds.o > obj-$(CONFIG_DRM_RCAR_MIPI_DSI) += rcar_mipi_dsi.o > +obj-$(CONFIG_DRM_RZG2L_MIPI_DSI) += rzg2l_mipi_dsi.o > > # 'remote-endpoint' is fixed up at run-time > DTC_FLAGS_rcar_du_of_lvds_r8a7790 += -Wno-graph_endpoint > diff --git a/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c > new file mode 100644 > index 000000000000..8a11fedd7cd7 > --- /dev/null > +++ b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi.c > @@ -0,0 +1,676 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * RZ/G2L MIPI DSI Encoder Driver > + * > + * Copyright (C) 2021 Renesas Electronics Corporation > + */ > +#include <linux/clk.h> > +#include <linux/delay.h> > +#include <linux/io.h> > +#include <linux/iopoll.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_graph.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > +#include <linux/reset.h> > +#include <linux/slab.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > +#include <drm/drm_mipi_dsi.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_probe_helper.h> > + > +#include "rzg2l_mipi_dsi_regs.h" > + > +struct rzg2l_mipi_dsi { > + struct device *dev; > + void __iomem *link_mmio; > + void __iomem *phy_mmio; > + > + struct reset_control *rstc; > + struct reset_control *arstc; > + struct reset_control *prstc; > + > + struct mipi_dsi_host host; > + struct drm_bridge bridge; > + struct drm_bridge *next_bridge; > + > + struct clk *vclk; > + > + enum mipi_dsi_pixel_format format; > + unsigned int num_data_lanes; > + unsigned int lanes; > + unsigned long mode_flags; > + > + bool hsclkmode; /* 0 for non-continuous and 1 for continuous clock mode */ Booleans should be true or false, not 0 or 1. A bool value named hsclkmode isn't very readable, without this comment, it's not easy to tell which value corresponds to which mode. I would drop this field, and replace its usage with mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS. > +}; > + > +static inline struct rzg2l_mipi_dsi * > +bridge_to_rzg2l_mipi_dsi(struct drm_bridge *bridge) > +{ > + return container_of(bridge, struct rzg2l_mipi_dsi, bridge); > +} > + > +static inline struct rzg2l_mipi_dsi * > +host_to_rzg2l_mipi_dsi(struct mipi_dsi_host *host) > +{ > + return container_of(host, struct rzg2l_mipi_dsi, host); > +} > + > +static void rzg2l_mipi_dsi_write(void __iomem *mem, u32 reg, u32 data) > +{ > + iowrite32(data, mem + reg); > +} > + > +static u32 rzg2l_mipi_dsi_read(void __iomem *mem, u32 reg) > +{ > + return ioread32(mem + reg); > +} > + > +static void rzg2l_mipi_dsi_clr(void __iomem *mem, u32 reg, u32 clr) > +{ > + rzg2l_mipi_dsi_write(mem, reg, rzg2l_mipi_dsi_read(mem, reg) & ~clr); > +} > + > +/* ----------------------------------------------------------------------------- > + * Hardware Setup > + */ > + > +static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi *dsi, > + const struct drm_display_mode *mode) > +{ > + unsigned long hsfreq; > + u32 txsetr; > + u32 clstptsetr; > + u32 lptrnstsetr; > + u8 max_num_lanes; > + u32 clkkpt; > + u32 clkbfht; > + u32 clkstpt; > + u32 golpbkt; > + unsigned int bpp; > + struct { > + u32 tclk_miss; > + u32 t_init; > + u32 tclk_prepare; > + u32 tclk_settle; > + u32 tclk_trail; > + u32 tclk_post; > + u32 tclk_pre; > + u32 tclk_zero; > + u32 tlpx; > + u32 ths_prepare; > + u32 ths_settle; > + u32 ths_exit; > + u32 ths_trail; > + u32 ths_zero; > + } timings; > + u32 dphyctrl0; > + u32 dphytim0; > + u32 dphytim1; > + u32 dphytim2; > + u32 dphytim3; > + > + /* Relationship between hsclk and vclk must follow > + * vclk * bpp = hsclk * 8 * lanes > + * where vclk: video clock (Hz) > + * bpp: video pixel bit depth > + * hsclk: DSI HS Byte clock frequency (Hz) > + * lanes: number of data lanes > + * > + * hsclk(bit) = hsclk(byte) * 8 > + */ > + > + bpp = mipi_dsi_pixel_format_to_bpp(dsi->format); > + hsfreq = (mode->clock * bpp * 8) / (8 * dsi->lanes); > + > + /* Initializing DPHY before accessing LINK */ > + > + /* All DSI global operation timings are set with recommended setting */ > + if (hsfreq > 250000) { > + timings.tclk_miss = 1; > + timings.t_init = 79801; > + timings.tclk_prepare = 8; > + timings.tclk_settle = 9; > + timings.tclk_trail = 7; > + timings.tclk_post = 35; > + timings.tclk_pre = 4; > + timings.tclk_zero = 33; > + timings.tlpx = 6; > + timings.ths_prepare = 9; > + timings.ths_settle = 9; > + timings.ths_exit = 13; > + timings.ths_trail = 9; > + timings.ths_zero = 16; > + } else { > + timings.tclk_miss = 1; > + timings.t_init = 79801; > + timings.tclk_prepare = 8; > + timings.tclk_settle = 9; > + timings.tclk_trail = 10; > + timings.tclk_post = 94; > + timings.tclk_pre = 13; > + timings.tclk_zero = 33; > + timings.tlpx = 6; > + timings.ths_prepare = 12; > + timings.ths_settle = 9; > + timings.ths_exit = 13; > + timings.ths_trail = 17; > + timings.ths_zero = 23; > + } > + > + reset_control_deassert(dsi->arstc); > + reset_control_deassert(dsi->prstc); > + > + pm_runtime_get_sync(dsi->dev); Error check, and use pm_runtime_resume_and_get() instead. pm_runtime_get_sync() requires a call to pm_runtime_put_noidle() even on failure, which makes error handling more complex. > + > + clk_set_rate(dsi->vclk, mode->clock * 1000); > + > + dphyctrl0 = DSIDPHYCTRL0_CAL_EN_HSRX_OFS | DSIDPHYCTRL0_CMN_MASTER_EN | > + DSIDPHYCTRL0_RE_VDD_DETVCCQLV18 | DSIDPHYCTRL0_EN_BGR; > + > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYCTRL0, dphyctrl0); > + usleep_range(20, 30); > + > + dphyctrl0 |= DSIDPHYCTRL0_EN_LDO1200; > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYCTRL0, dphyctrl0); > + usleep_range(10, 20); > + > + dphytim0 = DSIDPHYTIM0_TCLK_MISS(timings.tclk_miss) | > + DSIDPHYTIM0_T_INIT(timings.t_init); > + dphytim1 = DSIDPHYTIM1_THS_PREPARE(timings.ths_prepare) | > + DSIDPHYTIM1_TCLK_PREPARE(timings.tclk_prepare) | > + DSIDPHYTIM1_THS_SETTLE(timings.ths_settle) | > + DSIDPHYTIM1_TCLK_SETTLE(timings.tclk_settle); > + dphytim2 = DSIDPHYTIM2_TCLK_TRAIL(timings.tclk_trail) | > + DSIDPHYTIM2_TCLK_POST(timings.tclk_post) | > + DSIDPHYTIM2_TCLK_PRE(timings.tclk_pre) | > + DSIDPHYTIM2_TCLK_ZERO(timings.tclk_zero); > + dphytim3 = DSIDPHYTIM3_TLPX(timings.tlpx) | > + DSIDPHYTIM3_THS_EXIT(timings.ths_exit) | > + DSIDPHYTIM3_THS_TRAIL(timings.ths_trail) | > + DSIDPHYTIM3_THS_ZERO(timings.ths_zero); > + > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM0, dphytim0); > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM1, dphytim1); > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM2, dphytim2); > + rzg2l_mipi_dsi_write(dsi->phy_mmio, DSIDPHYTIM3, dphytim3); > + > + reset_control_deassert(dsi->rstc); > + udelay(1); > + > + /* Check number of lanes capability */ > + max_num_lanes = rzg2l_mipi_dsi_read(dsi->link_mmio, TXSETR) >> 16; > + max_num_lanes = (max_num_lanes & 0x3) + 1; > + if (max_num_lanes < dsi->lanes) { > + dev_err(dsi->dev, "DPHY can not support %d lanes", dsi->lanes); > + return -EINVAL; > + } > + > + /* Enable Data lanes and Clock lanes */ > + txsetr = TXSETR_DLEN | TXSETR_NUMLANEUSE(dsi->lanes - 1) | TXSETR_CLEN; > + rzg2l_mipi_dsi_write(dsi->link_mmio, TXSETR, txsetr); > + > + /* > + * Global timings characteristic depends on high speed Clock Frequency > + * Currently MIPI DSI-IF just supports maximum FHD@60 with: > + * - videoclock = 148.5 (MHz) > + * - bpp: maximum 24bpp > + * - data lanes: maximum 4 lanes > + * Therefore maximum hsclk will be 891 Mbps. > + */ > + > + if (hsfreq > 445500) { > + clkkpt = 12; > + clkbfht = 15; > + clkstpt = 48; > + golpbkt = 75; > + } else if (hsfreq > 250000) { > + clkkpt = 7; > + clkbfht = 8; > + clkstpt = 27; > + golpbkt = 40; > + } else { > + clkkpt = 8; > + clkbfht = 6; > + clkstpt = 24; > + golpbkt = 29; > + } > + > + clstptsetr = CLSTPTSETR_CLKKPT(clkkpt) | CLSTPTSETR_CLKBFHT(clkbfht) | > + CLSTPTSETR_CLKSTPT(clkstpt); > + rzg2l_mipi_dsi_write(dsi->link_mmio, CLSTPTSETR, clstptsetr); > + > + lptrnstsetr = LPTRNSTSETR_GOLPBKT(golpbkt); > + rzg2l_mipi_dsi_write(dsi->link_mmio, LPTRNSTSETR, lptrnstsetr); > + > + return 0; > +} > + > +static void rzg2l_mipi_dsi_set_display_timing(struct rzg2l_mipi_dsi *dsi, > + const struct drm_display_mode *mode) > +{ > + u32 vich1ppsetr; > + u32 vich1vssetr; > + u32 vich1vpsetr; > + u32 vich1hssetr; > + u32 vich1hpsetr; > + int dsi_format; > + u32 delay[2]; > + > + /* Configuration for Pixel Packet */ > + dsi_format = mipi_dsi_pixel_format_to_bpp(dsi->format); > + switch (dsi_format) { > + case 24: > + vich1ppsetr = VICH1PPSETR_DT_RGB24; > + break; > + case 18: > + vich1ppsetr = VICH1PPSETR_DT_RGB18; > + break; > + case 16: > + vich1ppsetr = VICH1PPSETR_DT_RGB16; > + break; > + default: > + dev_warn(dsi->dev, "unsupported format"); > + return; Could you check for unsupported formats in rzg2l_mipi_dsi_host_attach() instead, so that the error can be propagated ? > + } > + > + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) > + vich1ppsetr |= VICH1PPSETR_TXESYNC_PULSE; > + > + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) > + vich1ppsetr &= ~VICH1PPSETR_TXESYNC_PULSE; > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1PPSETR, vich1ppsetr); > + > + /* Configuration for Video Parameters */ > + vich1vssetr = VICH1VSSETR_VACTIVE(mode->vdisplay) | > + VICH1VSSETR_VSA(mode->vsync_end - mode->vsync_start); > + vich1vssetr |= (mode->flags & DRM_MODE_FLAG_PVSYNC) ? > + VICH1VSSETR_VSPOL_HIGH : VICH1VSSETR_VSPOL_LOW; > + > + vich1vpsetr = VICH1VPSETR_VFP(mode->vsync_start - mode->vdisplay) | > + VICH1VPSETR_VBP(mode->vtotal - mode->vsync_end); > + > + vich1hssetr = VICH1HSSETR_HACTIVE(mode->hdisplay) | > + VICH1HSSETR_HSA(mode->hsync_end - mode->hsync_start); > + vich1hssetr |= (mode->flags & DRM_MODE_FLAG_PHSYNC) ? > + VICH1HSSETR_HSPOL_HIGH : VICH1HSSETR_HSPOL_LOW; > + > + vich1hpsetr = VICH1HPSETR_HFP(mode->hsync_start - mode->hdisplay) | > + VICH1HPSETR_HBP(mode->htotal - mode->hsync_end); > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1VSSETR, vich1vssetr); > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1VPSETR, vich1vpsetr); > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1HSSETR, vich1hssetr); > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1HPSETR, vich1hpsetr); > + > + if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS) > + dsi->hsclkmode = 0; > + else > + dsi->hsclkmode = 1; > + > + /* > + * Configuration for Delay Value > + * Delay value based on 2 ranges of video clock. > + * 74.25MHz is videoclock of HD@60p or FHD@30p > + */ > + > + if (mode->clock > 74250) { > + delay[0] = 231; > + delay[1] = 216; > + } else { > + delay[0] = 220; > + delay[1] = 212; > + } > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1SET1R, > + VICH1SET1R_DLY(delay[dsi->hsclkmode])); > +} > + > +static int rzg2l_mipi_dsi_start_hs_clock(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 hsclksetr; > + u32 status; > + int ret; > + > + /* Start HS clock */ > + hsclksetr = HSCLKSETR_HSCLKRUN_HS | > + (dsi->hsclkmode ? HSCLKSETR_HSCLKMODE_CONT : > + HSCLKSETR_HSCLKMODE_NON_CONT); > + rzg2l_mipi_dsi_write(dsi->link_mmio, HSCLKSETR, hsclksetr); > + > + if (dsi->hsclkmode) { > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + status & PLSR_CLLP2HS, > + 2000, 20000, false, dsi->link_mmio, PLSR); > + if (ret < 0) { > + dev_err(dsi->dev, "failed to start HS clock\n"); > + return ret; > + } > + } > + > + dev_dbg(dsi->dev, "Start High Speed Clock with %s clock mode", > + dsi->hsclkmode ? "continuous" : "non-continuous"); > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_stop_hs_clock(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 status; > + int ret; > + > + /* Stop HS clock */ > + rzg2l_mipi_dsi_clr(dsi->link_mmio, HSCLKSETR, HSCLKSETR_HSCLKRUN_HS); As HSCLKSETR has been written in rzg2l_mipi_dsi_start_hs_clock(), I think you can write the register directly here too, without a read-modify-write sequence: rzg2l_mipi_dsi_write(dsi->link_mmio, HSCLKSETR, dsi->hsclkmode ? HSCLKSETR_HSCLKMODE_CONT : HSCLKSETR_HSCLKMODE_NON_CONT); (you can store the result of dsi->hsclkmode ? HSCLKSETR_HSCLKMODE_CONT in a local variable, as it's used on the next line too, or just copy the check, up to you). > + > + if (dsi->hsclkmode) { > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + status & PLSR_CLHS2LP, > + 2000, 20000, false, dsi->link_mmio, PLSR); > + if (ret < 0) { > + dev_err(dsi->dev, "failed to stop HS clock\n"); > + return ret; > + } > + } > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_start_video(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 vich1set0r; > + u32 status; > + int ret; > + > + /* Configuration for Blanking sequence and start video input*/ > + vich1set0r = VICH1SET0R_HFPNOLP | VICH1SET0R_HBPNOLP | > + VICH1SET0R_HSANOLP | VICH1SET0R_VSTART; > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1SET0R, vich1set0r); > + > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + status & VICH1SR_VIRDY, > + 2000, 20000, false, dsi->link_mmio, VICH1SR); > + if (ret < 0) { > + dev_err(dsi->dev, "Failed to start video signal input\n"); > + return ret; > + } > + > + dev_dbg(dsi->dev, "Start video transferring"); > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_stop_video(struct rzg2l_mipi_dsi *dsi) > +{ > + u32 status; > + int ret; > + > + rzg2l_mipi_dsi_write(dsi->link_mmio, VICH1SET0R, VICH1SET0R_VSTPAFT); > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + (status & VICH1SR_STOP) && (!(status & VICH1SR_RUNNING)), > + 2000, 20000, false, dsi->link_mmio, VICH1SR); > + if (ret < 0) > + goto err; > + > + ret = read_poll_timeout(rzg2l_mipi_dsi_read, status, > + !(status & LINKSR_HSBUSY), > + 2000, 20000, false, dsi->link_mmio, LINKSR); > + if (ret < 0) > + goto err; > + > + return 0; > +err: > + dev_err(dsi->dev, "Failed to stop video signal input\n"); > + return ret; > +} > + > +/* ----------------------------------------------------------------------------- > + * Bridge > + */ > + > +static int rzg2l_mipi_dsi_attach(struct drm_bridge *bridge, > + enum drm_bridge_attach_flags flags) > +{ > + struct rzg2l_mipi_dsi *dsi = bridge_to_rzg2l_mipi_dsi(bridge); > + > + return drm_bridge_attach(bridge->encoder, dsi->next_bridge, bridge, > + flags); > +} > + > +static void rzg2l_mipi_dsi_atomic_enable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > +{ > + struct drm_atomic_state *state = old_bridge_state->base.state; > + struct rzg2l_mipi_dsi *dsi = bridge_to_rzg2l_mipi_dsi(bridge); > + const struct drm_display_mode *mode; > + struct drm_connector *connector; > + struct drm_crtc *crtc; > + int ret; > + > + connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder); > + crtc = drm_atomic_get_new_connector_state(state, connector)->crtc; > + mode = &drm_atomic_get_new_crtc_state(state, crtc)->adjusted_mode; > + > + ret = rzg2l_mipi_dsi_startup(dsi, mode); > + if (ret < 0) > + return; > + > + rzg2l_mipi_dsi_set_display_timing(dsi, mode); > + > + ret = rzg2l_mipi_dsi_start_hs_clock(dsi); > + if (ret < 0) > + return; > + > + ret = rzg2l_mipi_dsi_start_video(dsi); > + if (ret < 0) > + return; > +} > + > +static void rzg2l_mipi_dsi_atomic_disable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > +{ > + struct rzg2l_mipi_dsi *dsi = bridge_to_rzg2l_mipi_dsi(bridge); > + > + rzg2l_mipi_dsi_stop_video(dsi); > + rzg2l_mipi_dsi_stop_hs_clock(dsi); > + pm_runtime_put(dsi->dev); > + reset_control_assert(dsi->rstc); > + reset_control_assert(dsi->arstc); > + reset_control_assert(dsi->prstc); > +} > + > +static enum drm_mode_status > +rzg2l_mipi_dsi_bridge_mode_valid(struct drm_bridge *bridge, > + const struct drm_display_info *info, > + const struct drm_display_mode *mode) > +{ > + if (mode->clock > 148500) > + return MODE_CLOCK_HIGH; > + > + return MODE_OK; > +} > + > +static const struct drm_bridge_funcs rzg2l_mipi_dsi_bridge_ops = { > + .attach = rzg2l_mipi_dsi_attach, > + .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_enable = rzg2l_mipi_dsi_atomic_enable, > + .atomic_disable = rzg2l_mipi_dsi_atomic_disable, > + .mode_valid = rzg2l_mipi_dsi_bridge_mode_valid, > +}; > + > +/* ----------------------------------------------------------------------------- > + * Host setting > + */ > + > +static int rzg2l_mipi_dsi_host_attach(struct mipi_dsi_host *host, > + struct mipi_dsi_device *device) > +{ > + struct rzg2l_mipi_dsi *dsi = host_to_rzg2l_mipi_dsi(host); > + int ret; > + > + if (device->lanes > dsi->num_data_lanes) > + return -EINVAL; > + > + dsi->lanes = device->lanes; > + dsi->format = device->format; > + dsi->mode_flags = device->mode_flags; > + > + dsi->next_bridge = devm_drm_of_get_bridge(dsi->dev, dsi->dev->of_node, > + 1, 0); > + if (IS_ERR(dsi->next_bridge)) { > + ret = PTR_ERR(dsi->next_bridge); > + dev_err(dsi->dev, "failed to get next bridge: %d\n", ret); > + return ret; > + } > + > + /* Initialize the DRM bridge. */ > + dsi->bridge.funcs = &rzg2l_mipi_dsi_bridge_ops; > + dsi->bridge.of_node = dsi->dev->of_node; > + drm_bridge_add(&dsi->bridge); > + > + return 0; > +} > + > +static int rzg2l_mipi_dsi_host_detach(struct mipi_dsi_host *host, > + struct mipi_dsi_device *device) > +{ > + struct rzg2l_mipi_dsi *dsi = host_to_rzg2l_mipi_dsi(host); > + > + drm_bridge_remove(&dsi->bridge); > + return 0; > +} > + > +static const struct mipi_dsi_host_ops rzg2l_mipi_dsi_host_ops = { > + .attach = rzg2l_mipi_dsi_host_attach, > + .detach = rzg2l_mipi_dsi_host_detach, > +}; > + > +/* ----------------------------------------------------------------------------- > + * Probe & Remove > + */ > + > +static int rzg2l_mipi_dsi_parse_dt(struct rzg2l_mipi_dsi *dsi) > +{ > + struct device_node *ep; > + u32 data_lanes[4]; > + int ret; > + > + ep = of_graph_get_endpoint_by_regs(dsi->dev->of_node, 1, 0); > + if (!ep) { > + dev_dbg(dsi->dev, "unconnected port@1\n"); > + return -ENODEV; > + } > + > + ret = of_property_read_variable_u32_array(ep, "data-lanes", data_lanes, > + 1, 4); > + of_node_put(ep); > + > + if (ret < 0) { > + dev_err(dsi->dev, "missing or invalid data-lanes property\n"); > + return -ENODEV; > + } > + > + dsi->num_data_lanes = ret; > + return 0; > +} > + > +static int rzg2l_mipi_dsi_probe(struct platform_device *pdev) > +{ > + struct rzg2l_mipi_dsi *dsi; > + struct resource *mem; > + int ret; > + > + dsi = devm_kzalloc(&pdev->dev, sizeof(*dsi), GFP_KERNEL); > + if (!dsi) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, dsi); > + dsi->dev = &pdev->dev; > + > + ret = rzg2l_mipi_dsi_parse_dt(dsi); > + if (ret < 0) > + return ret; > + > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + dsi->link_mmio = devm_ioremap_resource(dsi->dev, mem); You can use devm_platform_ioremap_resource(), here and below. > + if (IS_ERR(dsi->link_mmio)) > + return PTR_ERR(dsi->link_mmio); > + > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + dsi->phy_mmio = devm_ioremap_resource(dsi->dev, mem); > + if (IS_ERR(dsi->phy_mmio)) > + return PTR_ERR(dsi->phy_mmio); > + > + dsi->vclk = devm_clk_get(dsi->dev, "vclk"); > + if (IS_ERR(dsi->vclk)) > + return PTR_ERR(dsi->vclk); > + > + dsi->rstc = devm_reset_control_get(dsi->dev, "rst"); > + if (IS_ERR(dsi->rstc)) > + return dev_err_probe(dsi->dev, PTR_ERR(dsi->rstc), "failed to get cpg reset\n"); I'd wrap the line after the PTR_ERR(). > + > + dsi->arstc = devm_reset_control_get(dsi->dev, "arst"); > + if (IS_ERR(dsi->arstc)) > + return dev_err_probe(&pdev->dev, PTR_ERR(dsi->arstc), "failed to get cpg reset\n"); Should the error message be different than the previous one ? Otherwise it's hard to tell which reset can't be acquired. > + > + dsi->prstc = devm_reset_control_get(dsi->dev, "prst"); > + if (IS_ERR(dsi->arstc)) s/arstc/prstc/ > + return dev_err_probe(dsi->dev, PTR_ERR(dsi->prstc), "failed to get cpg reset\n"); > + > + pm_runtime_enable(dsi->dev); > + > + /* Init host device */ > + dsi->host.dev = dsi->dev; > + dsi->host.ops = &rzg2l_mipi_dsi_host_ops; > + ret = mipi_dsi_host_register(&dsi->host); > + if (ret < 0) > + goto out_pm_get; > + > + return 0; > +out_pm_get: > + pm_runtime_disable(dsi->dev); > + reset_control_assert(dsi->rstc); > + reset_control_assert(dsi->arstc); > + reset_control_assert(dsi->prstc); The reset line hasn't been deasserted in probe(), does it need to be asserted in the error path here ? > + return ret; > +} > + > +static int rzg2l_mipi_dsi_remove(struct platform_device *pdev) > +{ > + struct rzg2l_mipi_dsi *dsi = platform_get_drvdata(pdev); > + > + mipi_dsi_host_unregister(&dsi->host); > + pm_runtime_disable(&pdev->dev); > + reset_control_assert(dsi->rstc); > + reset_control_assert(dsi->arstc); > + reset_control_assert(dsi->prstc); Same here, I don't think this is needed. > + return 0; > +} > + > +static const struct of_device_id rzg2l_mipi_dsi_of_table[] = { > + { .compatible = "renesas,r9a07g044-mipi-dsi" }, > + { /* sentinel */ } > +}; > + > +static struct platform_driver rzg2l_mipi_dsi_platform_driver = { > + .driver = { > + .name = "rzg2l-mipi-dsi", > + .of_match_table = rzg2l_mipi_dsi_of_table, > + }, > + .probe = rzg2l_mipi_dsi_probe, > + .remove = rzg2l_mipi_dsi_remove, > +}; > + > +module_platform_driver(rzg2l_mipi_dsi_platform_driver); > + > +MODULE_AUTHOR("Biju Das <biju.das.jz@bp.renesas.com"); > +MODULE_DESCRIPTION("Renesas RZ/G2L MIPI DSI Encoder Driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h > new file mode 100644 > index 000000000000..bf81187388bd > --- /dev/null > +++ b/drivers/gpu/drm/rcar-du/rzg2l_mipi_dsi_regs.h > @@ -0,0 +1,151 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * RZ/G2L MIPI DSI Interface Registers Definitions > + * > + * Copyright (C) 2021 Renesas Electronics Corporation > + */ > + > +#ifndef __RZG2L_MIPI_DSI_REGS_H__ > +#define __RZG2L_MIPI_DSI_REGS_H__ > + > +/* DPHY Registers */ > +#define DSIDPHYCTRL0 0x00 > +#define DSIDPHYCTRL0_CAL_EN_HSRX_OFS BIT(16) > +#define DSIDPHYCTRL0_CMN_MASTER_EN BIT(8) > +#define DSIDPHYCTRL0_RE_VDD_DETVCCQLV18 BIT(2) > +#define DSIDPHYCTRL0_EN_LDO1200 BIT(1) > +#define DSIDPHYCTRL0_EN_BGR BIT(0) > + > +#define DSIDPHYTIM0 0x04 > +#define DSIDPHYTIM0_TCLK_MISS(x) ((x) << 24) > +#define DSIDPHYTIM0_T_INIT(x) ((x) << 0) > + > +#define DSIDPHYTIM1 0x08 > +#define DSIDPHYTIM1_THS_PREPARE(x) ((x) << 24) > +#define DSIDPHYTIM1_TCLK_PREPARE(x) ((x) << 16) > +#define DSIDPHYTIM1_THS_SETTLE(x) ((x) << 8) > +#define DSIDPHYTIM1_TCLK_SETTLE(x) ((x) << 0) > + > +#define DSIDPHYTIM2 0x0C Some hex constants are upper case, some are lower case. Could you make that consistent ? I personally prefer lower case, and that matches the style of drivers in this directory. > +#define DSIDPHYTIM2_TCLK_TRAIL(x) ((x) << 24) > +#define DSIDPHYTIM2_TCLK_POST(x) ((x) << 16) > +#define DSIDPHYTIM2_TCLK_PRE(x) ((x) << 8) > +#define DSIDPHYTIM2_TCLK_ZERO(x) ((x) << 0) > + > +#define DSIDPHYTIM3 0x10 > +#define DSIDPHYTIM3_TLPX(x) ((x) << 24) > +#define DSIDPHYTIM3_THS_EXIT(x) ((x) << 16) > +#define DSIDPHYTIM3_THS_TRAIL(x) ((x) << 8) > +#define DSIDPHYTIM3_THS_ZERO(x) ((x) << 0) > + > +/* --------------------------------------------------------*/ > +/* Link Registers */ > +/* Link Status Register */ > +#define LINKSR 0x10 > +#define LINKSR_LPBUSY BIT(13) > +#define LINKSR_HSBUSY BIT(12) > +#define LINKSR_VICHRUN1 BIT(8) > +#define LINKSR_SQCHRUN1 BIT(4) > +#define LINKSR_SQCHRUN0 BIT(0) > + > +/* Tx Set Register */ > +#define TXSETR 0x100 > +#define TXSETR_NUMLANECAP (0x3 << 16) > +#define TXSETR_DLEN BIT(9) > +#define TXSETR_CLEN BIT(8) > +#define TXSETR_NUMLANEUSE(x) (((x) & 0x3) << 0) > + > +/* HS Clock Set Register */ > +#define HSCLKSETR 0x104 > +#define HSCLKSETR_HSCLKMODE_CONT BIT(1) > +#define HSCLKSETR_HSCLKMODE_NON_CONT (0 << 1) > +#define HSCLKSETR_HSCLKRUN_HS BIT(0) > +#define HSCLKSETR_HSCLKRUN_LP (0 << 0) > + > +/* Reset Control Register */ > +#define RSTCR 0x110 > +#define RSTCR_SWRST BIT(0) > +#define RSTCR_FCETXSTP BIT(16) > + > +/* Reset Status Register */ > +#define RSTSR 0x114 > +#define RSTSR_DL0DIR BIT(15) > +#define RSTSR_DLSTPST (0xf << 8) > +#define RSTSR_SWRSTV1 BIT(4) > +#define RSTSR_SWRSTIB BIT(3) > +#define RSTSR_SWRSTAPB BIT(2) > +#define RSTSR_SWRSTLP BIT(1) > +#define RSTSR_SWRSTHS BIT(0) > + > +/* Clock Lane Stop Time Set Register */ > +#define CLSTPTSETR 0x314 > +#define CLSTPTSETR_CLKKPT(x) ((x) << 24) > +#define CLSTPTSETR_CLKBFHT(x) ((x) << 16) > +#define CLSTPTSETR_CLKSTPT(x) ((x) << 2) > + > +/* LP Transition Time Set Register */ > +#define LPTRNSTSETR 0x318 > +#define LPTRNSTSETR_GOLPBKT(x) ((x) << 0) > + > +/* Physical Lane Status Register */ > +#define PLSR 0x320 > +#define PLSR_CLHS2LP BIT(27) > +#define PLSR_CLLP2HS BIT(26) > + > +/* Video-Input Channel 1 Set 0 Register */ > +#define VICH1SET0R 0x400 > +#define VICH1SET0R_VSEN BIT(12) > +#define VICH1SET0R_HFPNOLP BIT(10) > +#define VICH1SET0R_HBPNOLP BIT(9) > +#define VICH1SET0R_HSANOLP BIT(8) > +#define VICH1SET0R_VSTPAFT BIT(1) > +#define VICH1SET0R_VSTART BIT(0) > + > +/* Video-Input Channel 1 Set 1 Register */ > +#define VICH1SET1R 0x404 > +#define VICH1SET1R_DLY(x) (((x) & 0xfff) << 2) > + > +/* Video-Input Channel 1 Status Register */ > +#define VICH1SR 0x410 > +#define VICH1SR_VIRDY BIT(3) > +#define VICH1SR_RUNNING BIT(2) > +#define VICH1SR_STOP BIT(1) > +#define VICH1SR_START BIT(0) > + > +/* Video-Input Channel 1 Pixel Packet Set Register */ > +#define VICH1PPSETR 0x420 > +#define VICH1PPSETR_DT_RGB16 (0x0E << 16) > +#define VICH1PPSETR_DT_RGB18 (0x1E << 16) > +#define VICH1PPSETR_DT_RGB18_LS (0x2E << 16) > +#define VICH1PPSETR_DT_RGB24 (0x3E << 16) > +#define VICH1PPSETR_DT_YCbCr16 (0x2C << 16) > +#define VICH1PPSETR_DT_YCbCr20_LS (0x0C << 16) > +#define VICH1PPSETR_DT_YCbCr24 (0x1C << 16) > +#define VICH1PPSETR_TXESYNC_PULSE BIT(15) > +#define VICH1PPSETR_VC(x) ((x) << 22) > + > +/* Video-Input Channel 1 Vertical Size Set Register */ > +#define VICH1VSSETR 0x428 > +#define VICH1VSSETR_VACTIVE(x) (((x) & 0x7fff) << 16) > +#define VICH1VSSETR_VSPOL_LOW BIT(15) > +#define VICH1VSSETR_VSPOL_HIGH (0 << 15) > +#define VICH1VSSETR_VSA(x) (((x) & 0xfff) << 0) > + > +/* Video-Input Channel 1 Vertical Porch Set Register */ > +#define VICH1VPSETR 0x42C > +#define VICH1VPSETR_VFP(x) (((x) & 0x1fff) << 16) > +#define VICH1VPSETR_VBP(x) (((x) & 0x1fff) << 0) > + > +/* Video-Input Channel 1 Horizontal Size Set Register */ > +#define VICH1HSSETR 0x430 > +#define VICH1HSSETR_HACTIVE(x) (((x) & 0x7fff) << 16) > +#define VICH1HSSETR_HSPOL_LOW BIT(15) > +#define VICH1HSSETR_HSPOL_HIGH (0 << 15) > +#define VICH1HSSETR_HSA(x) (((x) & 0xfff) << 0) > + > +/* Video-Input Channel 1 Horizontal Porch Set Register */ > +#define VICH1HPSETR 0x434 > +#define VICH1HPSETR_HFP(x) (((x) & 0x1fff) << 16) > +#define VICH1HPSETR_HBP(x) (((x) & 0x1fff) << 0) > + > +#endif /* __RZG2L_MIPI_DSI_REGS_H__ */ -- Regards, Laurent Pinchart
next prev parent reply other threads:[~2022-01-23 13:51 UTC|newest] Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-12 17:45 [RFC 00/28] Add RZ/G2L Display support Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-12 17:45 ` [RFC 01/28] clk: renesas: rzg2l: Add FOUTPOSTDIV clk support Biju Das 2022-01-12 21:37 ` kernel test robot 2022-01-13 9:40 ` kernel test robot 2022-01-13 9:40 ` kernel test robot 2022-02-01 11:44 ` Geert Uytterhoeven 2022-03-18 10:21 ` Biju Das 2022-01-12 17:45 ` [RFC 02/28] clk: renesas: rzg2l: Add PLL5_4 clk mux support Biju Das 2022-02-01 14:33 ` Geert Uytterhoeven 2022-03-18 10:28 ` Biju Das 2022-01-12 17:45 ` [RFC 03/28] clk: renesas: rzg2l: Add DSI divider clk support Biju Das 2022-01-12 17:45 ` [RFC 04/28] clk: renesas: r9a07g044: Add M1 clock support Biju Das 2022-02-01 14:36 ` Geert Uytterhoeven 2022-03-18 10:29 ` Biju Das 2022-01-12 17:45 ` [RFC 05/28] clk: renesas: r9a07g044: Add {M2, M2_DIV2} Clocks support Biju Das 2022-02-01 9:19 ` Geert Uytterhoeven 2022-01-12 17:45 ` [RFC 06/28] clk: renesas: r9a07g044: Add M3 Clock support Biju Das 2022-02-01 9:19 ` Geert Uytterhoeven 2022-01-12 17:45 ` [RFC 07/28] clk: renesas: r9a07g044: Add M4 " Biju Das 2022-02-01 9:19 ` Geert Uytterhoeven 2022-01-12 17:45 ` [RFC 08/28] clk: renesas: r9a07g044: Add LCDC clock and reset entries Biju Das 2022-02-01 9:19 ` Geert Uytterhoeven 2022-01-12 17:45 ` [RFC 09/28] clk: renesas: r9a07g044: Add DSI " Biju Das 2022-02-01 9:21 ` Geert Uytterhoeven 2022-01-12 17:45 ` [RFC 10/28] drm: rcar-du: of: Increase buff size for compatible variable Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-14 10:17 ` Geert Uytterhoeven 2022-01-14 10:17 ` Geert Uytterhoeven 2022-01-14 12:54 ` Biju Das 2022-01-14 12:54 ` Biju Das 2022-01-23 13:52 ` Laurent Pinchart 2022-01-23 13:52 ` Laurent Pinchart 2022-01-24 8:18 ` Geert Uytterhoeven 2022-01-24 8:18 ` Geert Uytterhoeven 2022-01-26 0:53 ` Laurent Pinchart 2022-01-26 0:53 ` Laurent Pinchart 2022-01-26 6:55 ` Biju Das 2022-01-26 6:55 ` Biju Das 2022-01-12 17:45 ` [RFC 11/28] drm: rcar-du: Add num_rpf to struct rcar_du_device_info Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-23 13:55 ` Laurent Pinchart 2022-01-23 13:55 ` Laurent Pinchart 2022-03-13 10:12 ` Biju Das 2022-03-13 10:12 ` Biju Das 2022-01-12 17:45 ` [RFC 12/28] drm: rcar-du: Add max_width and max_height " Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-12 17:45 ` [RFC 13/28] drm: rcar-du: Add RCAR_DU_FEATURE_PLANE feature bit Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-12 17:45 ` [RFC 14/28] drm: rcar-du: Allow DU plane feature based on DU " Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-12 17:45 ` [RFC 15/28] drm: rcar_du: Add RCAR_DU_FEATURE_GROUP " Biju Das 2022-01-12 17:45 ` Biju Das 2022-01-12 17:46 ` [RFC 16/28] drm: rcar-du: Allow DU group feature based on " Biju Das 2022-01-12 17:46 ` Biju Das 2022-01-23 13:57 ` Laurent Pinchart 2022-01-23 13:57 ` Laurent Pinchart 2022-01-12 17:46 ` [RFC 17/28] dt-bindings: display: renesas,du: Document r9a07g044l bindings Biju Das 2022-01-12 17:46 ` [RFC 17/28] dt-bindings: display: renesas, du: " Biju Das 2022-01-22 1:01 ` [RFC 17/28] dt-bindings: display: renesas,du: " Rob Herring 2022-01-22 1:01 ` Rob Herring 2022-01-22 11:20 ` Biju Das 2022-01-22 11:20 ` [RFC 17/28] dt-bindings: display: renesas, du: " Biju Das 2022-01-12 17:46 ` [RFC 18/28] drm: rcar-du: Add RZ/G2L LCDC Support Biju Das 2022-01-12 17:46 ` Biju Das 2022-01-23 1:35 ` Laurent Pinchart 2022-01-23 1:35 ` Laurent Pinchart 2022-03-08 18:54 ` Biju Das 2022-03-08 18:54 ` Biju Das 2022-01-12 17:46 ` [RFC 19/28] media: dt-bindings: media: renesas,vsp1: Document RZ/{G2L,V2L} VSPD bindings Biju Das 2022-01-22 1:02 ` Rob Herring 2022-01-22 11:23 ` Biju Das 2022-01-23 0:14 ` Laurent Pinchart 2022-01-23 14:47 ` Biju Das 2022-01-12 17:46 ` [RFC 20/28] media: vsp1: Add support for the RZ/G2L VSPD Biju Das 2022-01-23 1:26 ` Laurent Pinchart 2022-01-23 15:20 ` Biju Das 2022-01-24 8:06 ` Geert Uytterhoeven 2022-03-08 19:18 ` Biju Das 2022-01-12 17:46 ` [RFC 21/28] dt-bindings: display: bridge: Document RZ/G2L MIPI DSI TX bindings Biju Das 2022-01-12 17:46 ` Biju Das 2022-01-22 1:05 ` Rob Herring 2022-01-22 1:05 ` Rob Herring 2022-01-22 11:19 ` Biju Das 2022-01-22 11:19 ` Biju Das 2022-01-12 17:46 ` [RFC 22/28] drm: rcar-du: Add RZ/G2L DSI driver Biju Das 2022-01-12 17:46 ` Biju Das 2022-01-14 10:24 ` Geert Uytterhoeven 2022-01-14 10:24 ` Geert Uytterhoeven 2022-01-14 12:48 ` Biju Das 2022-01-14 12:48 ` Biju Das 2022-01-14 10:28 ` Philipp Zabel 2022-01-14 10:28 ` Philipp Zabel 2022-01-14 12:49 ` Biju Das 2022-01-14 12:49 ` Biju Das 2022-01-23 13:51 ` Laurent Pinchart [this message] 2022-01-23 13:51 ` Laurent Pinchart 2022-03-14 14:33 ` Biju Das 2022-03-14 14:33 ` Biju Das 2022-01-12 17:46 ` [RFC 23/28] arm64: dts: renesas: r9a07g044: Add fcpvd node Biju Das 2022-01-13 9:47 ` Sergey Shtylyov 2022-01-12 17:46 ` [RFC 24/28] arm64: dts: renesas: r9a07g044: Add vspd node Biju Das 2022-01-13 9:46 ` Sergey Shtylyov 2022-01-12 17:46 ` [RFC 25/28] arm64: dts: renesas: r9a07g044: Add DU node Biju Das 2022-01-12 17:46 ` [RFC 26/28] arm64: dts: renesas: r9a07g044: Add dsi node Biju Das 2022-01-12 17:46 ` [RFC 27/28] arm64: dts: renesas: r9a07g044: Link DSI with DU node Biju Das 2022-01-12 17:46 ` [RFC 28/28] arm64: dts: renesas: rzg2l-smarc: Enable Display on carrier board Biju Das 2022-02-01 15:52 ` Geert Uytterhoeven
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=Ye1dRA0s2qKfOwMt@pendragon.ideasonboard.com \ --to=laurent.pinchart@ideasonboard.com \ --cc=Chris.Paterson2@renesas.com \ --cc=airlied@linux.ie \ --cc=biju.das.jz@bp.renesas.com \ --cc=biju.das@bp.renesas.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=geert+renesas@glider.be \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=p.zabel@pengutronix.de \ --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.