- Renesas RZ/G2L DSI support

- Renesas DU Kconfig cleanup
 - Xilinx DPSUB fix
 -----BEGIN PGP SIGNATURE-----
 
 iJgEABYKAEAWIQTAnvhxs4J7QT+XHKnMPy2AAyfeZAUCY2u+UCIcbGF1cmVudC5w
 aW5jaGFydEBpZGVhc29uYm9hcmQuY29tAAoJEMw/LYADJ95ktUcBANNFdGppwfyW
 u7C2iJjUjBseeRbSJdHRWIfkQybucCNaAP4iFfIAY+/3SAtRPrA+h5yzwyWJ20/B
 EJyRqb6m7sF+Cw==
 =57a4
 -----END PGP SIGNATURE-----

Merge tag 'drm-next-20221109' of git://linuxtv.org/pinchartl/media into drm-next

- Renesas RZ/G2L DSI support
- Renesas DU Kconfig cleanup
- Xilinx DPSUB fix

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y2u+mhkPJQ4de3q5@pendragon.ideasonboard.com
This commit is contained in:
Dave Airlie 2022-11-15 17:20:30 +10:00
commit 3076e09f36
6 changed files with 1163 additions and 5 deletions

View File

@ -0,0 +1,182 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/bridge/renesas,dsi.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Renesas RZ/G2L MIPI DSI Encoder
maintainers:
- Biju Das <biju.das.jz@bp.renesas.com>
description: |
This binding describes the MIPI DSI encoder embedded in the Renesas
RZ/G2L alike family of SoC's. The encoder can operate in DSI mode, with
up to four data lanes.
allOf:
- $ref: /schemas/display/dsi-controller.yaml#
properties:
compatible:
items:
- enum:
- renesas,r9a07g044-mipi-dsi # RZ/G2{L,LC}
- const: renesas,rzg2l-mipi-dsi
reg:
maxItems: 1
interrupts:
items:
- description: Sequence operation channel 0 interrupt
- description: Sequence operation channel 1 interrupt
- description: Video-Input operation channel 1 interrupt
- description: DSI Packet Receive interrupt
- description: DSI Fatal Error interrupt
- description: DSI D-PHY PPI interrupt
- description: Debug interrupt
interrupt-names:
items:
- const: seq0
- const: seq1
- const: vin1
- const: rcv
- const: ferr
- const: ppi
- const: debug
clocks:
items:
- description: DSI D-PHY PLL multiplied clock
- description: DSI D-PHY system clock
- description: DSI AXI bus clock
- description: DSI Register access clock
- description: DSI Video clock
- description: DSI D-PHY Escape mode transmit clock
clock-names:
items:
- const: pllclk
- const: sysclk
- const: aclk
- const: pclk
- const: vclk
- const: lpclk
resets:
items:
- description: MIPI_DSI_CMN_RSTB
- description: MIPI_DSI_ARESET_N
- description: MIPI_DSI_PRESET_N
reset-names:
items:
- const: rst
- const: arst
- const: prst
power-domains:
maxItems: 1
ports:
$ref: /schemas/graph.yaml#/properties/ports
properties:
port@0:
$ref: /schemas/graph.yaml#/properties/port
description: Parallel input port
port@1:
$ref: /schemas/graph.yaml#/$defs/port-base
unevaluatedProperties: false
description: DSI output port
properties:
endpoint:
$ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false
properties:
data-lanes:
description: array of physical DSI data lane indexes.
minItems: 1
items:
- const: 1
- const: 2
- const: 3
- const: 4
required:
- data-lanes
required:
- port@0
- port@1
required:
- compatible
- reg
- interrupts
- interrupt-names
- clocks
- clock-names
- resets
- reset-names
- power-domains
- ports
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/r9a07g044-cpg.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
dsi0: dsi@10850000 {
compatible = "renesas,r9a07g044-mipi-dsi", "renesas,rzg2l-mipi-dsi";
reg = <0x10850000 0x20000>;
interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "seq0", "seq1", "vin1", "rcv",
"ferr", "ppi", "debug";
clocks = <&cpg CPG_MOD R9A07G044_MIPI_DSI_PLLCLK>,
<&cpg CPG_MOD R9A07G044_MIPI_DSI_SYSCLK>,
<&cpg CPG_MOD R9A07G044_MIPI_DSI_ACLK>,
<&cpg CPG_MOD R9A07G044_MIPI_DSI_PCLK>,
<&cpg CPG_MOD R9A07G044_MIPI_DSI_VCLK>,
<&cpg CPG_MOD R9A07G044_MIPI_DSI_LPCLK>;
clock-names = "pllclk", "sysclk", "aclk", "pclk", "vclk", "lpclk";
resets = <&cpg R9A07G044_MIPI_DSI_CMN_RSTB>,
<&cpg R9A07G044_MIPI_DSI_ARESET_N>,
<&cpg R9A07G044_MIPI_DSI_PRESET_N>;
reset-names = "rst", "arst", "prst";
power-domains = <&cpg>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
dsi0_in: endpoint {
remote-endpoint = <&du_out_dsi0>;
};
};
port@1 {
reg = <1>;
dsi0_out: endpoint {
data-lanes = <1 2 3 4>;
remote-endpoint = <&adv7535_in>;
};
};
};
};
...

