| Message ID | 20170121163128.22240-25-john@metanate.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Chris Zhong <zyw@rock-chips.com> On 01/22/2017 12:31 AM, John Keeping wrote: > Signed-off-by: John Keeping <john@metanate.com> > --- > Unchanged in v2 > --- > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index 2dafb17e31d2..881bb0c62ca5 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -82,6 +82,7 @@ > #define FRAME_BTA_ACK BIT(14) > #define ENABLE_LOW_POWER (0x3f << 8) > #define ENABLE_LOW_POWER_MASK (0x3f << 8) > +#define VID_MODE_TYPE_NON_BURST_SYNC_EVENTS 0x1 > #define VID_MODE_TYPE_BURST_SYNC_PULSES 0x2 > #define VID_MODE_TYPE_MASK 0x3 > > @@ -286,6 +287,7 @@ struct dw_mipi_dsi { > u32 format; > u16 input_div; > u16 feedback_div; > + unsigned long mode_flags; > > const struct dw_mipi_dsi_plat_data *pdata; > }; > @@ -548,15 +550,10 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, > return -EINVAL; > } > > - if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) || > - !(device->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)) { > - dev_err(dsi->dev, "device mode is unsupported\n"); > - return -EINVAL; > - } > - > dsi->lanes = device->lanes; > dsi->channel = device->channel; > dsi->format = device->format; > + dsi->mode_flags = device->mode_flags; > dsi->panel = of_drm_find_panel(device->dev.of_node); > if (dsi->panel) > return drm_panel_attach(dsi->panel, &dsi->connector); > @@ -713,7 +710,12 @@ static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) > { > u32 val; > > - val = VID_MODE_TYPE_BURST_SYNC_PULSES | ENABLE_LOW_POWER; > + val = ENABLE_LOW_POWER; > + > + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) > + val |= VID_MODE_TYPE_BURST_SYNC_PULSES; > + else if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)) > + val |= VID_MODE_TYPE_NON_BURST_SYNC_EVENTS; > > dsi_write(dsi, DSI_VID_MODE_CFG, val); > }
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 2dafb17e31d2..881bb0c62ca5 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -82,6 +82,7 @@ #define FRAME_BTA_ACK BIT(14) #define ENABLE_LOW_POWER (0x3f << 8) #define ENABLE_LOW_POWER_MASK (0x3f << 8) +#define VID_MODE_TYPE_NON_BURST_SYNC_EVENTS 0x1 #define VID_MODE_TYPE_BURST_SYNC_PULSES 0x2 #define VID_MODE_TYPE_MASK 0x3 @@ -286,6 +287,7 @@ struct dw_mipi_dsi { u32 format; u16 input_div; u16 feedback_div; + unsigned long mode_flags; const struct dw_mipi_dsi_plat_data *pdata; }; @@ -548,15 +550,10 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, return -EINVAL; } - if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) || - !(device->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)) { - dev_err(dsi->dev, "device mode is unsupported\n"); - return -EINVAL; - } - dsi->lanes = device->lanes; dsi->channel = device->channel; dsi->format = device->format; + dsi->mode_flags = device->mode_flags; dsi->panel = of_drm_find_panel(device->dev.of_node); if (dsi->panel) return drm_panel_attach(dsi->panel, &dsi->connector); @@ -713,7 +710,12 @@ static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) { u32 val; - val = VID_MODE_TYPE_BURST_SYNC_PULSES | ENABLE_LOW_POWER; + val = ENABLE_LOW_POWER; + + if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) + val |= VID_MODE_TYPE_BURST_SYNC_PULSES; + else if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)) + val |= VID_MODE_TYPE_NON_BURST_SYNC_EVENTS; dsi_write(dsi, DSI_VID_MODE_CFG, val); }
Signed-off-by: John Keeping <john@metanate.com> --- Unchanged in v2 --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)