View File

@ -41,8 +41,6 @@ config DRM_RCAR_LVDS
depends on DRM_RCAR_USE_LVDS
select DRM_KMS_HELPER
select DRM_PANEL
select OF_FLATTREE
select OF_OVERLAY
config DRM_RCAR_MIPI_DSI
tristate "R-Car DU MIPI DSI Encoder Support"
@ -51,6 +49,14 @@ 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_BRIDGE && OF
depends on ARCH_RENESAS || COMPILE_TEST
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

View File

@ -14,3 +14,5 @@ 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

View File

@ -0,0 +1,816 @@
// SPDX-License-Identifier: GPL-2.0
/*
* RZ/G2L MIPI DSI Encoder Driver
*
* Copyright (C) 2022 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 *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;
};
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);
}
struct rzg2l_mipi_dsi_timings {
unsigned long hsfreq_max;
u32 t_init;
u32 tclk_prepare;
u32 ths_prepare;
u32 tclk_zero;
u32 tclk_pre;
u32 tclk_post;
u32 tclk_trail;
u32 ths_zero;
u32 ths_trail;
u32 ths_exit;
u32 tlpx;
};
static const struct rzg2l_mipi_dsi_timings rzg2l_mipi_dsi_global_timings[] = {
{
.hsfreq_max = 80000,
.t_init = 79801,
.tclk_prepare = 8,
.ths_prepare = 13,
.tclk_zero = 33,
.tclk_pre = 24,
.tclk_post = 94,
.tclk_trail = 10,
.ths_zero = 23,
.ths_trail = 17,
.ths_exit = 13,
.tlpx = 6,
},
{
.hsfreq_max = 125000,
.t_init = 79801,
.tclk_prepare = 8,
.ths_prepare = 12,
.tclk_zero = 33,
.tclk_pre = 15,
.tclk_post = 94,
.tclk_trail = 10,
.ths_zero = 23,
.ths_trail = 17,
.ths_exit = 13,
.tlpx = 6,
},
{
.hsfreq_max = 250000,
.t_init = 79801,
.tclk_prepare = 8,
.ths_prepare = 12,
.tclk_zero = 33,
.tclk_pre = 13,
.tclk_post = 94,
.tclk_trail = 10,
.ths_zero = 23,
.ths_trail = 16,
.ths_exit = 13,
.tlpx = 6,
},
{
.hsfreq_max = 360000,
.t_init = 79801,
.tclk_prepare = 8,
.ths_prepare = 10,
.tclk_zero = 33,
.tclk_pre = 4,
.tclk_post = 35,
.tclk_trail = 7,
.ths_zero = 16,
.ths_trail = 9,
.ths_exit = 13,
.tlpx = 6,
},
{
.hsfreq_max = 720000,
.t_init = 79801,
.tclk_prepare = 8,
.ths_prepare = 9,
.tclk_zero = 33,
.tclk_pre = 4,
.tclk_post = 35,
.tclk_trail = 7,
.ths_zero = 16,
.ths_trail = 9,
.ths_exit = 13,
.tlpx = 6,
},
{
.hsfreq_max = 1500000,
.t_init = 79801,
.tclk_prepare = 8,
.ths_prepare = 9,
.tclk_zero = 33,
.tclk_pre = 4,
.tclk_post = 35,
.tclk_trail = 7,
.ths_zero = 16,
.ths_trail = 9,
.ths_exit = 13,
.tlpx = 6,
},
};
static void rzg2l_mipi_dsi_phy_write(struct rzg2l_mipi_dsi *dsi, u32 reg, u32 data)
{
iowrite32(data, dsi->mmio + reg);
}
static void rzg2l_mipi_dsi_link_write(struct rzg2l_mipi_dsi *dsi, u32 reg, u32 data)
{
iowrite32(data, dsi->mmio + LINK_REG_OFFSET + reg);
}
static u32 rzg2l_mipi_dsi_phy_read(struct rzg2l_mipi_dsi *dsi, u32 reg)
{
return ioread32(dsi->mmio + reg);
}
static u32 rzg2l_mipi_dsi_link_read(struct rzg2l_mipi_dsi *dsi, u32 reg)
{
return ioread32(dsi->mmio + LINK_REG_OFFSET + reg);
}
/* -----------------------------------------------------------------------------
* Hardware Setup
*/
static int rzg2l_mipi_dsi_dphy_init(struct rzg2l_mipi_dsi *dsi,
unsigned long hsfreq)
{
const struct rzg2l_mipi_dsi_timings *dphy_timings;
unsigned int i;
u32 dphyctrl0;
u32 dphytim0;
u32 dphytim1;
u32 dphytim2;
u32 dphytim3;
int ret;
/* All DSI global operation timings are set with recommended setting */
for (i = 0; i < ARRAY_SIZE(rzg2l_mipi_dsi_global_timings); ++i) {
dphy_timings = &rzg2l_mipi_dsi_global_timings[i];
if (hsfreq <= dphy_timings->hsfreq_max)
break;
}
/* Initializing DPHY before accessing LINK */
dphyctrl0 = DSIDPHYCTRL0_CAL_EN_HSRX_OFS | DSIDPHYCTRL0_CMN_MASTER_EN |
DSIDPHYCTRL0_RE_VDD_DETVCCQLV18 | DSIDPHYCTRL0_EN_BGR;
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYCTRL0, dphyctrl0);
usleep_range(20, 30);
dphyctrl0 |= DSIDPHYCTRL0_EN_LDO1200;
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYCTRL0, dphyctrl0);
usleep_range(10, 20);
dphytim0 = DSIDPHYTIM0_TCLK_MISS(0) |
DSIDPHYTIM0_T_INIT(dphy_timings->t_init);
dphytim1 = DSIDPHYTIM1_THS_PREPARE(dphy_timings->ths_prepare) |
DSIDPHYTIM1_TCLK_PREPARE(dphy_timings->tclk_prepare) |
DSIDPHYTIM1_THS_SETTLE(0) |
DSIDPHYTIM1_TCLK_SETTLE(0);
dphytim2 = DSIDPHYTIM2_TCLK_TRAIL(dphy_timings->tclk_trail) |
DSIDPHYTIM2_TCLK_POST(dphy_timings->tclk_post) |
DSIDPHYTIM2_TCLK_PRE(dphy_timings->tclk_pre) |
DSIDPHYTIM2_TCLK_ZERO(dphy_timings->tclk_zero);
dphytim3 = DSIDPHYTIM3_TLPX(dphy_timings->tlpx) |
DSIDPHYTIM3_THS_EXIT(dphy_timings->ths_exit) |
DSIDPHYTIM3_THS_TRAIL(dphy_timings->ths_trail) |
DSIDPHYTIM3_THS_ZERO(dphy_timings->ths_zero);
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYTIM0, dphytim0);
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYTIM1, dphytim1);
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYTIM2, dphytim2);
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYTIM3, dphytim3);
ret = reset_control_deassert(dsi->rstc);
if (ret < 0)
return ret;
udelay(1);
return 0;
}
static void rzg2l_mipi_dsi_dphy_exit(struct rzg2l_mipi_dsi *dsi)
{
u32 dphyctrl0;
dphyctrl0 = rzg2l_mipi_dsi_phy_read(dsi, DSIDPHYCTRL0);
dphyctrl0 &= ~(DSIDPHYCTRL0_EN_LDO1200 | DSIDPHYCTRL0_EN_BGR);
rzg2l_mipi_dsi_phy_write(dsi, DSIDPHYCTRL0, dphyctrl0);
reset_control_assert(dsi->rstc);
}
static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi *dsi,
const struct drm_display_mode *mode)
{
unsigned long hsfreq;
unsigned int bpp;
u32 txsetr;
u32 clstptsetr;
u32 lptrnstsetr;
u32 clkkpt;
u32 clkbfht;
u32 clkstpt;
u32 golpbkt;
int ret;
/*
* 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);
ret = pm_runtime_resume_and_get(dsi->dev);
if (ret < 0)
return ret;
clk_set_rate(dsi->vclk, mode->clock * 1000);
ret = rzg2l_mipi_dsi_dphy_init(dsi, hsfreq);
if (ret < 0)
goto err_phy;
/* Enable Data lanes and Clock lanes */
txsetr = TXSETR_DLEN | TXSETR_NUMLANEUSE(dsi->lanes - 1) | TXSETR_CLEN;
rzg2l_mipi_dsi_link_write(dsi, 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_link_write(dsi, CLSTPTSETR, clstptsetr);
lptrnstsetr = LPTRNSTSETR_GOLPBKT(golpbkt);
rzg2l_mipi_dsi_link_write(dsi, LPTRNSTSETR, lptrnstsetr);
return 0;
err_phy:
rzg2l_mipi_dsi_dphy_exit(dsi);
pm_runtime_put(dsi->dev);
return ret;
}
static void rzg2l_mipi_dsi_stop(struct rzg2l_mipi_dsi *dsi)
{
rzg2l_mipi_dsi_dphy_exit(dsi);
pm_runtime_put(dsi->dev);
}
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];
u8 index;
/* 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;
}
if ((dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) &&
!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST))
vich1ppsetr |= VICH1PPSETR_TXESYNC_PULSE;
rzg2l_mipi_dsi_link_write(dsi, 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_link_write(dsi, VICH1VSSETR, vich1vssetr);
rzg2l_mipi_dsi_link_write(dsi, VICH1VPSETR, vich1vpsetr);
rzg2l_mipi_dsi_link_write(dsi, VICH1HSSETR, vich1hssetr);
rzg2l_mipi_dsi_link_write(dsi, VICH1HPSETR, vich1hpsetr);
/*
* 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;
}
if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)
index = 0;
else
index = 1;
rzg2l_mipi_dsi_link_write(dsi, VICH1SET1R,
VICH1SET1R_DLY(delay[index]));
}
static int rzg2l_mipi_dsi_start_hs_clock(struct rzg2l_mipi_dsi *dsi)
{
bool is_clk_cont;
u32 hsclksetr;
u32 status;
int ret;
is_clk_cont = !(dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS);
/* Start HS clock */
hsclksetr = HSCLKSETR_HSCLKRUN_HS | (is_clk_cont ?
HSCLKSETR_HSCLKMODE_CONT :
HSCLKSETR_HSCLKMODE_NON_CONT);
rzg2l_mipi_dsi_link_write(dsi, HSCLKSETR, hsclksetr);
if (is_clk_cont) {
ret = read_poll_timeout(rzg2l_mipi_dsi_link_read, status,
status & PLSR_CLLP2HS,
2000, 20000, false, dsi, 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",
is_clk_cont ? "continuous" : "non-continuous");
return 0;
}
static int rzg2l_mipi_dsi_stop_hs_clock(struct rzg2l_mipi_dsi *dsi)
{
bool is_clk_cont;
u32 status;
int ret;
is_clk_cont = !(dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS);
/* Stop HS clock */
rzg2l_mipi_dsi_link_write(dsi, HSCLKSETR,
is_clk_cont ? HSCLKSETR_HSCLKMODE_CONT :
HSCLKSETR_HSCLKMODE_NON_CONT);
if (is_clk_cont) {
ret = read_poll_timeout(rzg2l_mipi_dsi_link_read, status,
status & PLSR_CLHS2LP,
2000, 20000, false, dsi, 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_link_write(dsi, VICH1SET0R, vich1set0r);
ret = read_poll_timeout(rzg2l_mipi_dsi_link_read, status,
status & VICH1SR_VIRDY,
2000, 20000, false, dsi, VICH1SR);
if (ret < 0)
dev_err(dsi->dev, "Failed to start video signal input\n");
return ret;
}
static int rzg2l_mipi_dsi_stop_video(struct rzg2l_mipi_dsi *dsi)
{
u32 status;
int ret;
rzg2l_mipi_dsi_link_write(dsi, VICH1SET0R, VICH1SET0R_VSTPAFT);
ret = read_poll_timeout(rzg2l_mipi_dsi_link_read, status,
(status & VICH1SR_STOP) && (!(status & VICH1SR_RUNNING)),
2000, 20000, false, dsi, VICH1SR);
if (ret < 0)
goto err;
ret = read_poll_timeout(rzg2l_mipi_dsi_link_read, status,
!(status & LINKSR_HSBUSY),
2000, 20000, false, dsi, 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)
goto err_stop;
ret = rzg2l_mipi_dsi_start_video(dsi);
if (ret < 0)
goto err_stop_clock;
return;
err_stop_clock:
rzg2l_mipi_dsi_stop_hs_clock(dsi);
err_stop:
rzg2l_mipi_dsi_stop(dsi);
}
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);
rzg2l_mipi_dsi_stop(dsi);
}
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) {
dev_err(dsi->dev,
"Number of lines of device (%u) exceeds host (%u)\n",
device->lanes, dsi->num_data_lanes);
return -EINVAL;
}
switch (mipi_dsi_pixel_format_to_bpp(device->format)) {
case 24:
case 18:
break;
default:
dev_err(dsi->dev, "Unsupported format 0x%04x\n", device->format);
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;
}
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,
};
/* -----------------------------------------------------------------------------
* Power Management
*/
static int __maybe_unused rzg2l_mipi_pm_runtime_suspend(struct device *dev)
{
struct rzg2l_mipi_dsi *dsi = dev_get_drvdata(dev);
reset_control_assert(dsi->prstc);
reset_control_assert(dsi->arstc);
return 0;
}
static int __maybe_unused rzg2l_mipi_pm_runtime_resume(struct device *dev)
{
struct rzg2l_mipi_dsi *dsi = dev_get_drvdata(dev);
int ret;
ret = reset_control_deassert(dsi->arstc);
if (ret < 0)
return ret;
ret = reset_control_deassert(dsi->prstc);
if (ret < 0)
reset_control_assert(dsi->arstc);
return ret;
}
static const struct dev_pm_ops rzg2l_mipi_pm_ops = {
SET_RUNTIME_PM_OPS(rzg2l_mipi_pm_runtime_suspend, rzg2l_mipi_pm_runtime_resume, NULL)
};
/* -----------------------------------------------------------------------------
* Probe & Remove
*/
static int rzg2l_mipi_dsi_probe(struct platform_device *pdev)
{
unsigned int num_data_lanes;
struct rzg2l_mipi_dsi *dsi;
u32 txsetr;
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 = drm_of_get_data_lanes_count_ep(dsi->dev->of_node, 1, 0, 1, 4);
if (ret < 0)
return dev_err_probe(dsi->dev, ret,
"missing or invalid data-lanes property\n");
num_data_lanes = ret;
dsi->mmio = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(dsi->mmio))
return PTR_ERR(dsi->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_exclusive(dsi->dev, "rst");
if (IS_ERR(dsi->rstc))
return dev_err_probe(dsi->dev, PTR_ERR(dsi->rstc),
"failed to get rst\n");
dsi->arstc = devm_reset_control_get_exclusive(dsi->dev, "arst");
if (IS_ERR(dsi->arstc))
return dev_err_probe(&pdev->dev, PTR_ERR(dsi->arstc),
"failed to get arst\n");
dsi->prstc = devm_reset_control_get_exclusive(dsi->dev, "prst");
if (IS_ERR(dsi->prstc))
return dev_err_probe(dsi->dev, PTR_ERR(dsi->prstc),
"failed to get prst\n");
platform_set_drvdata(pdev, dsi);
pm_runtime_enable(dsi->dev);
ret = pm_runtime_resume_and_get(dsi->dev);
if (ret < 0)
goto err_pm_disable;
/*
* TXSETR register can be read only after DPHY init. But during probe
* mode->clock and format are not available. So initialize DPHY with
* timing parameters for 80Mbps.
*/
ret = rzg2l_mipi_dsi_dphy_init(dsi, 80000);
if (ret < 0)
goto err_phy;
txsetr = rzg2l_mipi_dsi_link_read(dsi, TXSETR);
dsi->num_data_lanes = min(((txsetr >> 16) & 3) + 1, num_data_lanes);
rzg2l_mipi_dsi_dphy_exit(dsi);
pm_runtime_put(dsi->dev);
/* Initialize the DRM bridge. */
dsi->bridge.funcs = &rzg2l_mipi_dsi_bridge_ops;
dsi->bridge.of_node = dsi->dev->of_node;
/* 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 err_pm_disable;
return 0;
err_phy:
rzg2l_mipi_dsi_dphy_exit(dsi);
pm_runtime_put(dsi->dev);
err_pm_disable:
pm_runtime_disable(dsi->dev);
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);
return 0;
}
static const struct of_device_id rzg2l_mipi_dsi_of_table[] = {
{ .compatible = "renesas,rzg2l-mipi-dsi" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, rzg2l_mipi_dsi_of_table);
static struct platform_driver rzg2l_mipi_dsi_platform_driver = {
.probe = rzg2l_mipi_dsi_probe,
.remove = rzg2l_mipi_dsi_remove,
.driver = {
.name = "rzg2l-mipi-dsi",
.pm = &rzg2l_mipi_pm_ops,
.of_match_table = rzg2l_mipi_dsi_of_table,
},
};
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");

View File

@ -0,0 +1,151 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* RZ/G2L MIPI DSI Interface Registers Definitions
*
* Copyright (C) 2022 Renesas Electronics Corporation
*/
#ifndef __RZG2L_MIPI_DSI_REGS_H__
#define __RZG2L_MIPI_DSI_REGS_H__
#include <linux/bits.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
#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 */
#define LINK_REG_OFFSET 0x10000
/* 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 (1 << 9)
#define TXSETR_CLEN (1 << 8)
#define TXSETR_NUMLANEUSE(x) (((x) & 0x3) << 0)
/* HS Clock Set Register */
#define HSCLKSETR 0x104
#define HSCLKSETR_HSCLKMODE_CONT (1 << 1)
#define HSCLKSETR_HSCLKMODE_NON_CONT (0 << 1)
#define HSCLKSETR_HSCLKRUN_HS (1 << 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 (1 << 15)
#define RSTSR_DLSTPST (0xf << 8)
#define RSTSR_SWRSTV1 (1 << 4)
#define RSTSR_SWRSTIB (1 << 3)
#define RSTSR_SWRSTAPB (1 << 2)
#define RSTSR_SWRSTLP (1 << 1)
#define RSTSR_SWRSTHS (1 << 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_RGB18 (0x1e << 16)
#define VICH1PPSETR_DT_RGB18_LS (0x2e << 16)
#define VICH1PPSETR_DT_RGB24 (0x3e << 16)
#define VICH1PPSETR_TXESYNC_PULSE (1 << 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 (1 << 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 (1 << 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__ */

View File

@ -1362,9 +1362,10 @@ static void zynqmp_dp_bridge_detach(struct drm_bridge *bridge)
zynqmp_dp_aux_cleanup(dp);
}
static int zynqmp_dp_bridge_mode_valid(struct drm_bridge *bridge,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
static enum drm_mode_status
zynqmp_dp_bridge_mode_valid(struct drm_bridge *bridge,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
{
struct zynqmp_dp *dp = bridge_to_dp(bridge);
int rate;