This replaces OMAP specific enum for pixel format with common implementation.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 49 +++++++------------ drivers/gpu/drm/omapdrm/dss/omapdss.h | 10 +--- 3 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index c3ddf98f4ec6..9214d66cfdc7 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -595,7 +595,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata) int r; struct omap_dss_dsi_config dsi_config = { .mode = OMAP_DSS_DSI_CMD_MODE, - .pixel_format = OMAP_DSS_DSI_FMT_RGB888, + .pixel_format = MIPI_DSI_FMT_RGB888, .vm = &ddata->vm, .hs_clk_min = 150000000, .hs_clk_max = 300000000, diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 8e3664368c4f..fa81fbf3442e 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -34,6 +34,7 @@ #include <linux/sys_soc.h>

#include <video/mipi_display.h> +#include <drm/drm_mipi_dsi.h>

#include "omapdss.h" #include "dss.h" @@ -410,7 +411,7 @@ struct dsi_data {

struct dss_lcd_mgr_config mgr_config; struct videomode vm; - enum omap_dss_dsi_pixel_format pix_fmt; + enum mipi_dsi_pixel_format pix_fmt; enum omap_dss_dsi_mode mode; struct omap_dss_dsi_videomode_timings vm_timings;

@@ -514,22 +515,6 @@ static inline bool wait_for_bit_change(struct dsi_data *dsi, return false; }

-static u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt) -{ - switch (fmt) { - case OMAP_DSS_DSI_FMT_RGB888: - case OMAP_DSS_DSI_FMT_RGB666: - return 24; - case OMAP_DSS_DSI_FMT_RGB666_PACKED: - return 18; - case OMAP_DSS_DSI_FMT_RGB565: - return 16; - default: - BUG(); - return 0; - } -} - #ifdef DSI_PERF_MEASURE static void dsi_perf_mark_setup(struct dsi_data *dsi) { @@ -3239,7 +3224,7 @@ static void dsi_config_vp_num_line_buffers(struct dsi_data *dsi) int num_line_buffers;

if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) { - int bpp = dsi_get_pixel_size(dsi->pix_fmt); + int bpp = mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt); const struct videomode *vm = &dsi->vm; /* * Don't use line buffers if width is greater than the video @@ -3370,7 +3355,7 @@ static void dsi_config_cmd_mode_interleaving(struct dsi_data *dsi) int tclk_trail, ths_exit, exiths_clk; bool ddr_alwon; const struct videomode *vm = &dsi->vm; - int bpp = dsi_get_pixel_size(dsi->pix_fmt); + int bpp = mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt); int ndl = dsi->num_lanes_used - 1; int dsi_fclk_hsdiv = dsi->user_dsi_cinfo.mX[HSDIV_DSI] + 1; int hsa_interleave_hs = 0, hsa_interleave_lp = 0; @@ -3498,7 +3483,7 @@ static int dsi_proto_config(struct dsi_data *dsi) dsi_set_lp_rx_timeout(dsi, 0x1fff, true, true); dsi_set_hs_tx_timeout(dsi, 0x1fff, true, true);

- switch (dsi_get_pixel_size(dsi->pix_fmt)) { + switch (mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt)) { case 16: buswidth = 0; break; @@ -3619,7 +3604,7 @@ static void dsi_proto_timings(struct dsi_data *dsi) int window_sync = dsi->vm_timings.window_sync; bool hsync_end; const struct videomode *vm = &dsi->vm; - int bpp = dsi_get_pixel_size(dsi->pix_fmt); + int bpp = mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt); int tl, t_he, width_bytes;

hsync_end = dsi->vm_timings.trans_mode == OMAP_DSS_DSI_PULSE_MODE; @@ -3726,7 +3711,7 @@ static int dsi_configure_pins(struct omap_dss_device *dssdev, static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) { struct dsi_data *dsi = to_dsi_data(dssdev); - int bpp = dsi_get_pixel_size(dsi->pix_fmt); + int bpp = mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt); u8 data_type; u16 word_count; int r; @@ -3737,16 +3722,16 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)

if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) { switch (dsi->pix_fmt) { - case OMAP_DSS_DSI_FMT_RGB888: + case MIPI_DSI_FMT_RGB888: data_type = MIPI_DSI_PACKED_PIXEL_STREAM_24; break; - case OMAP_DSS_DSI_FMT_RGB666: + case MIPI_DSI_FMT_RGB666: data_type = MIPI_DSI_PIXEL_STREAM_3BYTE_18; break; - case OMAP_DSS_DSI_FMT_RGB666_PACKED: + case MIPI_DSI_FMT_RGB666_PACKED: data_type = MIPI_DSI_PACKED_PIXEL_STREAM_18; break; - case OMAP_DSS_DSI_FMT_RGB565: + case MIPI_DSI_FMT_RGB565: data_type = MIPI_DSI_PACKED_PIXEL_STREAM_16; break; default: @@ -3824,7 +3809,7 @@ static void dsi_update_screen_dispc(struct dsi_data *dsi)

dsi_vc_config_source(dsi, channel, DSI_VC_SOURCE_VP);

- bytespp = dsi_get_pixel_size(dsi->pix_fmt) / 8; + bytespp = mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt) / 8; bytespl = w * bytespp; bytespf = bytespl * h;

@@ -3954,7 +3939,7 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel,

#ifdef DSI_PERF_MEASURE dsi->update_bytes = dw * dh * - dsi_get_pixel_size(dsi->pix_fmt) / 8; + mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt) / 8; #endif dsi_update_screen_dispc(dsi);

@@ -4015,7 +4000,7 @@ static int dsi_display_init_dispc(struct dsi_data *dsi)

dsi->mgr_config.io_pad_mode = DSS_IO_PAD_MODE_BYPASS; dsi->mgr_config.video_port_width = - dsi_get_pixel_size(dsi->pix_fmt); + mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt); dsi->mgr_config.lcden_sig_polarity = 0;

dss_mgr_set_lcd_config(&dsi->output, &dsi->mgr_config); @@ -4353,7 +4338,7 @@ static bool dsi_cm_calc(struct dsi_data *dsi, unsigned long pck, txbyteclk;

clkin = clk_get_rate(dsi->pll.clkin); - bitspp = dsi_get_pixel_size(cfg->pixel_format); + bitspp = mipi_dsi_pixel_format_to_bpp(cfg->pixel_format); ndl = dsi->num_lanes_used - 1;

/* @@ -4386,7 +4371,7 @@ static bool dsi_vm_calc_blanking(struct dsi_clk_calc_ctx *ctx) { struct dsi_data *dsi = ctx->dsi; const struct omap_dss_dsi_config *cfg = ctx->config; - int bitspp = dsi_get_pixel_size(cfg->pixel_format); + int bitspp = mipi_dsi_pixel_format_to_bpp(cfg->pixel_format); int ndl = dsi->num_lanes_used - 1; unsigned long hsclk = ctx->dsi_cinfo.clkdco / 4; unsigned long byteclk = hsclk / 4; @@ -4653,7 +4638,7 @@ static bool dsi_vm_calc(struct dsi_data *dsi, unsigned long pll_min; unsigned long pll_max; int ndl = dsi->num_lanes_used - 1; - int bitspp = dsi_get_pixel_size(cfg->pixel_format); + int bitspp = mipi_dsi_pixel_format_to_bpp(cfg->pixel_format); unsigned long byteclk_min;

clkin = clk_get_rate(dsi->pll.clkin); diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 75e506b88733..6dd08d096eed 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -14,6 +14,7 @@ #include <linux/platform_data/omapdss.h> #include <uapi/drm/drm_mode.h> #include <drm/drm_crtc.h> +#include <drm/drm_mipi_dsi.h>

#define DISPC_IRQ_FRAMEDONE (1 << 0) #define DISPC_IRQ_VSYNC (1 << 1) @@ -116,13 +117,6 @@ enum omap_dss_venc_type { OMAP_DSS_VENC_TYPE_SVIDEO, };

-enum omap_dss_dsi_pixel_format { - OMAP_DSS_DSI_FMT_RGB888, - OMAP_DSS_DSI_FMT_RGB666, - OMAP_DSS_DSI_FMT_RGB666_PACKED, - OMAP_DSS_DSI_FMT_RGB565, -}; - enum omap_dss_dsi_mode { OMAP_DSS_DSI_CMD_MODE = 0, OMAP_DSS_DSI_VIDEO_MODE, @@ -210,7 +204,7 @@ struct omap_dss_dsi_videomode_timings {

struct omap_dss_dsi_config { enum omap_dss_dsi_mode mode; - enum omap_dss_dsi_pixel_format pixel_format; + enum mipi_dsi_pixel_format pixel_format; const struct videomode *vm;

unsigned long hs_clk_min, hs_clk_max;

This prepares the driver for becoming a mipi_dsi_host implementation, which provides a generic transfer function instead of all kind of different read/write functions. The implementation will become more elegant after unexporting the specific functions in the following patches.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/dss/dsi.c | 52 +++++++++++++++++++++++++++ drivers/gpu/drm/omapdrm/dss/omapdss.h | 3 ++ 2 files changed, 55 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index bf6131e5fa14..7560411f8ed6 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -4836,6 +4836,56 @@ static void dsi_release_vc(struct omap_dss_device *dssdev, int channel) } }

+static ssize_t omap_dsi_transfer(struct omap_dss_device *dssdev, + const struct mipi_dsi_msg *msg) +{ + /* + * no_sync can be used to optimize performance by sending + * e.g. column and page information without syncing in + * between. It's not absolutley required, so postpone this + * feature for now. + */ + bool no_sync = false; + u16 val; + + switch (msg->type) { + case MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM: + case MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM: + case MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM: + case MIPI_DSI_GENERIC_LONG_WRITE: + if (no_sync) + return dsi_vc_generic_write_nosync(dssdev, msg->channel, + msg->tx_buf, msg->tx_len); + else + return dsi_vc_generic_write(dssdev, msg->channel, + msg->tx_buf, msg->tx_len); + case MIPI_DSI_DCS_SHORT_WRITE: + case MIPI_DSI_DCS_SHORT_WRITE_PARAM: + case MIPI_DSI_DCS_LONG_WRITE: + if (no_sync) + return dsi_vc_dcs_write_nosync(dssdev, msg->channel, + msg->tx_buf, msg->tx_len); + else + return dsi_vc_dcs_write(dssdev, msg->channel, + msg->tx_buf, msg->tx_len); + case MIPI_DSI_GENERIC_READ_REQUEST_0_PARAM: + case MIPI_DSI_GENERIC_READ_REQUEST_1_PARAM: + case MIPI_DSI_GENERIC_READ_REQUEST_2_PARAM: + return dsi_vc_generic_read(dssdev, msg->channel, msg->tx_buf, + msg->tx_len, msg->rx_buf, msg->rx_len); + case MIPI_DSI_DCS_READ: + return dsi_vc_dcs_read(dssdev, msg->channel, + ((u8*) msg->tx_buf)[0], + msg->rx_buf, msg->rx_len); + case MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE: + val = le16_to_cpu(*((__le16*) msg->tx_buf)); + return dsi_vc_set_max_rx_packet_size(dssdev, msg->channel, val); + case MIPI_DSI_NULL_PACKET: + return dsi_vc_send_null(to_dsi_data(dssdev), msg->channel); + } + + return -EINVAL; +}

static int dsi_get_clocks(struct dsi_data *dsi) { @@ -4890,6 +4940,8 @@ static const struct omap_dss_device_ops dsi_ops = { .set_vc_id = dsi_set_vc_id, .release_vc = dsi_release_vc,

+ .transfer = omap_dsi_transfer, + .dcs_write = dsi_vc_dcs_write, .dcs_write_nosync = dsi_vc_dcs_write_nosync, .dcs_read = dsi_vc_dcs_read, diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index ae1a4600dab2..04952c291537 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -314,6 +314,9 @@ struct omapdss_dsi_ops { void (*release_vc)(struct omap_dss_device *dssdev, int channel);

/* data transfer */ + ssize_t (*transfer)(struct omap_dss_device *dssdev, + const struct mipi_dsi_msg *msg); + int (*dcs_write)(struct omap_dss_device *dssdev, int channel, const u8 *data, int len); int (*dcs_write_nosync)(struct omap_dss_device *dssdev, int channel,

After converting all DSI drivers, unexport the specific transfer functions.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/dss/dsi.c | 12 ------------ drivers/gpu/drm/omapdrm/dss/omapdss.h | 20 -------------------- 2 files changed, 32 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 7560411f8ed6..de4ec6055490 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -4941,18 +4941,6 @@ static const struct omap_dss_device_ops dsi_ops = { .release_vc = dsi_release_vc,

.transfer = omap_dsi_transfer, - - .dcs_write = dsi_vc_dcs_write, - .dcs_write_nosync = dsi_vc_dcs_write_nosync, - .dcs_read = dsi_vc_dcs_read, - - .gen_write = dsi_vc_generic_write, - .gen_write_nosync = dsi_vc_generic_write_nosync, - .gen_read = dsi_vc_generic_read, - - .bta_sync = dsi_vc_send_bta_sync, - - .set_max_rx_packet_size = dsi_vc_set_max_rx_packet_size, }, };

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 04952c291537..79ae4073c35f 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -316,26 +316,6 @@ struct omapdss_dsi_ops { /* data transfer */ ssize_t (*transfer)(struct omap_dss_device *dssdev, const struct mipi_dsi_msg *msg); - - int (*dcs_write)(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len); - int (*dcs_write_nosync)(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len); - int (*dcs_read)(struct omap_dss_device *dssdev, int channel, u8 dcs_cmd, - u8 *data, int len); - - int (*gen_write)(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len); - int (*gen_write_nosync)(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len); - int (*gen_read)(struct omap_dss_device *dssdev, int channel, - const u8 *reqdata, int reqlen, - u8 *data, int len); - - int (*bta_sync)(struct omap_dss_device *dssdev, int channel); - - int (*set_max_rx_packet_size)(struct omap_dss_device *dssdev, - int channel, u16 plen); };

struct omap_dss_device_ops {

Simplify the write related messages handling by using the functionality provided by CONFIG_DRM_MIPI_DSI.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/dss/Kconfig | 1 + drivers/gpu/drm/omapdrm/dss/dsi.c | 144 +++++++--------------------- 2 files changed, 33 insertions(+), 112 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/Kconfig b/drivers/gpu/drm/omapdrm/dss/Kconfig index 956f23e1452d..1d7e31824ff3 100644 --- a/drivers/gpu/drm/omapdrm/dss/Kconfig +++ b/drivers/gpu/drm/omapdrm/dss/Kconfig @@ -94,6 +94,7 @@ config OMAP2_DSS_SDI

config OMAP2_DSS_DSI bool "DSI support" + select DRM_MIPI_DSI default n help MIPI DSI (Display Serial Interface) support. diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 4d55e7c9cd65..696727673c6a 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -2696,97 +2696,49 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int channel) return dsi_vc_send_long(dsi, channel, MIPI_DSI_NULL_PACKET, NULL, 0, 0); }

-static int dsi_vc_write_nosync_common(struct dsi_data *dsi, int channel, - const u8 *data, int len, - enum dss_dsi_content_type type) +static int dsi_vc_write_common(struct omap_dss_device *dssdev, + const struct mipi_dsi_msg *msg) { + struct dsi_data *dsi = to_dsi_data(dssdev); + struct mipi_dsi_packet packet; int r;

- if (len == 0) { - BUG_ON(type == DSS_DSI_CONTENT_DCS); - r = dsi_vc_send_short(dsi, channel, - MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM, 0, 0); - } else if (len == 1) { - r = dsi_vc_send_short(dsi, channel, - type == DSS_DSI_CONTENT_GENERIC ? - MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM : - MIPI_DSI_DCS_SHORT_WRITE, data[0], 0); - } else if (len == 2) { - r = dsi_vc_send_short(dsi, channel, - type == DSS_DSI_CONTENT_GENERIC ? - MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM : - MIPI_DSI_DCS_SHORT_WRITE_PARAM, - data[0] | (data[1] << 8), 0); + r = mipi_dsi_create_packet(&packet, msg); + if (r < 0) + return r; + + if (mipi_dsi_packet_format_is_short(msg->type)) { + u16 data = packet.header[1] | (packet.header[2] << 8); + r = dsi_vc_send_short(dsi, msg->channel, msg->type, data, 0); } else { - r = dsi_vc_send_long(dsi, channel, - type == DSS_DSI_CONTENT_GENERIC ? - MIPI_DSI_GENERIC_LONG_WRITE : - MIPI_DSI_DCS_LONG_WRITE, data, len, 0); + r = dsi_vc_send_long(dsi, msg->channel, msg->type, + msg->tx_buf, msg->tx_len, 0); }

- return r; -} - -static int dsi_vc_dcs_write_nosync(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - - return dsi_vc_write_nosync_common(dsi, channel, data, len, - DSS_DSI_CONTENT_DCS); -} - -static int dsi_vc_generic_write_nosync(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - - return dsi_vc_write_nosync_common(dsi, channel, data, len, - DSS_DSI_CONTENT_GENERIC); -} - -static int dsi_vc_write_common(struct omap_dss_device *dssdev, - int channel, const u8 *data, int len, - enum dss_dsi_content_type type) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - int r; + if (r < 0) + return r;

- r = dsi_vc_write_nosync_common(dsi, channel, data, len, type); - if (r) - goto err; + /* + * we do not always have to do the BTA sync, for example we can + * improve performance by setting the update window information + * without sending BTA sync between the commands. In that case + * we can return earily. + */

- r = dsi_vc_send_bta_sync(dssdev, channel); - if (r) - goto err; + r = dsi_vc_send_bta_sync(dssdev, msg->channel); + if (r) { + DSSERR("bta sync failed\n"); + return r; + }

/* RX_FIFO_NOT_EMPTY */ - if (REG_GET(dsi, DSI_VC_CTRL(channel), 20, 20)) { + if (REG_GET(dsi, DSI_VC_CTRL(msg->channel), 20, 20)) { DSSERR("rx fifo not empty after write, dumping data:\n"); - dsi_vc_flush_receive_data(dsi, channel); - r = -EIO; - goto err; + dsi_vc_flush_receive_data(dsi, msg->channel); + return -EIO; }

return 0; -err: - DSSERR("dsi_vc_write_common(ch %d, cmd 0x%02x, len %d) failed\n", - channel, data[0], len); - return r; -} - -static int dsi_vc_dcs_write(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len) -{ - return dsi_vc_write_common(dssdev, channel, data, len, - DSS_DSI_CONTENT_DCS); -} - -static int dsi_vc_generic_write(struct omap_dss_device *dssdev, int channel, - const u8 *data, int len) -{ - return dsi_vc_write_common(dssdev, channel, data, len, - DSS_DSI_CONTENT_GENERIC); }

static int dsi_vc_dcs_send_read_request(struct dsi_data *dsi, int channel, @@ -3008,15 +2960,6 @@ static int dsi_vc_generic_read(struct omap_dss_device *dssdev, int channel, return 0; }

-static int dsi_vc_set_max_rx_packet_size(struct omap_dss_device *dssdev, int channel, - u16 len) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - - return dsi_vc_send_short(dsi, channel, - MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, len, 0); -} - static int dsi_enter_ulps(struct dsi_data *dsi) { DECLARE_COMPLETION_ONSTACK(completion); @@ -4811,35 +4754,17 @@ static void dsi_release_vc(struct omap_dss_device *dssdev, int channel) static ssize_t omap_dsi_transfer(struct omap_dss_device *dssdev, const struct mipi_dsi_msg *msg) { - /* - * no_sync can be used to optimize performance by sending - * e.g. column and page information without syncing in - * between. It's not absolutley required, so postpone this - * feature for now. - */ - bool no_sync = false; - u16 val; - switch (msg->type) { case MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM: case MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM: case MIPI_DSI_GENERIC_SHORT_WRITE_2_PARAM: case MIPI_DSI_GENERIC_LONG_WRITE: - if (no_sync) - return dsi_vc_generic_write_nosync(dssdev, msg->channel, - msg->tx_buf, msg->tx_len); - else - return dsi_vc_generic_write(dssdev, msg->channel, - msg->tx_buf, msg->tx_len); case MIPI_DSI_DCS_SHORT_WRITE: case MIPI_DSI_DCS_SHORT_WRITE_PARAM: case MIPI_DSI_DCS_LONG_WRITE: - if (no_sync) - return dsi_vc_dcs_write_nosync(dssdev, msg->channel, - msg->tx_buf, msg->tx_len); - else - return dsi_vc_dcs_write(dssdev, msg->channel, - msg->tx_buf, msg->tx_len); + case MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE: + case MIPI_DSI_NULL_PACKET: + return dsi_vc_write_common(dssdev, msg); case MIPI_DSI_GENERIC_READ_REQUEST_0_PARAM: case MIPI_DSI_GENERIC_READ_REQUEST_1_PARAM: case MIPI_DSI_GENERIC_READ_REQUEST_2_PARAM: @@ -4849,11 +4774,6 @@ static ssize_t omap_dsi_transfer(struct omap_dss_device *dssdev, return dsi_vc_dcs_read(dssdev, msg->channel, ((u8*) msg->tx_buf)[0], msg->rx_buf, msg->rx_len); - case MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE: - val = le16_to_cpu(*((__le16*) msg->tx_buf)); - return dsi_vc_set_max_rx_packet_size(dssdev, msg->channel, val); - case MIPI_DSI_NULL_PACKET: - return dsi_vc_send_null(to_dsi_data(dssdev), msg->channel); }

return -EINVAL;

Simplify the DSI encoder by using mipi_dsi_msg for dsi_vc_send_long and dsi_vc_send_short. Further improvements require cleaning up the channel allocation code first.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/dss/dsi.c | 92 +++++++++++++++---------------- 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index c22d438ae2b5..d39b84409656 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -2599,30 +2599,36 @@ static inline void dsi_vc_write_long_payload(struct dsi_data *dsi, int channel, dsi_write_reg(dsi, DSI_VC_LONG_PACKET_PAYLOAD(channel), val); }

-static int dsi_vc_send_long(struct dsi_data *dsi, int channel, u8 data_type, - const u8 *data, u16 len, u8 ecc) +static int dsi_vc_send_long(struct dsi_data *dsi, + const struct mipi_dsi_msg *msg) { + struct mipi_dsi_packet pkg; /*u32 val; */ int i; const u8 *p; int r = 0; u8 b1, b2, b3, b4;

+ r = mipi_dsi_create_packet(&pkg, msg); + if (r < 0) + return r; + if (dsi->debug_write) - DSSDBG("dsi_vc_send_long, %d bytes\n", len); + DSSDBG("dsi_vc_send_long, %d bytes\n", msg->tx_len);

/* len + header */ - if (dsi->vc[channel].tx_fifo_size * 32 * 4 < len + 4) { + if (dsi->vc[msg->channel].tx_fifo_size * 32 * 4 < msg->tx_len + 4) { DSSERR("unable to send long packet: packet too long.\n"); return -EINVAL; }

- dsi_vc_config_source(dsi, channel, DSI_VC_SOURCE_L4); + dsi_vc_config_source(dsi, msg->channel, DSI_VC_SOURCE_L4);

- dsi_vc_write_long_header(dsi, channel, data_type, len, ecc); + dsi_vc_write_long_header(dsi, msg->channel, msg->type, msg->tx_len, + pkg.header[3]);

- p = data; - for (i = 0; i < len >> 2; i++) { + p = msg->tx_buf; + for (i = 0; i < msg->tx_len >> 2; i++) { if (dsi->debug_write) DSSDBG("\tsending full packet %d\n", i);

@@ -2631,10 +2637,10 @@ static int dsi_vc_send_long(struct dsi_data *dsi, int channel, u8 data_type, b3 = *p++; b4 = *p++;

- dsi_vc_write_long_payload(dsi, channel, b1, b2, b3, b4); + dsi_vc_write_long_payload(dsi, msg->channel, b1, b2, b3, b4); }

- i = len % 4; + i = msg->tx_len % 4; if (i) { b1 = 0; b2 = 0; b3 = 0;

@@ -2656,64 +2662,64 @@ static int dsi_vc_send_long(struct dsi_data *dsi, int channel, u8 data_type, break; }

- dsi_vc_write_long_payload(dsi, channel, b1, b2, b3, 0); + dsi_vc_write_long_payload(dsi, msg->channel, b1, b2, b3, 0); }

return r; }

-static int dsi_vc_send_short(struct dsi_data *dsi, int channel, u8 data_type, - u16 data, u8 ecc) +static int dsi_vc_send_short(struct dsi_data *dsi, + const struct mipi_dsi_msg *msg) { + struct mipi_dsi_packet pkg; u32 r; - u8 data_id; + + r = mipi_dsi_create_packet(&pkg, msg); + if (r < 0) + return r;

WARN_ON(!dsi_bus_is_locked(dsi));

if (dsi->debug_write) DSSDBG("dsi_vc_send_short(ch%d, dt %#x, b1 %#x, b2 %#x)\n", - channel, - data_type, data & 0xff, (data >> 8) & 0xff); + msg->channel, + msg->type, pkg.header[1], pkg.header[2]);

- dsi_vc_config_source(dsi, channel, DSI_VC_SOURCE_L4); + dsi_vc_config_source(dsi, msg->channel, DSI_VC_SOURCE_L4);

- if (FLD_GET(dsi_read_reg(dsi, DSI_VC_CTRL(channel)), 16, 16)) { + if (FLD_GET(dsi_read_reg(dsi, DSI_VC_CTRL(msg->channel)), 16, 16)) { DSSERR("ERROR FIFO FULL, aborting transfer\n"); return -EINVAL; }

- data_id = data_type | channel << 6; - - r = (data_id << 0) | (data << 8) | (ecc << 24); + r = pkg.header[3] << 24 | pkg.header[2] << 16 | pkg.header[1] << 8 | + pkg.header[0];

- dsi_write_reg(dsi, DSI_VC_SHORT_PACKET_HEADER(channel), r); + dsi_write_reg(dsi, DSI_VC_SHORT_PACKET_HEADER(msg->channel), r);

return 0; }

static int dsi_vc_send_null(struct dsi_data *dsi, int channel) { - return dsi_vc_send_long(dsi, channel, MIPI_DSI_NULL_PACKET, NULL, 0, 0); + const struct mipi_dsi_msg msg = { + .channel = channel, + .type = MIPI_DSI_NULL_PACKET, + }; + + return dsi_vc_send_long(dsi, &msg); }

static int dsi_vc_write_common(struct omap_dss_device *dssdev, const struct mipi_dsi_msg *msg) { struct dsi_data *dsi = to_dsi_data(dssdev); - struct mipi_dsi_packet packet; int r;

- r = mipi_dsi_create_packet(&packet, msg); - if (r < 0) - return r; - - if (mipi_dsi_packet_format_is_short(msg->type)) { - u16 data = packet.header[1] | (packet.header[2] << 8); - r = dsi_vc_send_short(dsi, msg->channel, msg->type, data, 0); - } else { - r = dsi_vc_send_long(dsi, msg->channel, msg->type, - msg->tx_buf, msg->tx_len, 0); - } + if (mipi_dsi_packet_format_is_short(msg->type)) + r = dsi_vc_send_short(dsi, msg); + else + r = dsi_vc_send_long(dsi, msg);

if (r < 0) return r; @@ -2853,10 +2859,10 @@ static int dsi_vc_dcs_read(struct omap_dss_device *dssdev, const struct mipi_dsi_msg *msg) { struct dsi_data *dsi = to_dsi_data(dssdev); + u8 cmd = ((u8*) msg->tx_buf)[0]; int r; - u8 dcs_cmd = ((u8*) msg->tx_buf)[0];

- r = dsi_vc_send_short(dsi, msg->channel, MIPI_DSI_DCS_READ, dcs_cmd, 0); + r = dsi_vc_send_short(dsi, msg); if (r) goto err;

@@ -2877,7 +2883,7 @@ static int dsi_vc_dcs_read(struct omap_dss_device *dssdev, return 0; err: DSSERR("dsi_vc_dcs_read(ch %d, cmd 0x%02x) failed\n", - msg->channel, dcs_cmd); + msg->channel, cmd); return r; }

@@ -2885,17 +2891,9 @@ static int dsi_vc_generic_read(struct omap_dss_device *dssdev, const struct mipi_dsi_msg *msg) { struct dsi_data *dsi = to_dsi_data(dssdev); - struct mipi_dsi_packet packet; - u16 data; int r;

- r = mipi_dsi_create_packet(&packet, msg); - if (r < 0) - goto err; - - data = packet.header[1] | (packet.header[2] << 8); - - r = dsi_vc_send_short(dsi, msg->channel, msg->type, data, 0); + r = dsi_vc_send_short(dsi, msg); if (r) goto err;

This moves from custom platform driver infrastructure to mipi_dsi_host and mipi_dsi_device. Note, that this is a graduate step and the driver only uses the devices types and transfer function, but not yet the new device binding style or drm_panel.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 119 +++++++++--------- drivers/gpu/drm/omapdrm/dss/dsi.c | 54 ++++++-- drivers/gpu/drm/omapdrm/dss/omapdss.h | 4 - 3 files changed, 102 insertions(+), 75 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index b505bfd221fc..e2e56cc1cd61 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -14,7 +14,6 @@ #include <linux/interrupt.h> #include <linux/jiffies.h> #include <linux/module.h> -#include <linux/platform_device.h> #include <linux/sched/signal.h> #include <linux/slab.h> #include <linux/workqueue.h> @@ -39,13 +38,13 @@ #define DCS_GET_ID3 0xdc

struct panel_drv_data { + struct mipi_dsi_device *dsi; + struct omap_dss_device dssdev; struct omap_dss_device *src;

struct videomode vm;

- struct platform_device *pdev; - struct mutex lock;

struct backlight_device *bldev; @@ -139,7 +138,7 @@ static void hw_guard_wait(struct panel_drv_data *ddata)

static int dsicm_dcs_read_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 *data) { - struct omap_dss_device *src = ddata->src; + struct mipi_dsi_device *dsi = ddata->dsi; const struct mipi_dsi_msg msg = { .channel = ddata->channel, .type = MIPI_DSI_DCS_READ, @@ -149,12 +148,12 @@ static int dsicm_dcs_read_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 *data) .rx_buf = data };

- return src->ops->dsi.transfer(src, &msg); + return dsi->host->ops->transfer(dsi->host, &msg); }

static int dsicm_dcs_write_0(struct panel_drv_data *ddata, u8 dcs_cmd) { - struct omap_dss_device *src = ddata->src; + struct mipi_dsi_device *dsi = ddata->dsi; const struct mipi_dsi_msg msg = { .channel = ddata->channel, .type = MIPI_DSI_DCS_SHORT_WRITE, @@ -162,12 +161,12 @@ static int dsicm_dcs_write_0(struct panel_drv_data *ddata, u8 dcs_cmd) .tx_len = 1, };

- return src->ops->dsi.transfer(src, &msg); + return dsi->host->ops->transfer(dsi->host, &msg); }

static int dsicm_dcs_write_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 param) { - struct omap_dss_device *src = ddata->src; + struct mipi_dsi_device *dsi = ddata->dsi; const u8 buf[] = { dcs_cmd, param }; const struct mipi_dsi_msg msg = { .channel = ddata->channel, @@ -176,13 +175,13 @@ static int dsicm_dcs_write_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 param) .tx_len = 2, };

- return src->ops->dsi.transfer(src, &msg); + return dsi->host->ops->transfer(dsi->host, &msg); }

static int dsicm_sleep_in(struct panel_drv_data *ddata)

{ - struct omap_dss_device *src = ddata->src; + struct mipi_dsi_device *dsi = ddata->dsi; int r; const u8 cmd = MIPI_DCS_ENTER_SLEEP_MODE; const struct mipi_dsi_msg msg = { @@ -194,7 +193,7 @@ static int dsicm_sleep_in(struct panel_drv_data *ddata)

hw_guard_wait(ddata);

- r = src->ops->dsi.transfer(src, &msg); + r = dsi->host->ops->transfer(dsi->host, &msg); if (r) return r;

@@ -242,7 +241,7 @@ static int dsicm_get_id(struct panel_drv_data *ddata, u8 *id1, u8 *id2, u8 *id3) static int dsicm_set_update_window(struct panel_drv_data *ddata, u16 x, u16 y, u16 w, u16 h) { - struct omap_dss_device *src = ddata->src; + struct mipi_dsi_device *dsi = ddata->dsi; int r; u16 x1 = x; u16 x2 = x + w - 1; @@ -280,11 +279,11 @@ static int dsicm_set_update_window(struct panel_drv_data *ddata, };

- r = src->ops->dsi.transfer(src, &msgX); + r = dsi->host->ops->transfer(dsi->host, &msgX); if (r) return r;

- r = src->ops->dsi.transfer(src, &msgY); + r = dsi->host->ops->transfer(dsi->host, &msgY); if (r) return r;

@@ -327,7 +326,7 @@ static int dsicm_enter_ulps(struct panel_drv_data *ddata) return 0;

err: - dev_err(&ddata->pdev->dev, "enter ULPS failed"); + dev_err(&ddata->dsi->dev, "enter ULPS failed"); dsicm_panel_reset(ddata);

ddata->ulps_enabled = false; @@ -350,7 +349,7 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata)

r = _dsicm_enable_te(ddata, true); if (r) { - dev_err(&ddata->pdev->dev, "failed to re-enable TE"); + dev_err(&ddata->dsi->dev, "failed to re-enable TE"); goto err2; }

@@ -364,7 +363,7 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata) return 0;

err2: - dev_err(&ddata->pdev->dev, "failed to exit ULPS"); + dev_err(&ddata->dsi->dev, "failed to exit ULPS");

r = dsicm_panel_reset(ddata); if (!r) { @@ -401,7 +400,7 @@ static int dsicm_bl_update_status(struct backlight_device *dev) else level = 0;

- dev_dbg(&ddata->pdev->dev, "update brightness to %d\n", level); + dev_dbg(&ddata->dsi->dev, "update brightness to %d\n", level);

mutex_lock(&ddata->lock);

@@ -638,7 +637,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata) if (ddata->vpnl) { r = regulator_enable(ddata->vpnl); if (r) { - dev_err(&ddata->pdev->dev, + dev_err(&ddata->dsi->dev, "failed to enable VPNL: %d\n", r); return r; } @@ -647,7 +646,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata) if (ddata->vddi) { r = regulator_enable(ddata->vddi); if (r) { - dev_err(&ddata->pdev->dev, + dev_err(&ddata->dsi->dev, "failed to enable VDDI: %d\n", r); goto err_vpnl; } @@ -655,7 +654,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata)

r = src->ops->dsi.set_config(src, &dsi_config); if (r) { - dev_err(&ddata->pdev->dev, "failed to configure DSI\n"); + dev_err(&ddata->dsi->dev, "failed to configure DSI\n"); goto err_vddi; }

@@ -702,7 +701,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata) ddata->enabled = 1;

if (!ddata->intro_printed) { - dev_info(&ddata->pdev->dev, "panel revision %02x.%02x.%02x\n", + dev_info(&ddata->dsi->dev, "panel revision %02x.%02x.%02x\n", id1, id2, id3); ddata->intro_printed = true; } @@ -711,7 +710,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata)

return 0; err: - dev_err(&ddata->pdev->dev, "error while enabling panel, issuing HW reset\n"); + dev_err(&ddata->dsi->dev, "error while enabling panel, issuing HW reset\n");

dsicm_hw_reset(ddata);

@@ -738,7 +737,7 @@ static void dsicm_power_off(struct panel_drv_data *ddata) r = dsicm_sleep_in(ddata);

if (r) { - dev_err(&ddata->pdev->dev, + dev_err(&ddata->dsi->dev, "error disabling panel, issuing HW reset\n"); dsicm_hw_reset(ddata); } @@ -755,7 +754,7 @@ static void dsicm_power_off(struct panel_drv_data *ddata)

static int dsicm_panel_reset(struct panel_drv_data *ddata) { - dev_err(&ddata->pdev->dev, "performing LCD reset\n"); + dev_err(&ddata->dsi->dev, "performing LCD reset\n");

dsicm_power_off(ddata); dsicm_hw_reset(ddata); @@ -766,7 +765,7 @@ static int dsicm_connect(struct omap_dss_device *src, struct omap_dss_device *dst) { struct panel_drv_data *ddata = to_panel_data(dst); - struct device *dev = &ddata->pdev->dev; + struct device *dev = &ddata->dsi->dev; int r;

r = src->ops->dsi.request_vc(src, ddata->channel); @@ -811,7 +810,7 @@ static void dsicm_enable(struct omap_dss_device *dssdev)

return; err: - dev_dbg(&ddata->pdev->dev, "enable failed (%d)\n", r); + dev_dbg(&ddata->dsi->dev, "enable failed (%d)\n", r); mutex_unlock(&ddata->lock); }

@@ -843,7 +842,7 @@ static void dsicm_framedone_cb(int err, void *data) struct panel_drv_data *ddata = data; struct omap_dss_device *src = ddata->src;

- dev_dbg(&ddata->pdev->dev, "framedone, err %d\n", err); + dev_dbg(&ddata->dsi->dev, "framedone, err %d\n", err); src->ops->dsi.bus_unlock(src); }

@@ -867,7 +866,7 @@ static irqreturn_t dsicm_te_isr(int irq, void *data)

return IRQ_HANDLED; err: - dev_err(&ddata->pdev->dev, "start update failed\n"); + dev_err(&ddata->dsi->dev, "start update failed\n"); src->ops->dsi.bus_unlock(src); return IRQ_HANDLED; } @@ -878,7 +877,7 @@ static void dsicm_te_timeout_work_callback(struct work_struct *work) te_timeout_work.work); struct omap_dss_device *src = ddata->src;

- dev_err(&ddata->pdev->dev, "TE not received for 250ms!\n"); + dev_err(&ddata->dsi->dev, "TE not received for 250ms!\n");

atomic_set(&ddata->do_update, 0); src->ops->dsi.bus_unlock(src); @@ -891,7 +890,7 @@ static int dsicm_update(struct omap_dss_device *dssdev, struct omap_dss_device *src = ddata->src; int r;

- dev_dbg(&ddata->pdev->dev, "update %d, %d, %d x %d\n", x, y, w, h); + dev_dbg(&ddata->dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h);

mutex_lock(&ddata->lock); src->ops->dsi.bus_lock(src); @@ -936,14 +935,14 @@ static int dsicm_sync(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *src = ddata->src;

- dev_dbg(&ddata->pdev->dev, "sync\n"); + dev_dbg(&ddata->dsi->dev, "sync\n");

mutex_lock(&ddata->lock); src->ops->dsi.bus_lock(src); src->ops->dsi.bus_unlock(src); mutex_unlock(&ddata->lock);

- dev_dbg(&ddata->pdev->dev, "sync done\n"); + dev_dbg(&ddata->dsi->dev, "sync done\n");

return 0; } @@ -1020,7 +1019,7 @@ static int dsicm_set_max_rx_packet_size(struct omap_dss_device *dssdev, u16 size) { struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; + struct mipi_dsi_device *dsi = ddata->dsi;

const u8 buf[] = { size & 0xff, @@ -1034,7 +1033,7 @@ static int dsicm_set_max_rx_packet_size(struct omap_dss_device *dssdev, .tx_len = 2, };

- return src->ops->dsi.transfer(src, &msg); + return dsi->host->ops->transfer(dsi->host, &msg); }

static int dsicm_memory_read(struct omap_dss_device *dssdev, @@ -1042,6 +1041,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev, u16 x, u16 y, u16 w, u16 h) { struct panel_drv_data *ddata = to_panel_data(dssdev); + struct mipi_dsi_device *dsi = ddata->dsi; struct omap_dss_device *src = ddata->src; int r; int first = 1; @@ -1093,7 +1093,7 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev, }; first = 0;

- r = src->ops->dsi.transfer(src, &msg); + r = dsi->host->ops->transfer(dsi->host, &msg); if (r < 0) { dev_err(dssdev->dev, "read error\n"); goto err3; @@ -1102,12 +1102,12 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev, buf_used += r;

if (r < plen) { - dev_err(&ddata->pdev->dev, "short read\n"); + dev_err(&ddata->dsi->dev, "short read\n"); break; }

if (signal_pending(current)) { - dev_err(&ddata->pdev->dev, "signal pending, " + dev_err(&ddata->dsi->dev, "signal pending, " "aborting memory read\n"); r = -ERESTARTSYS; goto err3; @@ -1201,28 +1201,28 @@ static const struct omap_dss_driver dsicm_dss_driver = { .memory_read = dsicm_memory_read, };

-static int dsicm_probe_of(struct platform_device *pdev) +static int dsicm_probe_of(struct mipi_dsi_device *dsi) { - struct device_node *node = pdev->dev.of_node; + struct device_node *node = dsi->dev.of_node; struct device_node *backlight; - struct panel_drv_data *ddata = platform_get_drvdata(pdev); + struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi); struct display_timing timing; int err;

ddata->channel = TCH;

- ddata->reset_gpio = devm_gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW); + ddata->reset_gpio = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(ddata->reset_gpio)) { err = PTR_ERR(ddata->reset_gpio); - dev_err(&pdev->dev, "reset gpio request failed: %d", err); + dev_err(&dsi->dev, "reset gpio request failed: %d", err); return err; }

- ddata->ext_te_gpio = devm_gpiod_get_optional(&pdev->dev, "te", + ddata->ext_te_gpio = devm_gpiod_get_optional(&dsi->dev, "te", GPIOD_IN); if (IS_ERR(ddata->ext_te_gpio)) { err = PTR_ERR(ddata->ext_te_gpio); - dev_err(&pdev->dev, "TE gpio request failed: %d", err); + dev_err(&dsi->dev, "TE gpio request failed: %d", err); return err; }

@@ -1233,7 +1233,7 @@ static int dsicm_probe_of(struct platform_device *pdev) ddata->vm.pixelclock = ddata->vm.hactive * ddata->vm.vactive * 60; } else { - dev_warn(&pdev->dev, + dev_warn(&dsi->dev, "failed to get video timing, using defaults\n"); }

@@ -1243,7 +1243,7 @@ static int dsicm_probe_of(struct platform_device *pdev) ddata->height_mm = 0; of_property_read_u32(node, "height-mm", &ddata->height_mm);

- ddata->vpnl = devm_regulator_get_optional(&pdev->dev, "vpnl"); + ddata->vpnl = devm_regulator_get_optional(&dsi->dev, "vpnl"); if (IS_ERR(ddata->vpnl)) { err = PTR_ERR(ddata->vpnl); if (err == -EPROBE_DEFER) @@ -1251,7 +1251,7 @@ static int dsicm_probe_of(struct platform_device *pdev) ddata->vpnl = NULL; }

- ddata->vddi = devm_regulator_get_optional(&pdev->dev, "vddi"); + ddata->vddi = devm_regulator_get_optional(&dsi->dev, "vddi"); if (IS_ERR(ddata->vddi)) { err = PTR_ERR(ddata->vddi); if (err == -EPROBE_DEFER) @@ -1276,11 +1276,11 @@ static int dsicm_probe_of(struct platform_device *pdev) return 0; }

-static int dsicm_probe(struct platform_device *pdev) +static int dsicm_probe(struct mipi_dsi_device *dsi) { struct panel_drv_data *ddata; struct backlight_device *bldev = NULL; - struct device *dev = &pdev->dev; + struct device *dev = &dsi->dev; struct omap_dss_device *dssdev; int r;

@@ -1290,14 +1290,14 @@ static int dsicm_probe(struct platform_device *pdev) if (!ddata) return -ENOMEM;

- platform_set_drvdata(pdev, ddata); - ddata->pdev = pdev; + mipi_dsi_set_drvdata(dsi, ddata); + ddata->dsi = dsi;

ddata->vm.hactive = 864; ddata->vm.vactive = 480; ddata->vm.pixelclock = 864 * 480 * 60;

- r = dsicm_probe_of(pdev); + r = dsicm_probe_of(dsi); if (r) return r;

@@ -1379,12 +1379,12 @@ static int dsicm_probe(struct platform_device *pdev) return r; }

-static int __exit dsicm_remove(struct platform_device *pdev) +static int __exit dsicm_remove(struct mipi_dsi_device *dsi) { - struct panel_drv_data *ddata = platform_get_drvdata(pdev); + struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi); struct omap_dss_device *dssdev = &ddata->dssdev;

- dev_dbg(&pdev->dev, "remove\n"); + dev_dbg(&dsi->dev, "remove\n");

omapdss_device_unregister(dssdev);

@@ -1392,7 +1392,7 @@ static int __exit dsicm_remove(struct platform_device *pdev) dsicm_disable(dssdev); omapdss_device_disconnect(ddata->src, dssdev);

- sysfs_remove_group(&pdev->dev.kobj, &dsicm_attr_group); + sysfs_remove_group(&dsi->dev.kobj, &dsicm_attr_group);

if (ddata->extbldev) put_device(&ddata->extbldev->dev); @@ -1413,7 +1413,7 @@ static const struct of_device_id dsicm_of_match[] = {

MODULE_DEVICE_TABLE(of, dsicm_of_match);

-static struct platform_driver dsicm_driver = { +static struct mipi_dsi_driver dsicm_driver = { .probe = dsicm_probe, .remove = __exit_p(dsicm_remove), .driver = { @@ -1422,8 +1422,7 @@ static struct platform_driver dsicm_driver = { .suppress_bind_attrs = true, }, }; - -module_platform_driver(dsicm_driver); +module_mipi_dsi_driver(dsicm_driver);

MODULE_AUTHOR("Tomi Valkeinen tomi.valkeinen@ti.com"); MODULE_DESCRIPTION("Generic DSI Command Mode Panel Driver"); diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index d39b84409656..c4107fe5a53d 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -334,6 +334,8 @@ struct dsi_data { struct regmap *syscon; struct dss_device *dss;

+ struct mipi_dsi_host host; + struct dispc_clock_info user_dispc_cinfo; struct dss_pll_clock_info user_dsi_cinfo;

@@ -432,6 +434,11 @@ static inline struct dsi_data *to_dsi_data(struct omap_dss_device *dssdev) return dev_get_drvdata(dssdev->dev); }

+static inline struct dsi_data *host_to_omap(struct mipi_dsi_host *host) +{ + return container_of(host, struct dsi_data, host); +} + static inline void dsi_write_reg(struct dsi_data *dsi, const struct dsi_reg idx, u32 val) { @@ -4709,9 +4716,12 @@ static void dsi_release_vc(struct omap_dss_device *dssdev, int channel) } }

-static ssize_t omap_dsi_transfer(struct omap_dss_device *dssdev, - const struct mipi_dsi_msg *msg) +static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, + const struct mipi_dsi_msg *msg) { + struct dsi_data *dsi = host_to_omap(host); + struct omap_dss_device *dssdev = &dsi->output; + switch (msg->type) { case MIPI_DSI_GENERIC_SHORT_WRITE_0_PARAM: case MIPI_DSI_GENERIC_SHORT_WRITE_1_PARAM: @@ -4785,11 +4795,30 @@ static const struct omap_dss_device_ops dsi_ops = {

.request_vc = dsi_request_vc, .release_vc = dsi_release_vc, - - .transfer = omap_dsi_transfer, }, };

+int omap_dsi_host_attach(struct mipi_dsi_host *host, + struct mipi_dsi_device *dsi) +{ + /* TODO: convert driver from custom binding method to this one */ + return 0; +} + +int omap_dsi_host_detach(struct mipi_dsi_host *host, + struct mipi_dsi_device *dsi) +{ + /* TODO: convert driver from custom binding method to this one */ + return 0; +} + +static const struct mipi_dsi_host_ops omap_dsi_host_ops = { + .attach = omap_dsi_host_attach, + .detach = omap_dsi_host_detach, + .transfer = omap_dsi_host_transfer, +}; + + /* ----------------------------------------------------------------------------- * PLL */ @@ -5258,15 +5287,18 @@ static int dsi_probe(struct platform_device *pdev) dsi->num_lanes_supported = 3; }

- r = of_platform_populate(dev->of_node, NULL, NULL, dev); - if (r) { - DSSERR("Failed to populate DSI child devices: %d\n", r); + dsi->host.ops = &omap_dsi_host_ops; + dsi->host.dev = &pdev->dev; + + r = mipi_dsi_host_register(&dsi->host); + if (r < 0) { + dev_err(&pdev->dev, "failed to register DSI host: %d\n", r); goto err_pm_disable; }

r = dsi_init_output(dsi); if (r) - goto err_of_depopulate; + goto err_dsi_host_unregister;

r = dsi_probe_of(dsi); if (r) { @@ -5282,8 +5314,8 @@ static int dsi_probe(struct platform_device *pdev)

err_uninit_output: dsi_uninit_output(dsi); -err_of_depopulate: - of_platform_depopulate(dev); +err_dsi_host_unregister: + mipi_dsi_host_unregister(&dsi->host); err_pm_disable: pm_runtime_disable(dev); return r; @@ -5297,7 +5329,7 @@ static int dsi_remove(struct platform_device *pdev)

dsi_uninit_output(dsi);

- of_platform_depopulate(&pdev->dev); + mipi_dsi_host_unregister(&dsi->host);

pm_runtime_disable(&pdev->dev);

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 143ff346c311..be37c9eb212c 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -310,10 +310,6 @@ struct omapdss_dsi_ops {

int (*request_vc)(struct omap_dss_device *dssdev, int channel); void (*release_vc)(struct omap_dss_device *dssdev, int channel); - - /* data transfer */ - ssize_t (*transfer)(struct omap_dss_device *dssdev, - const struct mipi_dsi_msg *msg); };

struct omap_dss_device_ops {

Drop custom request_vc/release_vc callbacks by using the generic mipi_dsi_attach/mipi_dsi_detach functions.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 24 +++++--- drivers/gpu/drm/omapdrm/dss/dsi.c | 61 ++++++++----------- drivers/gpu/drm/omapdrm/dss/omapdss.h | 3 - 3 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index e6c0a6e5aa1d..ddc6dd671cd0 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -693,14 +693,6 @@ static int dsicm_connect(struct omap_dss_device *src, struct omap_dss_device *dst) { struct panel_drv_data *ddata = to_panel_data(dst); - struct device *dev = &ddata->dsi->dev; - int r; - - r = src->ops->dsi.request_vc(src, ddata->channel); - if (r) { - dev_err(dev, "failed to get virtual channel\n"); - return r; - }

ddata->src = src; return 0; @@ -711,7 +703,6 @@ static void dsicm_disconnect(struct omap_dss_device *src, { struct panel_drv_data *ddata = to_panel_data(dst);

- src->ops->dsi.release_vc(src, ddata->channel); ddata->src = NULL; }

@@ -1278,8 +1269,21 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) goto err_bl; }

+ dsi->lanes = 3; + dsi->format = MIPI_DSI_FMT_RGB888; + dsi->mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS | + MIPI_DSI_MODE_EOT_PACKET; + dsi->hs_rate = 300000000; + dsi->lp_rate = 10000000; + + r = mipi_dsi_attach(dsi); + if (r < 0) + goto err_dsi_attach; + return 0;

+err_dsi_attach: + sysfs_remove_group(&dsi->dev.kobj, &dsicm_attr_group); err_bl: destroy_workqueue(ddata->workqueue); err_reg: @@ -1296,6 +1300,8 @@ static int __exit dsicm_remove(struct mipi_dsi_device *dsi)

dev_dbg(&dsi->dev, "remove\n");

+ mipi_dsi_detach(dsi); + omapdss_device_unregister(dssdev);

if (omapdss_device_is_enabled(dssdev)) diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index c4107fe5a53d..3cd749cae15c 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -349,7 +349,7 @@ struct dsi_data {

struct { enum dsi_vc_source source; - struct omap_dss_device *dssdev; + struct mipi_dsi_device *dest; enum fifo_size tx_fifo_size; enum fifo_size rx_fifo_size; } vc[4]; @@ -4690,32 +4690,6 @@ static enum omap_channel dsi_get_channel(struct dsi_data *dsi) } }

-static int dsi_request_vc(struct omap_dss_device *dssdev, int channel) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - - if (channel < 0 || channel > 3) - return -EINVAL; - - if (dsi->vc[channel].dssdev) { - DSSERR("cannot get VC for display %s", dssdev->name); - return -EBUSY; - } - - dsi->vc[channel].dssdev = dssdev; - return 0; -} - -static void dsi_release_vc(struct omap_dss_device *dssdev, int channel) -{ - struct dsi_data *dsi = to_dsi_data(dssdev); - - if ((channel >= 0 && channel <= 3) && - dsi->vc[channel].dssdev == dssdev) { - dsi->vc[channel].dssdev = NULL; - } -} - static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, const struct mipi_dsi_msg *msg) { @@ -4792,23 +4766,40 @@ static const struct omap_dss_device_ops dsi_ops = { .update = dsi_update,

.enable_te = dsi_enable_te, - - .request_vc = dsi_request_vc, - .release_vc = dsi_release_vc, }, };

int omap_dsi_host_attach(struct mipi_dsi_host *host, - struct mipi_dsi_device *dsi) + struct mipi_dsi_device *client) { - /* TODO: convert driver from custom binding method to this one */ + struct dsi_data *dsi = host_to_omap(host); + unsigned int channel = client->channel; + + if (channel > 3) + return -EINVAL; + + if (dsi->vc[channel].dest) { + DSSERR("cannot get VC for display %s", dev_name(&client->dev)); + return -EBUSY; + } + + dsi->vc[channel].dest = client; return 0; }

int omap_dsi_host_detach(struct mipi_dsi_host *host, - struct mipi_dsi_device *dsi) + struct mipi_dsi_device *client) { - /* TODO: convert driver from custom binding method to this one */ + struct dsi_data *dsi = host_to_omap(host); + unsigned int channel = client->channel; + + if (channel > 3) + return -EINVAL; + + if (dsi->vc[channel].dest != client) + return -EINVAL; + + dsi->vc[channel].dest = NULL; return 0; }

@@ -5267,7 +5258,7 @@ static int dsi_probe(struct platform_device *pdev) /* DSI VCs initialization */ for (i = 0; i < ARRAY_SIZE(dsi->vc); i++) { dsi->vc[i].source = DSI_VC_SOURCE_L4; - dsi->vc[i].dssdev = NULL; + dsi->vc[i].dest = NULL; }

r = dsi_get_clocks(dsi); diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index be37c9eb212c..28faacb9636b 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -307,9 +307,6 @@ struct omapdss_dsi_ops { int (*enable_video_output)(struct omap_dss_device *dssdev, int channel); void (*disable_video_output)(struct omap_dss_device *dssdev, int channel); - - int (*request_vc)(struct omap_dss_device *dssdev, int channel); - void (*release_vc)(struct omap_dss_device *dssdev, int channel); };

struct omap_dss_device_ops {

Drop local definition of common MIPI DCS 1.3 defines.

Signed-off-by: Sebastian Reichel sre@kernel.org --- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 426c660af264..cc25bd0b501f 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -28,8 +28,6 @@ #include "../dss/omapdss.h"

#define DCS_READ_NUM_ERRORS 0x05 -#define DCS_BRIGHTNESS 0x51 -#define DCS_CTRL_DISPLAY 0x53 #define DCS_GET_ID1 0xda #define DCS_GET_ID2 0xdb #define DCS_GET_ID3 0xdc @@ -333,8 +331,10 @@ static int dsicm_bl_update_status(struct backlight_device *dev) src->ops->dsi.bus_lock(src);

r = dsicm_wake_up(ddata); - if (!r) - r = dsicm_dcs_write_1(ddata, DCS_BRIGHTNESS, level); + if (!r) { + r = dsicm_dcs_write_1(ddata, + MIPI_DCS_SET_DISPLAY_BRIGHTNESS, level); + }

src->ops->dsi.bus_unlock(src); } @@ -597,11 +597,11 @@ static int dsicm_power_on(struct panel_drv_data *ddata) if (r) goto err;

- r = dsicm_dcs_write_1(ddata, DCS_BRIGHTNESS, 0xff); + r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, 0xff); if (r) goto err;

- r = dsicm_dcs_write_1(ddata, DCS_CTRL_DISPLAY, + r = dsicm_dcs_write_1(ddata, MIPI_DCS_WRITE_CONTROL_DISPLAY, (1<<2) | (1<<5)); /* BL | BCTRL */ if (r) goto err;

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 13 ------------- drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - 2 files changed, 14 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index e309a556c700..b2eb834c9eff 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -919,18 +919,6 @@ static int dsicm_enable_te(struct omap_dss_device *dssdev, bool enable) return r; }

-static int dsicm_get_te(struct omap_dss_device *dssdev) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - int r; - - mutex_lock(&ddata->lock); - r = ddata->te_enabled; - mutex_unlock(&ddata->lock); - - return r; -} - static void dsicm_ulps_work(struct work_struct *work) { struct panel_drv_data *ddata = container_of(work, struct panel_drv_data, @@ -1002,7 +990,6 @@ static const struct omap_dss_driver dsicm_dss_driver = { .sync = dsicm_sync,

.enable_te = dsicm_enable_te, - .get_te = dsicm_get_te, };

static int dsicm_probe_of(struct mipi_dsi_device *dsi) diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 742088b8f570..9be1c659d3a4 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -412,7 +412,6 @@ struct omap_dss_driver { int (*sync)(struct omap_dss_device *dssdev);

int (*enable_te)(struct omap_dss_device *dssdev, bool enable); - int (*get_te)(struct omap_dss_device *dssdev); };

struct dss_device *omapdss_get_dss(void);

The DSI sync() function only locks the bus and then releases it again. Currently the only invocation is directly before update(), which locks the bus anyways.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 18 ------------------ drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - drivers/gpu/drm/omapdrm/omap_crtc.c | 3 --- 3 files changed, 22 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 164f3a30d7f2..994880022d0c 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -845,23 +845,6 @@ static int dsicm_update(struct omap_dss_device *dssdev, return r; }

-static int dsicm_sync(struct omap_dss_device *dssdev) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; - - dev_dbg(&ddata->dsi->dev, "sync\n"); - - mutex_lock(&ddata->lock); - src->ops->dsi.bus_lock(src); - src->ops->dsi.bus_unlock(src); - mutex_unlock(&ddata->lock); - - dev_dbg(&ddata->dsi->dev, "sync done\n"); - - return 0; -} - static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) { struct omap_dss_device *src = ddata->src; @@ -950,7 +933,6 @@ static const struct omap_dss_device_ops dsicm_ops = {

static const struct omap_dss_driver dsicm_dss_driver = { .update = dsicm_update, - .sync = dsicm_sync, };

static int dsicm_probe_of(struct mipi_dsi_device *dsi) diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index bc583346af4d..cd9769711b58 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -409,7 +409,6 @@ struct omap_dss_device { struct omap_dss_driver { int (*update)(struct omap_dss_device *dssdev, u16 x, u16 y, u16 w, u16 h); - int (*sync)(struct omap_dss_device *dssdev); };

struct dss_device *omapdss_get_dss(void); diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 3c5ddbf30e97..8b469eaa5005 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -379,9 +379,6 @@ static void omap_crtc_manual_display_update(struct work_struct *data) return; }

- if (dssdrv->sync) - dssdrv->sync(dssdev); - ret = dssdrv->update(dssdev, 0, 0, mode->hdisplay, mode->vdisplay); if (ret < 0) { spin_lock_irq(&dev->event_lock);

Use bulk regulator API to simplify the code. This also switches from _optional variant to normal variant, which will provide a dummy regulator (i.e. if some always-enabled regulator is not described in DT).

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 65 ++++++------------- 1 file changed, 21 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index e4120d484f4c..170cbc78fbef 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -32,6 +32,8 @@ #define DCS_GET_ID2 0xdb #define DCS_GET_ID3 0xdc

+#define DCS_REGULATOR_SUPPLY_NUM 2 + struct panel_drv_data { struct mipi_dsi_device *dsi;

@@ -54,8 +56,7 @@ struct panel_drv_data { struct gpio_desc *reset_gpio; struct gpio_desc *ext_te_gpio;

- struct regulator *vpnl; - struct regulator *vddi; + struct regulator_bulk_data supplies[DCS_REGULATOR_SUPPLY_NUM];

bool use_dsi_backlight;

@@ -557,28 +558,16 @@ static int dsicm_power_on(struct panel_drv_data *ddata) .lp_clk_max = 10000000, };

- if (ddata->vpnl) { - r = regulator_enable(ddata->vpnl); - if (r) { - dev_err(&ddata->dsi->dev, - "failed to enable VPNL: %d\n", r); - return r; - } - } - - if (ddata->vddi) { - r = regulator_enable(ddata->vddi); - if (r) { - dev_err(&ddata->dsi->dev, - "failed to enable VDDI: %d\n", r); - goto err_vpnl; - } + r = regulator_bulk_enable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); + if (r) { + dev_err(&ddata->dsi->dev, "failed to enable supplies: %d\n", r); + return r; }

r = src->ops->dsi.set_config(src, &dsi_config); if (r) { dev_err(&ddata->dsi->dev, "failed to configure DSI\n"); - goto err_vddi; + goto err_regulators; }

src->ops->enable(src); @@ -637,12 +626,10 @@ static int dsicm_power_on(struct panel_drv_data *ddata) dsicm_hw_reset(ddata);

src->ops->dsi.disable(src, true, false); -err_vddi: - if (ddata->vddi) - regulator_disable(ddata->vddi); -err_vpnl: - if (ddata->vpnl) - regulator_disable(ddata->vpnl); +err_regulators: + r = regulator_bulk_disable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); + if (r) + dev_err(&ddata->dsi->dev, "failed to disable supplies: %d\n", r);

return r; } @@ -666,10 +653,9 @@ static void dsicm_power_off(struct panel_drv_data *ddata)

src->ops->dsi.disable(src, true, false);

- if (ddata->vddi) - regulator_disable(ddata->vddi); - if (ddata->vpnl) - regulator_disable(ddata->vpnl); + r = regulator_bulk_disable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); + if (r) + dev_err(&ddata->dsi->dev, "failed to disable supplies: %d\n", r);

ddata->enabled = 0; } @@ -973,21 +959,12 @@ static int dsicm_probe_of(struct mipi_dsi_device *dsi) ddata->height_mm = 0; of_property_read_u32(node, "height-mm", &ddata->height_mm);

- ddata->vpnl = devm_regulator_get_optional(&dsi->dev, "vpnl"); - if (IS_ERR(ddata->vpnl)) { - err = PTR_ERR(ddata->vpnl); - if (err == -EPROBE_DEFER) - return err; - ddata->vpnl = NULL; - } - - ddata->vddi = devm_regulator_get_optional(&dsi->dev, "vddi"); - if (IS_ERR(ddata->vddi)) { - err = PTR_ERR(ddata->vddi); - if (err == -EPROBE_DEFER) - return err; - ddata->vddi = NULL; - } + ddata->supplies[0].supply = "vpnl"; + ddata->supplies[1].supply = "vddi"; + err = devm_regulator_bulk_get(&dsi->dev, DCS_REGULATOR_SUPPLY_NUM, + ddata->supplies); + if (err) + return err;

backlight = of_parse_phandle(node, "backlight", 0); if (backlight) {

In preparation for removing custom DSS calls from the DSI panel driver, this moves support for external tearing event GPIOs into the DSI host driver. This way tearing events are always handled in the core resulting in simplification of the panel drivers.

The TE GPIO acquisition follows works in the same way as the exynos DSI implementation.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 101 +------------ drivers/gpu/drm/omapdrm/dss/dsi.c | 140 ++++++++++++++++-- 2 files changed, 135 insertions(+), 106 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 5603dae0fd0f..9a259e0d9e97 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -54,7 +54,6 @@ struct panel_drv_data {

/* panel HW configuration from DT or platform data */ struct gpio_desc *reset_gpio; - struct gpio_desc *ext_te_gpio;

struct regulator_bulk_data supplies[DCS_REGULATOR_SUPPLY_NUM];

@@ -68,10 +67,6 @@ struct panel_drv_data {

bool te_enabled;

- atomic_t do_update; - - struct delayed_work te_timeout_work; - bool intro_printed;

struct workqueue_struct *workqueue; @@ -83,8 +78,6 @@ struct panel_drv_data {

#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev)

-static irqreturn_t dsicm_te_isr(int irq, void *data); -static void dsicm_te_timeout_work_callback(struct work_struct *work); static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable);

static int dsicm_panel_reset(struct panel_drv_data *ddata); @@ -240,9 +233,6 @@ static int dsicm_enter_ulps(struct panel_drv_data *ddata) if (r) goto err;

- if (ddata->ext_te_gpio) - disable_irq(gpiod_to_irq(ddata->ext_te_gpio)); - src->ops->dsi.disable(src, false, true);

ddata->ulps_enabled = true; @@ -271,15 +261,12 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata) src->ops->enable(src); ddata->dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;

- r = _dsicm_enable_te(ddata, true); + r = _dsicm_enable_te(ddata, ddata->te_enabled); if (r) { dev_err(&ddata->dsi->dev, "failed to re-enable TE"); goto err2; }

- if (ddata->ext_te_gpio) - enable_irq(gpiod_to_irq(ddata->ext_te_gpio)); - dsicm_queue_ulps_work(ddata);

ddata->ulps_enabled = false; @@ -290,11 +277,8 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata) dev_err(&ddata->dsi->dev, "failed to exit ULPS");

r = dsicm_panel_reset(ddata); - if (!r) { - if (ddata->ext_te_gpio) - enable_irq(gpiod_to_irq(ddata->ext_te_gpio)); + if (!r) ddata->ulps_enabled = false; - }

dsicm_queue_ulps_work(ddata);

@@ -745,43 +729,6 @@ static void dsicm_framedone_cb(int err, void *data) src->ops->dsi.bus_unlock(src); }

-static irqreturn_t dsicm_te_isr(int irq, void *data) -{ - struct panel_drv_data *ddata = data; - struct omap_dss_device *src = ddata->src; - int old; - int r; - - old = atomic_cmpxchg(&ddata->do_update, 1, 0); - - if (old) { - cancel_delayed_work(&ddata->te_timeout_work); - - r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb, - ddata); - if (r) - goto err; - } - - return IRQ_HANDLED; -err: - dev_err(&ddata->dsi->dev, "start update failed\n"); - src->ops->dsi.bus_unlock(src); - return IRQ_HANDLED; -} - -static void dsicm_te_timeout_work_callback(struct work_struct *work) -{ - struct panel_drv_data *ddata = container_of(work, struct panel_drv_data, - te_timeout_work.work); - struct omap_dss_device *src = ddata->src; - - dev_err(&ddata->dsi->dev, "TE not received for 250ms!\n"); - - atomic_set(&ddata->do_update, 0); - src->ops->dsi.bus_unlock(src); -} - static int dsicm_update(struct omap_dss_device *dssdev, u16 x, u16 y, u16 w, u16 h) { @@ -809,16 +756,10 @@ static int dsicm_update(struct omap_dss_device *dssdev, if (r) goto err;

- if (ddata->te_enabled && ddata->ext_te_gpio) { - schedule_delayed_work(&ddata->te_timeout_work, - msecs_to_jiffies(250)); - atomic_set(&ddata->do_update, 1); - } else { - r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb, - ddata); - if (r) - goto err; - } + r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb, + ddata); + if (r) + goto err;

/* note: no bus_unlock here. unlock is src framedone_cb */ mutex_unlock(&ddata->lock); @@ -840,8 +781,7 @@ static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) else r = mipi_dsi_dcs_set_tear_off(dsi);

- if (!ddata->ext_te_gpio) - src->ops->dsi.enable_te(src, enable); + src->ops->dsi.enable_te(src, enable);

/* possible panel bug */ msleep(100); @@ -934,14 +874,6 @@ static int dsicm_probe_of(struct mipi_dsi_device *dsi) return err; }

- ddata->ext_te_gpio = devm_gpiod_get_optional(&dsi->dev, "te", - GPIOD_IN); - if (IS_ERR(ddata->ext_te_gpio)) { - err = PTR_ERR(ddata->ext_te_gpio); - dev_err(&dsi->dev, "TE gpio request failed: %d", err); - return err; - } - err = of_get_display_timing(node, "panel-timing", &timing); if (!err) { videomode_from_timing(&timing, &ddata->vm); @@ -1026,25 +958,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi)

mutex_init(&ddata->lock);

- atomic_set(&ddata->do_update, 0); - - if (ddata->ext_te_gpio) { - r = devm_request_irq(dev, gpiod_to_irq(ddata->ext_te_gpio), - dsicm_te_isr, - IRQF_TRIGGER_RISING, - "taal vsync", ddata); - - if (r) { - dev_err(dev, "IRQ request failed\n"); - goto err_reg; - } - - INIT_DEFERRABLE_WORK(&ddata->te_timeout_work, - dsicm_te_timeout_work_callback); - - dev_dbg(dev, "Using GPIO TE\n"); - } - ddata->workqueue = create_singlethread_workqueue("dsicm_wq"); if (!ddata->workqueue) { r = -ENOMEM; diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 8eb323adb30a..8f900cf1aed7 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -14,7 +14,9 @@ #include <linux/device.h> #include <linux/err.h> #include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/mutex.h> #include <linux/module.h> #include <linux/semaphore.h> @@ -371,6 +373,11 @@ struct dsi_data { unsigned int update_bytes; #endif

+ /* external TE GPIO */ + struct gpio_desc *te_gpio; + struct delayed_work te_timeout_work; + atomic_t do_ext_te_update; + bool te_enabled; bool ulps_enabled;

@@ -3834,19 +3841,12 @@ static void dsi_framedone_irq_callback(void *data) dsi_handle_framedone(dsi, 0); }

-static int dsi_update(struct omap_dss_device *dssdev, int channel, - void (*callback)(int, void *), void *data) +static int _dsi_update(struct dsi_data *dsi) { - struct dsi_data *dsi = to_dsi_data(dssdev); u16 dw, dh;

dsi_perf_mark_setup(dsi);

- dsi->update_channel = channel; - - dsi->framedone_callback = callback; - dsi->framedone_data = data; - dw = dsi->vm.hactive; dh = dsi->vm.vactive;

@@ -3859,6 +3859,26 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel, return 0; }

+static int dsi_update(struct omap_dss_device *dssdev, int channel, + void (*callback)(int, void *), void *data) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + + dsi->update_channel = channel; + dsi->framedone_callback = callback; + dsi->framedone_data = data; + + if (dsi->te_enabled && dsi->te_gpio) { + schedule_delayed_work(&dsi->te_timeout_work, + msecs_to_jiffies(250)); + atomic_set(&dsi->do_ext_te_update, 1); + } else { + _dsi_update(dsi); + } + + return 0; +} + /* Display funcs */

static int dsi_configure_dispc_clocks(struct dsi_data *dsi) @@ -4102,6 +4122,14 @@ static int dsi_enable_te(struct omap_dss_device *dssdev, bool enable) struct dsi_data *dsi = to_dsi_data(dssdev);

dsi->te_enabled = enable; + + if (dsi->te_gpio) { + if (enable) + enable_irq(gpiod_to_irq(dsi->te_gpio)); + else + disable_irq(gpiod_to_irq(dsi->te_gpio)); + } + return 0; }

@@ -4779,11 +4807,91 @@ static const struct omap_dss_device_ops dsi_ops = { }, };

+static irqreturn_t omap_dsi_te_irq_handler(int irq, void *dev_id) +{ + struct dsi_data *dsi = (struct dsi_data*) dev_id; + int old; + + old = atomic_cmpxchg(&dsi->do_ext_te_update, 1, 0); + if (old) { + cancel_delayed_work(&dsi->te_timeout_work); + _dsi_update(dsi); + } + + return IRQ_HANDLED; +} + +static void omap_dsi_te_timeout_work_callback(struct work_struct *work) +{ + struct dsi_data *dsi = container_of(work, struct dsi_data, + te_timeout_work.work); + int old; + + old = atomic_cmpxchg(&dsi->do_ext_te_update, 1, 0); + if (old) { + dev_err(dsi->dev, "TE not received for 250ms!\n"); + _dsi_update(dsi); + } + + return; +} + +static int omap_dsi_register_te_irq(struct dsi_data *dsi, + struct mipi_dsi_device *client) +{ + int err; + int te_irq; + + dsi->te_gpio = gpiod_get_from_of_node(client->dev.of_node, + "te-gpios", 0, GPIOD_IN, + "dsi-tearing-effect"); + if (IS_ERR(dsi->te_gpio)) { + err = PTR_ERR(dsi->te_gpio); + + if (err == -ENOENT) { + dsi->te_gpio = NULL; + return 0; + } else { + dev_err(dsi->dev, "Could not get TE gpio: %d\n", err); + return err; + } + } + + te_irq = gpiod_to_irq(dsi->te_gpio); + irq_set_status_flags(te_irq, IRQ_NOAUTOEN); + + err = request_threaded_irq(te_irq, omap_dsi_te_irq_handler, NULL, + IRQF_TRIGGER_RISING, "TE", dsi); + if (err) { + dev_err(dsi->dev, "request irq failed with %d\n", err); + gpiod_put(dsi->te_gpio); + return err; + } + + INIT_DEFERRABLE_WORK(&dsi->te_timeout_work, + omap_dsi_te_timeout_work_callback); + + dev_dbg(dsi->dev, "Using GPIO TE\n"); + + return 0; +} + +static void omap_dsi_unregister_te_irq(struct dsi_data *dsi) +{ + if (dsi->te_gpio) { + free_irq(gpiod_to_irq(dsi->te_gpio), dsi); + cancel_delayed_work(&dsi->te_timeout_work); + gpiod_put(dsi->te_gpio); + dsi->te_gpio = NULL; + } +} + int omap_dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *client) { struct dsi_data *dsi = host_to_omap(host); unsigned int channel = client->channel; + int r;

if (channel > 3) return -EINVAL; @@ -4793,13 +4901,20 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host, return -EBUSY; }

- dsi->vc[channel].dest = client; + atomic_set(&dsi->do_ext_te_update, 0);

- dsi->pix_fmt = client->format; - if (client->mode_flags & MIPI_DSI_MODE_VIDEO) + if (client->mode_flags & MIPI_DSI_MODE_VIDEO) { dsi->mode = OMAP_DSS_DSI_VIDEO_MODE; - else + } else { + r = omap_dsi_register_te_irq(dsi, client); + if (r) + return r; + dsi->mode = OMAP_DSS_DSI_CMD_MODE; + } + + dsi->vc[channel].dest = client; + dsi->pix_fmt = client->format;

return 0; } @@ -4816,6 +4931,7 @@ int omap_dsi_host_detach(struct mipi_dsi_host *host, if (dsi->vc[channel].dest != client) return -EINVAL;

+ omap_dsi_unregister_te_irq(dsi); dsi->vc[channel].dest = NULL; return 0; }

This moves the bus locking into the host driver and unexports the custom API in preparation for drm_panel support.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 46 +------------------ drivers/gpu/drm/omapdrm/dss/dsi.c | 33 ++++++++----- drivers/gpu/drm/omapdrm/dss/omapdss.h | 3 -- 3 files changed, 23 insertions(+), 59 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 787f953168ec..36101d9ba84d 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -298,7 +298,6 @@ static int dsicm_wake_up(struct panel_drv_data *ddata) static int dsicm_bl_update_status(struct backlight_device *dev) { struct panel_drv_data *ddata = dev_get_drvdata(&dev->dev); - struct omap_dss_device *src = ddata->src; int r = 0; int level;

@@ -313,15 +312,11 @@ static int dsicm_bl_update_status(struct backlight_device *dev) mutex_lock(&ddata->lock);

if (ddata->enabled) { - src->ops->dsi.bus_lock(src); - r = dsicm_wake_up(ddata); if (!r) { r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, level); } - - src->ops->dsi.bus_unlock(src); }

mutex_unlock(&ddata->lock); @@ -347,21 +342,16 @@ static ssize_t dsicm_num_errors_show(struct device *dev, struct device_attribute *attr, char *buf) { struct panel_drv_data *ddata = dev_get_drvdata(dev); - struct omap_dss_device *src = ddata->src; u8 errors = 0; int r;

mutex_lock(&ddata->lock);

if (ddata->enabled) { - src->ops->dsi.bus_lock(src); - r = dsicm_wake_up(ddata); if (!r) r = dsicm_dcs_read_1(ddata, DCS_READ_NUM_ERRORS, &errors); - - src->ops->dsi.bus_unlock(src); } else { r = -ENODEV; } @@ -378,20 +368,15 @@ static ssize_t dsicm_hw_revision_show(struct device *dev, struct device_attribute *attr, char *buf) { struct panel_drv_data *ddata = dev_get_drvdata(dev); - struct omap_dss_device *src = ddata->src; u8 id1, id2, id3; int r;

mutex_lock(&ddata->lock);

if (ddata->enabled) { - src->ops->dsi.bus_lock(src); - r = dsicm_wake_up(ddata); if (!r) r = dsicm_get_id(ddata, &id1, &id2, &id3); - - src->ops->dsi.bus_unlock(src); } else { r = -ENODEV; } @@ -409,7 +394,6 @@ static ssize_t dsicm_store_ulps(struct device *dev, const char *buf, size_t count) { struct panel_drv_data *ddata = dev_get_drvdata(dev); - struct omap_dss_device *src = ddata->src; unsigned long t; int r;

@@ -420,14 +404,10 @@ static ssize_t dsicm_store_ulps(struct device *dev, mutex_lock(&ddata->lock);

if (ddata->enabled) { - src->ops->dsi.bus_lock(src); - if (t) r = dsicm_enter_ulps(ddata); else r = dsicm_wake_up(ddata); - - src->ops->dsi.bus_unlock(src); }

mutex_unlock(&ddata->lock); @@ -457,7 +437,6 @@ static ssize_t dsicm_store_ulps_timeout(struct device *dev, const char *buf, size_t count) { struct panel_drv_data *ddata = dev_get_drvdata(dev); - struct omap_dss_device *src = ddata->src; unsigned long t; int r;

@@ -470,9 +449,7 @@ static ssize_t dsicm_store_ulps_timeout(struct device *dev,

if (ddata->enabled) { /* dsicm_wake_up will restart the timer */ - src->ops->dsi.bus_lock(src); r = dsicm_wake_up(ddata); - src->ops->dsi.bus_unlock(src); }

mutex_unlock(&ddata->lock); @@ -673,17 +650,11 @@ static void dsicm_disconnect(struct omap_dss_device *src, static void dsicm_enable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; int r;

mutex_lock(&ddata->lock);

- src->ops->dsi.bus_lock(src); - r = dsicm_power_on(ddata); - - src->ops->dsi.bus_unlock(src); - if (r) goto err;

@@ -700,7 +671,6 @@ static void dsicm_enable(struct omap_dss_device *dssdev) static void dsicm_disable(struct omap_dss_device *dssdev) { struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; int r;

dsicm_bl_power(ddata, false); @@ -709,24 +679,19 @@ static void dsicm_disable(struct omap_dss_device *dssdev)

dsicm_cancel_ulps_work(ddata);

- src->ops->dsi.bus_lock(src); - r = dsicm_wake_up(ddata); if (!r) dsicm_power_off(ddata);

- src->ops->dsi.bus_unlock(src); - mutex_unlock(&ddata->lock); }

static void dsicm_framedone_cb(int err, void *data) { struct panel_drv_data *ddata = data; - struct omap_dss_device *src = ddata->src;

dev_dbg(&ddata->dsi->dev, "framedone, err %d\n", err); - src->ops->dsi.bus_unlock(src); + mutex_unlock(&ddata->lock); }

static int dsicm_update(struct omap_dss_device *dssdev, @@ -739,7 +704,6 @@ static int dsicm_update(struct omap_dss_device *dssdev, dev_dbg(&ddata->dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h);

mutex_lock(&ddata->lock); - src->ops->dsi.bus_lock(src);

r = dsicm_wake_up(ddata); if (r) @@ -761,11 +725,9 @@ static int dsicm_update(struct omap_dss_device *dssdev, if (r) goto err;

- /* note: no bus_unlock here. unlock is src framedone_cb */ - mutex_unlock(&ddata->lock); + /* note: no unlock here. unlock is src framedone_cb */ return 0; err: - src->ops->dsi.bus_unlock(src); mutex_unlock(&ddata->lock); return r; } @@ -791,7 +753,6 @@ static void dsicm_ulps_work(struct work_struct *work) struct panel_drv_data *ddata = container_of(work, struct panel_drv_data, ulps_work.work); struct omap_dss_device *dssdev = &ddata->dssdev; - struct omap_dss_device *src = ddata->src;

mutex_lock(&ddata->lock);

@@ -800,11 +761,8 @@ static void dsicm_ulps_work(struct work_struct *work) return; }

- src->ops->dsi.bus_lock(src); - dsicm_enter_ulps(ddata);

- src->ops->dsi.bus_unlock(src); mutex_unlock(&ddata->lock); }

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 8060009fbfb9..8387abea21a5 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -479,17 +479,13 @@ static inline u32 dsi_read_reg(struct dsi_data *dsi, const struct dsi_reg idx) return __raw_readl(base + idx.idx); }

-static void dsi_bus_lock(struct omap_dss_device *dssdev) +static void dsi_bus_lock(struct dsi_data *dsi) { - struct dsi_data *dsi = to_dsi_data(dssdev); - down(&dsi->bus_lock); }

-static void dsi_bus_unlock(struct omap_dss_device *dssdev) +static void dsi_bus_unlock(struct dsi_data *dsi) { - struct dsi_data *dsi = to_dsi_data(dssdev); - up(&dsi->bus_lock); }

@@ -3805,6 +3801,8 @@ static void dsi_handle_framedone(struct dsi_data *dsi, int error) REG_FLD_MOD(dsi, DSI_TIMING2, 1, 15, 15); /* LP_RX_TO */ }

+ dsi_bus_unlock(dsi); + dsi->framedone_callback(error, dsi->framedone_data);

if (!error) @@ -3864,6 +3862,8 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel, { struct dsi_data *dsi = to_dsi_data(dssdev);

+ dsi_bus_lock(dsi); + dsi->update_channel = channel; dsi->framedone_callback = callback; dsi->framedone_data = data; @@ -4723,10 +4723,9 @@ static enum omap_channel dsi_get_channel(struct dsi_data *dsi) } }

-static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, - const struct mipi_dsi_msg *msg) +static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, + const struct mipi_dsi_msg *msg) { - struct dsi_data *dsi = host_to_omap(host); struct omap_dss_device *dssdev = &dsi->output; int r;

@@ -4775,6 +4774,19 @@ static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, return 0; }

+static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, + const struct mipi_dsi_msg *msg) +{ + struct dsi_data *dsi = host_to_omap(host); + int r; + + dsi_bus_lock(dsi); + r = _omap_dsi_host_transfer(dsi, msg); + dsi_bus_unlock(dsi); + + return r; +} + static int dsi_get_clocks(struct dsi_data *dsi) { struct clk *clk; @@ -4808,9 +4820,6 @@ static const struct omap_dss_device_ops dsi_ops = { .enable = dsi_display_enable,

.dsi = { - .bus_lock = dsi_bus_lock, - .bus_unlock = dsi_bus_unlock, - .disable = dsi_display_disable,

.set_config = dsi_set_config, diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index ca52b08c57db..2d6ab948a6dd 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -297,9 +297,6 @@ struct omapdss_dsi_ops { int (*update)(struct omap_dss_device *dssdev, int channel, void (*callback)(int, void *), void *data);

- void (*bus_lock)(struct omap_dss_device *dssdev); - void (*bus_unlock)(struct omap_dss_device *dssdev); - int (*enable_video_output)(struct omap_dss_device *dssdev, int channel); void (*disable_video_output)(struct omap_dss_device *dssdev, int channel);

DSI command mode panels are self-refreshing displays, that can be updated very rarely for static images. For this kind of scenario some panels support, that the DSI bus switches into ULPS mode until the panel needs to be refreshed.

This is problematic on some panels, so introduce a flag to signal the DSI host implementation that the panel allows going into ULPS mode.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- include/drm/drm_mipi_dsi.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index 13cf2ae59f6c..5f2e3e6fb013 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -131,6 +131,8 @@ struct mipi_dsi_host *of_find_mipi_dsi_host_by_node(struct device_node *node); #define MIPI_DSI_CLOCK_NON_CONTINUOUS BIT(10) /* transmit data in low power */ #define MIPI_DSI_MODE_LPM BIT(11) +/* allow going into ULPS mode while command mode panel is not updated */ +#define MIPI_DSI_MODE_ULPS_IDLE BIT(12)

enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB888,

This moves the panel refresh/update function from the panel driver into the DSI host driver to prepare for common drm_panel support.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 68 ------------ drivers/gpu/drm/omapdrm/dss/dsi.c | 101 ++++++++++++++++-- drivers/gpu/drm/omapdrm/dss/omapdss.h | 7 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 11 +- 4 files changed, 97 insertions(+), 90 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 56398e2aec2d..9bfc262f5c5a 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -177,27 +177,6 @@ static int dsicm_get_id(struct panel_drv_data *ddata, u8 *id1, u8 *id2, u8 *id3) return 0; }

-static int dsicm_set_update_window(struct panel_drv_data *ddata, - u16 x, u16 y, u16 w, u16 h) -{ - struct mipi_dsi_device *dsi = ddata->dsi; - int r; - u16 x1 = x; - u16 x2 = x + w - 1; - u16 y1 = y; - u16 y2 = y + h - 1; - - r = mipi_dsi_dcs_set_column_address(dsi, x1, x2); - if (r < 0) - return r; - - r = mipi_dsi_dcs_set_page_address(dsi, y1, y2); - if (r < 0) - return r; - - return 0; -} - static int dsicm_bl_update_status(struct backlight_device *dev) { struct panel_drv_data *ddata = dev_get_drvdata(&dev->dev); @@ -470,48 +449,6 @@ static void dsicm_disable(struct omap_dss_device *dssdev) mutex_unlock(&ddata->lock); }

-static void dsicm_framedone_cb(int err, void *data) -{ - struct panel_drv_data *ddata = data; - - dev_dbg(&ddata->dsi->dev, "framedone, err %d\n", err); - mutex_unlock(&ddata->lock); -} - -static int dsicm_update(struct omap_dss_device *dssdev, - u16 x, u16 y, u16 w, u16 h) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; - int r; - - dev_dbg(&ddata->dsi->dev, "update %d, %d, %d x %d\n", x, y, w, h); - - mutex_lock(&ddata->lock); - - if (!ddata->enabled) { - r = 0; - goto err; - } - - /* XXX no need to send this every frame, but dsi break if not done */ - r = dsicm_set_update_window(ddata, 0, 0, ddata->vm.hactive, - ddata->vm.vactive); - if (r) - goto err; - - r = src->ops->dsi.update(src, ddata->dsi->channel, dsicm_framedone_cb, - ddata); - if (r) - goto err; - - /* note: no unlock here. unlock is src framedone_cb */ - return 0; -err: - mutex_unlock(&ddata->lock); - return r; -} - static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) { struct mipi_dsi_device *dsi = ddata->dsi; @@ -572,10 +509,6 @@ static const struct omap_dss_device_ops dsicm_ops = { .check_timings = dsicm_check_timings, };

-static const struct omap_dss_driver dsicm_dss_driver = { - .update = dsicm_update, -}; - static int dsicm_probe_of(struct mipi_dsi_device *dsi) { struct device_node *node = dsi->dev.of_node; @@ -660,7 +593,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) dssdev = &ddata->dssdev; dssdev->dev = dev; dssdev->ops = &dsicm_ops; - dssdev->driver = &dsicm_dss_driver; dssdev->type = OMAP_DISPLAY_TYPE_DSI; dssdev->display = true; dssdev->owner = THIS_MODULE; diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 35c0ce72cd15..66ad7dbc66a2 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -217,6 +217,9 @@ static void dsi_display_uninit_dispc(struct dsi_data *dsi);

static int dsi_vc_send_null(struct dsi_data *dsi, int channel);

+static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, + const struct mipi_dsi_msg *msg); + /* DSI PLL HSDIV indices */ #define HSDIV_DISPC 0 #define HSDIV_DSI 1 @@ -386,9 +389,6 @@ struct dsi_data {

struct delayed_work ulps_work;

- void (*framedone_callback)(int, void *); - void *framedone_data; - struct delayed_work framedone_timeout_work;

#ifdef DSI_CATCH_MISSING_TE @@ -3809,8 +3809,6 @@ static void dsi_handle_framedone(struct dsi_data *dsi, int error) dsi_set_ulps_auto(dsi, true); dsi_bus_unlock(dsi);

- dsi->framedone_callback(error, dsi->framedone_data); - if (!error) dsi_perf_show(dsi, "DISPC"); } @@ -3842,6 +3840,8 @@ static void dsi_framedone_irq_callback(void *data)

cancel_delayed_work(&dsi->framedone_timeout_work);

+ DSSDBG("Framedone received!\n"); + dsi_handle_framedone(dsi, 0); }

@@ -3863,17 +3863,69 @@ static int _dsi_update(struct dsi_data *dsi) return 0; }

-static int dsi_update(struct omap_dss_device *dssdev, int channel, - void (*callback)(int, void *), void *data) +static int _dsi_update_window(struct dsi_data *dsi, int channel, + int x, int y, int w, int h) +{ + int x1 = x, x2 = (x + w - 1); + int y1 = y, y2 = (y + h - 1); + u8 payloadX[5] = { MIPI_DCS_SET_COLUMN_ADDRESS, + x1 >> 8, x1 & 0xff, x2 >> 8, x2 & 0xff }; + u8 payloadY[5] = { MIPI_DCS_SET_PAGE_ADDRESS, + y1 >> 8, y1 & 0xff, y2 >> 8, y2 & 0xff }; + struct mipi_dsi_msg msgX = { 0 }, msgY = { 0 }; + int ret; + + WARN_ON(!dsi_bus_is_locked(dsi)); + + msgX.type = MIPI_DSI_DCS_LONG_WRITE; + msgX.channel = channel; + msgX.tx_buf = payloadX; + msgX.tx_len = sizeof(payloadX); + + msgY.type = MIPI_DSI_DCS_LONG_WRITE; + msgY.channel = channel; + msgY.tx_buf = payloadY; + msgY.tx_len = sizeof(payloadY); + + ret = _omap_dsi_host_transfer(dsi, &msgX); + if (ret != 0) + return ret; + + return _omap_dsi_host_transfer(dsi, &msgY); +} + +static int dsi_update_channel(struct omap_dss_device *dssdev, int channel) { struct dsi_data *dsi = to_dsi_data(dssdev); + int r; + + if (channel > 3) + return -EINVAL;

dsi_bus_lock(dsi); + + if (!dsi->vc[channel].dest) { + r = -ENODEV; + goto err; + } + + if (dsi->vm.hactive == 0 || dsi->vm.vactive == 0) { + r = -EINVAL; + goto err; + } + + DSSDBG("dsi_update_channel: %d", channel); + dsi_set_ulps_auto(dsi, false);

+ r = _dsi_update_window(dsi, channel, 0, 0, dsi->vm.hactive, + dsi->vm.vactive); + if (r < 0) { + DSSWARN("window update error: %d\n", r); + goto err; + } + dsi->update_channel = channel; - dsi->framedone_callback = callback; - dsi->framedone_data = data;

if (dsi->te_enabled && dsi->te_gpio) { schedule_delayed_work(&dsi->te_timeout_work, @@ -3883,6 +3935,24 @@ static int dsi_update(struct omap_dss_device *dssdev, int channel, _dsi_update(dsi); }

+ return 0; + +err: + dsi_set_ulps_auto(dsi, true); + dsi_bus_unlock(dsi); + return r; +} + +static int dsi_update_all(struct omap_dss_device *dssdev) +{ + int i, r; + + for (i = 0; i < 4; i++) { + r = dsi_update_channel(dssdev, i); + if (r != -ENODEV) + return r; + } + return 0; }

@@ -4102,7 +4172,9 @@ static void dsi_display_enable(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); DSSDBG("dsi_display_enable\n"); + dsi_bus_lock(dsi); dsi_display_ulps_enable(dsi); + dsi_bus_unlock(dsi); }

static void dsi_display_ulps_disable(struct dsi_data *dsi, @@ -4128,7 +4200,9 @@ static void dsi_display_disable(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); DSSDBG("dsi_display_disable\n"); + dsi_bus_lock(dsi); dsi_display_ulps_disable(dsi, true, false); + dsi_bus_unlock(dsi); }

static int dsi_enable_te(struct dsi_data *dsi, bool enable) @@ -4876,7 +4950,7 @@ static const struct omap_dss_device_ops dsi_ops = { .enable_video_output = dsi_enable_video_output, .disable_video_output = dsi_disable_video_output,

- .update = dsi_update, + .update = dsi_update_all, }, };

@@ -4974,14 +5048,18 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host, return -EBUSY; }

+ dsi_bus_lock(dsi); + atomic_set(&dsi->do_ext_te_update, 0);

if (client->mode_flags & MIPI_DSI_MODE_VIDEO) { dsi->mode = OMAP_DSS_DSI_VIDEO_MODE; } else { r = omap_dsi_register_te_irq(dsi, client); - if (r) + if (r) { + dsi_bus_unlock(dsi); return r; + }

dsi->mode = OMAP_DSS_DSI_CMD_MODE; } @@ -4995,6 +5073,7 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host, dsi->ulps_auto_idle = !!(client->mode_flags & MIPI_DSI_MODE_ULPS_IDLE); dsi_set_ulps_auto(dsi, true);

+ dsi_bus_unlock(dsi); return 0; }

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 74cf0371b8bb..21601af29ee4 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -287,13 +287,12 @@ struct omapdss_hdmi_ops { };

struct omapdss_dsi_ops { - /* bus configuration */ + int (*update)(struct omap_dss_device *dssdev); + + /* legacy API used by omapdss panels */ int (*set_config)(struct omap_dss_device *dssdev, const struct omap_dss_dsi_config *cfg);

- int (*update)(struct omap_dss_device *dssdev, int channel, - void (*callback)(int, void *), void *data); - int (*enable_video_output)(struct omap_dss_device *dssdev, int channel); void (*disable_video_output)(struct omap_dss_device *dssdev, int channel); diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 8b469eaa5005..a8d0543d1296 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -362,10 +362,8 @@ static void omap_crtc_manual_display_update(struct work_struct *data) { struct omap_crtc *omap_crtc = container_of(data, struct omap_crtc, update_work.work); - struct drm_display_mode *mode = &omap_crtc->pipe->crtc->mode; - struct omap_dss_device *dssdev = omap_crtc->pipe->output->next; + struct omap_dss_device *dssdev = omap_crtc->pipe->output; struct drm_device *dev = omap_crtc->base.dev; - const struct omap_dss_driver *dssdrv; int ret;

if (!dssdev) { @@ -373,13 +371,12 @@ static void omap_crtc_manual_display_update(struct work_struct *data) return; }

- dssdrv = dssdev->driver; - if (!dssdrv || !dssdrv->update) { - dev_err_once(dev->dev, "missing or incorrect dssdrv!"); + if (dssdev->type != OMAP_DISPLAY_TYPE_DSI || !dssdev->ops->dsi.update) { + dev_err_once(dev->dev, "no DSI update callback found!"); return; }

- ret = dssdrv->update(dssdev, 0, 0, mode->hdisplay, mode->vdisplay); + ret = dssdev->ops->dsi.update(dssdev); if (ret < 0) { spin_lock_irq(&dev->event_lock); omap_crtc->pending = false;

This converts the DSI module to expect common drm_panel display drivers instead of dssdev based ones.

This commit is WIP. We somehow need to know the panels resolution in omap_dsi_host_attach(), so that we can properly configure the DSI bus clock before enabling the bus. The control bus must be enabled at this point, so that the panel can use it.

Other drivers run drm_panel_attach() in their dsi host attach, which makes it possible to call drm_panel_get_modes() afterwards and the get the correct mode from the connector.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 217 +++++++----------- drivers/gpu/drm/omapdrm/dss/dsi.c | 141 ++++++++++-- .../gpu/drm/omapdrm/dss/omapdss-boot-init.c | 1 - drivers/gpu/drm/omapdrm/dss/omapdss.h | 22 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 17 +- 5 files changed, 205 insertions(+), 193 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 18020ac43a83..84b0e79c025e 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -6,8 +6,6 @@ * Author: Tomi Valkeinen tomi.valkeinen@ti.com */

-/* #define DEBUG */ - #include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> @@ -20,11 +18,14 @@ #include <linux/regulator/consumer.h>

#include <drm/drm_connector.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_panel.h> +#include <drm/drm_modes.h>

+#include <video/display_timing.h> #include <video/mipi_display.h> #include <video/of_display_timing.h> - -#include "../dss/omapdss.h" +#include <video/videomode.h>

#define DCS_READ_NUM_ERRORS 0x05 #define DCS_GET_ID1 0xda @@ -35,11 +36,8 @@

struct panel_drv_data { struct mipi_dsi_device *dsi; - - struct omap_dss_device dssdev; - struct omap_dss_device *src; - - struct videomode vm; + struct drm_panel panel; + struct drm_display_mode mode;

struct mutex lock;

@@ -71,7 +69,11 @@ struct panel_drv_data { bool ulps_enabled; };

-#define to_panel_data(p) container_of(p, struct panel_drv_data, dssdev) + +static inline struct panel_drv_data *panel_to_ddata(struct drm_panel *panel) +{ + return container_of(panel, struct panel_drv_data, panel); +}

static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable);

@@ -285,10 +287,15 @@ static void dsicm_hw_reset(struct panel_drv_data *ddata)

static int dsicm_power_on(struct panel_drv_data *ddata) { - struct omap_dss_device *src = ddata->src; u8 id1, id2, id3; int r;

+ r = regulator_bulk_enable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); + if (r) { + dev_err(&ddata->dsi->dev, "failed to enable supplies: %d\n", r); + return r; + } + dsicm_hw_reset(ddata);

ddata->dsi->mode_flags |= MIPI_DSI_MODE_LPM; @@ -322,10 +329,6 @@ static int dsicm_power_on(struct panel_drv_data *ddata) if (r) goto err;

- r = src->ops->dsi.enable_video_output(src, ddata->dsi->channel); - if (r) - goto err; - ddata->enabled = 1;

if (!ddata->intro_printed) { @@ -342,18 +345,17 @@ static int dsicm_power_on(struct panel_drv_data *ddata)

dsicm_hw_reset(ddata);

+ regulator_bulk_disable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); + return r; }

-static void dsicm_power_off(struct panel_drv_data *ddata) +static int dsicm_power_off(struct panel_drv_data *ddata) { - struct omap_dss_device *src = ddata->src; int r;

ddata->enabled = 0;

- src->ops->dsi.disable_video_output(src, ddata->dsi->channel); - r = mipi_dsi_dcs_set_display_off(ddata->dsi); if (!r) r = dsicm_sleep_in(ddata); @@ -363,52 +365,17 @@ static void dsicm_power_off(struct panel_drv_data *ddata) "error disabling panel, issuing HW reset\n"); dsicm_hw_reset(ddata); } -}

-static int dsicm_connect(struct omap_dss_device *src, - struct omap_dss_device *dst) -{ - struct panel_drv_data *ddata = to_panel_data(dst); - - ddata->src = src; - return 0; -} - -static void dsicm_disconnect(struct omap_dss_device *src, - struct omap_dss_device *dst) -{ - struct panel_drv_data *ddata = to_panel_data(dst); - - ddata->src = NULL; -} - -static void dsicm_pre_enable(struct omap_dss_device *dssdev) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - struct omap_dss_device *src = ddata->src; - int r; - struct omap_dss_dsi_config dsi_config = { - .vm = &ddata->vm, - .hs_clk_min = 150000000, - .hs_clk_max = 300000000, - .lp_clk_min = 7000000, - .lp_clk_max = 10000000, - }; - - r = regulator_bulk_enable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); - if (r) { - dev_err(&ddata->dsi->dev, "failed to enable supplies: %d\n", r); - } + r = regulator_bulk_disable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); + if (r) + dev_err(&ddata->dsi->dev, "failed to disable supplies: %d\n", r);

- r = src->ops->dsi.set_config(src, &dsi_config); - if (r) { - dev_err(&ddata->dsi->dev, "failed to configure DSI\n"); - } + return r; }

-static void dsicm_enable(struct omap_dss_device *dssdev) +static int dsicm_prepare(struct drm_panel *panel) { - struct panel_drv_data *ddata = to_panel_data(dssdev); + struct panel_drv_data *ddata = panel_to_ddata(panel); int r;

mutex_lock(&ddata->lock); @@ -421,33 +388,27 @@ static void dsicm_enable(struct omap_dss_device *dssdev)

dsicm_bl_power(ddata, true);

- return; + return 0; err: - dev_dbg(&ddata->dsi->dev, "enable failed (%d)\n", r); + dev_err(&ddata->dsi->dev, "enable failed (%d)\n", r); mutex_unlock(&ddata->lock); + return r; }

-static void dsicm_disable(struct omap_dss_device *dssdev) +static int dsicm_unprepare(struct drm_panel *panel) { - struct panel_drv_data *ddata = to_panel_data(dssdev); + struct panel_drv_data *ddata = panel_to_ddata(panel); + int r;

dsicm_bl_power(ddata, false);

mutex_lock(&ddata->lock);

- dsicm_power_off(ddata); + r = dsicm_power_off(ddata);

mutex_unlock(&ddata->lock); -} - -static void dsicm_post_disable(struct omap_dss_device *dssdev) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - int r;

- r = regulator_bulk_disable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); - if (r) - dev_err(&ddata->dsi->dev, "failed to disable supplies: %d\n", r); + return r; }

static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) @@ -466,50 +427,35 @@ static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) return r; }

-static int dsicm_get_modes(struct omap_dss_device *dssdev, - struct drm_connector *connector) +static int dsicm_get_modes(struct drm_panel *panel) { - struct panel_drv_data *ddata = to_panel_data(dssdev); - - connector->display_info.width_mm = ddata->width_mm; - connector->display_info.height_mm = ddata->height_mm; - - return omapdss_display_get_modes(connector, &ddata->vm); -} - -static int dsicm_check_timings(struct omap_dss_device *dssdev, - struct drm_display_mode *mode) -{ - struct panel_drv_data *ddata = to_panel_data(dssdev); - int ret = 0; + struct panel_drv_data *ddata = panel_to_ddata(panel); + struct drm_connector *connector = panel->connector; + struct drm_display_mode *mode; + + mode = drm_mode_duplicate(panel->drm, &ddata->mode); + if (!mode) { + dev_err(&ddata->dsi->dev, "failed to add mode %ux%ux@%u\n", + ddata->mode.hdisplay, ddata->mode.vdisplay, + ddata->mode.vrefresh); + return -ENOMEM; + }

- if (mode->hdisplay != ddata->vm.hactive) - ret = -EINVAL; + drm_mode_set_name(mode);

- if (mode->vdisplay != ddata->vm.vactive) - ret = -EINVAL; + mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + drm_mode_probed_add(connector, mode);

- if (ret) { - dev_warn(dssdev->dev, "wrong resolution: %d x %d", - mode->hdisplay, mode->vdisplay); - dev_warn(dssdev->dev, "panel resolution: %d x %d", - ddata->vm.hactive, ddata->vm.vactive); - } + connector->display_info.width_mm = ddata->width_mm; + connector->display_info.height_mm = ddata->height_mm;

- return ret; + return 1; }

-static const struct omap_dss_device_ops dsicm_ops = { - .connect = dsicm_connect, - .disconnect = dsicm_disconnect, - - .pre_enable = dsicm_pre_enable, - .enable = dsicm_enable, - .disable = dsicm_disable, - .post_disable = dsicm_post_disable, - - .get_modes = dsicm_get_modes, - .check_timings = dsicm_check_timings, +static const struct drm_panel_funcs dsicm_panel_funcs = { + .unprepare = dsicm_unprepare, + .prepare = dsicm_prepare, + .get_modes = dsicm_get_modes, };

static int dsicm_probe_of(struct mipi_dsi_device *dsi) @@ -518,8 +464,12 @@ static int dsicm_probe_of(struct mipi_dsi_device *dsi) struct device_node *backlight; struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi); struct display_timing timing; + struct videomode vm; int err;

+ vm.hactive = 864; + vm.vactive = 480; + ddata->reset_gpio = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(ddata->reset_gpio)) { err = PTR_ERR(ddata->reset_gpio); @@ -529,15 +479,16 @@ static int dsicm_probe_of(struct mipi_dsi_device *dsi)

err = of_get_display_timing(node, "panel-timing", &timing); if (!err) { - videomode_from_timing(&timing, &ddata->vm); - if (!ddata->vm.pixelclock) - ddata->vm.pixelclock = - ddata->vm.hactive * ddata->vm.vactive * 60; + videomode_from_timing(&timing, &vm); } else { dev_warn(&dsi->dev, "failed to get video timing, using defaults\n"); }

+ if (!vm.pixelclock) + vm.pixelclock = vm.hactive * vm.vactive * 60; + drm_display_mode_from_videomode(&vm, &ddata->mode); + ddata->width_mm = 0; of_property_read_u32(node, "width-mm", &ddata->width_mm);

@@ -573,7 +524,6 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) struct panel_drv_data *ddata; struct backlight_device *bldev = NULL; struct device *dev = &dsi->dev; - struct omap_dss_device *dssdev; int r;

dev_dbg(dev, "probe\n"); @@ -585,33 +535,17 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) mipi_dsi_set_drvdata(dsi, ddata); ddata->dsi = dsi;

- ddata->vm.hactive = 864; - ddata->vm.vactive = 480; - ddata->vm.pixelclock = 864 * 480 * 60; - r = dsicm_probe_of(dsi); if (r) return r;

- dssdev = &ddata->dssdev; - dssdev->dev = dev; - dssdev->ops = &dsicm_ops; - dssdev->type = OMAP_DISPLAY_TYPE_DSI; - dssdev->display = true; - dssdev->owner = THIS_MODULE; - dssdev->of_ports = BIT(0); - dssdev->ops_flags = OMAP_DSS_DEVICE_OP_MODES; - - dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE | - OMAP_DSS_DISPLAY_CAP_TEAR_ELIM; - - omapdss_display_init(dssdev); - omapdss_device_register(dssdev); - mutex_init(&ddata->lock);

dsicm_hw_reset(ddata);

+ drm_panel_init(&ddata->panel, dev, &dsicm_panel_funcs, + DRM_MODE_CONNECTOR_DSI); + if (ddata->use_dsi_backlight) { struct backlight_properties props = { 0 }; props.max_brightness = 255; @@ -643,6 +577,10 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) if (ddata->ulps_enabled) dsi->mode_flags |= MIPI_DSI_MODE_ULPS_IDLE;

+ r = drm_panel_add(&ddata->panel); + if (r < 0) + goto err_panel_add; + r = mipi_dsi_attach(dsi); if (r < 0) goto err_dsi_attach; @@ -650,6 +588,8 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) return 0;

err_dsi_attach: + drm_panel_remove(&ddata->panel); +err_panel_add: sysfs_remove_group(&dsi->dev.kobj, &dsicm_attr_group); err_bl: if (ddata->extbldev) @@ -661,15 +601,12 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) static int __exit dsicm_remove(struct mipi_dsi_device *dsi) { struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi); - struct omap_dss_device *dssdev = &ddata->dssdev;

dev_dbg(&dsi->dev, "remove\n");

mipi_dsi_detach(dsi);

- omapdss_device_unregister(dssdev); - - omapdss_device_disconnect(ddata->src, dssdev); + drm_panel_remove(&ddata->panel);

sysfs_remove_group(&dsi->dev.kobj, &dsicm_attr_group);

@@ -683,7 +620,7 @@ static int __exit dsicm_remove(struct mipi_dsi_device *dsi) }

static const struct of_device_id dsicm_of_match[] = { - { .compatible = "omapdss,panel-dsi-cm", }, + { .compatible = "panel-dsi-cm", }, {}, };

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 66ad7dbc66a2..754815068927 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -37,6 +37,7 @@

#include <video/mipi_display.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_panel.h>

#include "omapdss.h" #include "dss.h" @@ -220,6 +221,8 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int channel); static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, const struct mipi_dsi_msg *msg);

+static void dsi_display_disable(struct omap_dss_device *dssdev); + /* DSI PLL HSDIV indices */ #define HSDIV_DISPC 0 #define HSDIV_DSI 1 @@ -386,6 +389,7 @@ struct dsi_data { bool te_enabled; bool ulps_enabled; bool ulps_auto_idle; + bool video_enabled;

struct delayed_work ulps_work;

@@ -426,6 +430,8 @@ struct dsi_data {

unsigned int scp_clk_refcount;

+ struct omap_dss_dsi_config config; + struct dss_lcd_mgr_config mgr_config; struct videomode vm; enum mipi_dsi_pixel_format pix_fmt; @@ -3629,7 +3635,7 @@ static int dsi_configure_pins(struct omap_dss_device *dssdev, return 0; }

-static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) +static void dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) { struct dsi_data *dsi = to_dsi_data(dssdev); int bpp = mipi_dsi_pixel_format_to_bpp(dsi->pix_fmt); @@ -3638,8 +3644,10 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) int r;

r = dsi_display_init_dispc(dsi); - if (r) - return r; + if (r) { + dev_err(dsi->dev, "failed to init dispc!\n"); + return; + }

if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) { switch (dsi->pix_fmt) { @@ -3679,7 +3687,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) if (r) goto err_mgr_enable;

- return 0; + return;

err_mgr_enable: if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) { @@ -3688,7 +3696,8 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) } err_pix_fmt: dsi_display_uninit_dispc(dsi); - return r; + dev_err(dsi->dev, "failed to enable DSI encoder!\n"); + return; }

static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel) @@ -3711,6 +3720,25 @@ static void dsi_disable_video_output(struct omap_dss_device *dssdev, int channel dsi_display_uninit_dispc(dsi); }

+static void dsi_disable_video_outputs(struct omap_dss_device *dssdev) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + int i; + + dsi_bus_lock(dsi); + dsi->video_enabled = false; + + for (i = 0; i < 3; i++) { + if (!dsi->vc[i].dest) + continue; + dsi_disable_video_output(dssdev, i); + } + + dsi_display_disable(dssdev); + + dsi_bus_unlock(dsi); +} + static void dsi_update_screen_dispc(struct dsi_data *dsi) { unsigned int bytespp; @@ -3904,6 +3932,11 @@ static int dsi_update_channel(struct omap_dss_device *dssdev, int channel)

dsi_bus_lock(dsi);

+ if (!dsi->video_enabled) { + r = -EIO; + goto err; + } + if (!dsi->vc[channel].dest) { r = -ENODEV; goto err; @@ -3949,7 +3982,7 @@ static int dsi_update_all(struct omap_dss_device *dssdev)

for (i = 0; i < 4; i++) { r = dsi_update_channel(dssdev, i); - if (r != -ENODEV) + if (r && r != -ENODEV) return r; }

@@ -4172,8 +4205,30 @@ static void dsi_display_enable(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); DSSDBG("dsi_display_enable\n"); - dsi_bus_lock(dsi); + WARN_ON(!dsi_bus_is_locked(dsi)); + dsi_display_ulps_enable(dsi); +} + +static void dsi_enable_video_outputs(struct omap_dss_device *dssdev) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + int i; + + dsi_bus_lock(dsi); + + dsi_display_enable(dssdev); + + for (i = 0; i < 3; i++) { + if (!dsi->vc[i].dest) + continue; + dsi_enable_video_output(dssdev, i); + } + + dsi->video_enabled = true; + + dsi_set_ulps_auto(dsi, true); + dsi_bus_unlock(dsi); }

@@ -4199,10 +4254,10 @@ static void dsi_display_ulps_disable(struct dsi_data *dsi, static void dsi_display_disable(struct omap_dss_device *dssdev) { struct dsi_data *dsi = to_dsi_data(dssdev); + WARN_ON(!dsi_bus_is_locked(dsi)); DSSDBG("dsi_display_disable\n"); - dsi_bus_lock(dsi); + dsi_display_ulps_disable(dsi, true, false); - dsi_bus_unlock(dsi); }

static int dsi_enable_te(struct dsi_data *dsi, bool enable) @@ -4732,15 +4787,26 @@ static bool dsi_vm_calc(struct dsi_data *dsi, dsi_vm_calc_pll_cb, ctx); }

+static bool dsi_is_video_mode(struct omap_dss_device *dssdev) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + + return (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE); +} + static int dsi_set_config(struct omap_dss_device *dssdev, - const struct omap_dss_dsi_config *config) + const struct drm_display_mode *mode) { struct dsi_data *dsi = to_dsi_data(dssdev); struct dsi_clk_calc_ctx ctx; - struct omap_dss_dsi_config cfg = *config; + struct videomode vm; + struct omap_dss_dsi_config cfg = dsi->config; bool ok; int r;

+ drm_display_mode_to_videomode(mode, &vm); + cfg.vm = &vm; + mutex_lock(&dsi->lock);

cfg.mode = dsi->mode; @@ -4903,9 +4969,15 @@ static ssize_t omap_dsi_host_transfer(struct mipi_dsi_host *host, int r;

dsi_bus_lock(dsi); - dsi_set_ulps_auto(dsi, false); - r = _omap_dsi_host_transfer(dsi, msg); - dsi_set_ulps_auto(dsi, true); + + if (dsi->video_enabled) { + dsi_set_ulps_auto(dsi, false); + r = _omap_dsi_host_transfer(dsi, msg); + dsi_set_ulps_auto(dsi, true); + } else { + r = -EIO; + } + dsi_bus_unlock(dsi);

return r; @@ -4926,6 +4998,23 @@ static int dsi_get_clocks(struct dsi_data *dsi) return 0; }

+static void dsi_set_timings(struct omap_dss_device *dssdev, + const struct drm_display_mode *mode) +{ + DSSDBG("dsi_set_timings\n"); + dsi_set_config(dssdev, mode); +} + +static int dsi_check_timings(struct omap_dss_device *dssdev, + struct drm_display_mode *mode) +{ + DSSDBG("dsi_check_timings\n"); + + /* TODO */ + + return 0; +} + static int dsi_connect(struct omap_dss_device *src, struct omap_dss_device *dst) { @@ -4941,16 +5030,15 @@ static void dsi_disconnect(struct omap_dss_device *src, static const struct omap_dss_device_ops dsi_ops = { .connect = dsi_connect, .disconnect = dsi_disconnect, - .enable = dsi_display_enable, - .disable = dsi_display_disable, - - .dsi = { - .set_config = dsi_set_config, + .enable = dsi_enable_video_outputs, + .disable = dsi_disable_video_outputs,

- .enable_video_output = dsi_enable_video_output, - .disable_video_output = dsi_disable_video_output, + .check_timings = dsi_check_timings, + .set_timings = dsi_set_timings,

+ .dsi = { .update = dsi_update_all, + .is_video_mode = dsi_is_video_mode, }, };

@@ -5038,6 +5126,7 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host, { struct dsi_data *dsi = host_to_omap(host); unsigned int channel = client->channel; + struct drm_panel *panel; int r;

if (channel > 3) @@ -5050,6 +5139,10 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host,

dsi_bus_lock(dsi);

+ panel = of_drm_find_panel(client->dev.of_node); + if (IS_ERR(panel)) + return PTR_ERR(panel); + atomic_set(&dsi->do_ext_te_update, 0);

if (client->mode_flags & MIPI_DSI_MODE_VIDEO) { @@ -5070,8 +5163,12 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host, INIT_DEFERRABLE_WORK(&dsi->ulps_work, omap_dsi_ulps_work_callback);

+ dsi->config.hs_clk_min = 150000000; // TODO: get from client? + dsi->config.hs_clk_max = client->hs_rate; + dsi->config.lp_clk_min = 7000000; // TODO: get from client? + dsi->config.lp_clk_max = client->lp_rate; + dsi->ulps_auto_idle = !!(client->mode_flags & MIPI_DSI_MODE_ULPS_IDLE); - dsi_set_ulps_auto(dsi, true);

dsi_bus_unlock(dsi); return 0; diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c b/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c index 31502857f013..05ac2e1cd77e 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +++ b/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c @@ -176,7 +176,6 @@ static const struct of_device_id omapdss_of_match[] __initconst = { static const struct of_device_id omapdss_of_fixups_whitelist[] __initconst = { { .compatible = "composite-video-connector" }, { .compatible = "hdmi-connector" }, - { .compatible = "panel-dsi-cm" }, { .compatible = "svideo-connector" }, { .compatible = "ti,opa362" }, { .compatible = "ti,tpd12s015" }, diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 21601af29ee4..bfb402a88475 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -122,11 +122,6 @@ enum omap_dss_dsi_mode { OMAP_DSS_DSI_VIDEO_MODE, };

-enum omap_display_caps { - OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE = 1 << 0, - OMAP_DSS_DISPLAY_CAP_TEAR_ELIM = 1 << 1, -}; - enum omap_dss_display_state { OMAP_DSS_DISPLAY_DISABLED = 0, OMAP_DSS_DISPLAY_ACTIVE, @@ -288,14 +283,7 @@ struct omapdss_hdmi_ops {

struct omapdss_dsi_ops { int (*update)(struct omap_dss_device *dssdev); - - /* legacy API used by omapdss panels */ - int (*set_config)(struct omap_dss_device *dssdev, - const struct omap_dss_dsi_config *cfg); - - int (*enable_video_output)(struct omap_dss_device *dssdev, int channel); - void (*disable_video_output)(struct omap_dss_device *dssdev, - int channel); + bool (*is_video_mode)(struct omap_dss_device *dssdev); };

struct omap_dss_device_ops { @@ -374,13 +362,10 @@ struct omap_dss_device {

const char *name;

- const struct omap_dss_driver *driver; const struct omap_dss_device_ops *ops; unsigned long ops_flags; u32 bus_flags;

- enum omap_display_caps caps; - enum omap_dss_display_state state;

/* OMAP DSS output specific fields */ @@ -395,11 +380,6 @@ struct omap_dss_device { unsigned int of_ports; };

-struct omap_dss_driver { - int (*update)(struct omap_dss_device *dssdev, - u16 x, u16 y, u16 w, u16 h); -}; - struct dss_device *omapdss_get_dss(void); void omapdss_set_dss(struct dss_device *dss); static inline bool omapdss_is_initialized(void) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index a8d0543d1296..80ed1b15ba49 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -495,8 +495,7 @@ static enum drm_mode_status omap_crtc_mode_valid(struct drm_crtc *crtc, * valid DISPC mode. DSI will calculate and configure the * proper DISPC mode later. */ - if (omap_crtc->pipe->output->next == NULL || - omap_crtc->pipe->output->next->type != OMAP_DISPLAY_TYPE_DSI) { + if (omap_crtc->pipe->output->type != OMAP_DISPLAY_TYPE_DSI) { r = priv->dispc_ops->mgr_check_timings(priv->dispc, omap_crtc->channel, &vm); @@ -548,17 +547,17 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc) static bool omap_crtc_is_manually_updated(struct drm_crtc *crtc) { struct omap_crtc *omap_crtc = to_omap_crtc(crtc); - struct omap_dss_device *display = omap_crtc->pipe->output->next; + struct omap_dss_device *dssdev = omap_crtc->pipe->output;

- if (!display) + if (dssdev->type != OMAP_DISPLAY_TYPE_DSI || + !dssdev->ops->dsi.is_video_mode) return false;

- if (display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) { - DBG("detected manually updated display!"); - return true; - } + if (dssdev->ops->dsi.is_video_mode(dssdev)) + return false;

- return false; + DBG("detected manually updated display!"); + return true; }

static int omap_crtc_atomic_check(struct drm_crtc *crtc,

We can simply use the atomic helper for handling the dirtyfb callback.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/omap_crtc.c | 6 +----- drivers/gpu/drm/omapdrm/omap_crtc.h | 1 - drivers/gpu/drm/omapdrm/omap_fb.c | 21 ++------------------- 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 80ed1b15ba49..2129cba7f4e2 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -346,13 +346,9 @@ void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus) wake_up(&omap_crtc->pending_wait); }

-void omap_crtc_flush(struct drm_crtc *crtc) +static void omap_crtc_flush(struct drm_crtc *crtc) { struct omap_crtc *omap_crtc = to_omap_crtc(crtc); - struct omap_crtc_state *omap_state = to_omap_crtc_state(crtc->state); - - if (!omap_state->manually_updated) - return;

if (!delayed_work_pending(&omap_crtc->update_work)) schedule_delayed_work(&omap_crtc->update_work, 0); diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.h b/drivers/gpu/drm/omapdrm/omap_crtc.h index 2fd57751ae2b..fe88f78f9711 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.h +++ b/drivers/gpu/drm/omapdrm/omap_crtc.h @@ -31,6 +31,5 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc); void omap_crtc_error_irq(struct drm_crtc *crtc, u32 irqstatus); void omap_crtc_vblank_irq(struct drm_crtc *crtc); void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus); -void omap_crtc_flush(struct drm_crtc *crtc);

#endif /* __OMAPDRM_CRTC_H__ */ diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index 9aeab81dfb90..b0e972945252 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c @@ -9,6 +9,7 @@ #include <drm/drm_modeset_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_damage_helper.h>

#include "omap_dmm_tiler.h" #include "omap_drv.h" @@ -55,28 +56,10 @@ struct omap_framebuffer { struct mutex lock; };

-static int omap_framebuffer_dirty(struct drm_framebuffer *fb, - struct drm_file *file_priv, - unsigned flags, unsigned color, - struct drm_clip_rect *clips, - unsigned num_clips) -{ - struct drm_crtc *crtc; - - drm_modeset_lock_all(fb->dev); - - drm_for_each_crtc(crtc, fb->dev) - omap_crtc_flush(crtc); - - drm_modeset_unlock_all(fb->dev); - - return 0; -} - static const struct drm_framebuffer_funcs omap_framebuffer_funcs = { .create_handle = drm_gem_fb_create_handle, - .dirty = omap_framebuffer_dirty, .destroy = drm_gem_fb_destroy, + .dirty = drm_atomic_helper_dirtyfb, };

static u32 get_linear_addr(struct drm_framebuffer *fb,

Implement check timings, which will check if its possible to configure the clocks for the provided mode using the same code as the set_config() hook.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/dss/dsi.c | 70 +++++++++++++++++++------------ 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 754815068927..1b57f516618a 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -283,6 +283,11 @@ struct dsi_isr_tables { struct dsi_isr_data isr_table_cio[DSI_MAX_NR_ISRS]; };

+struct dsi_lp_clock_info { + unsigned long lp_clk; + u16 lp_clk_div; +}; + struct dsi_clk_calc_ctx { struct dsi_data *dsi; struct dss_pll *pll; @@ -297,16 +302,12 @@ struct dsi_clk_calc_ctx {

struct dss_pll_clock_info dsi_cinfo; struct dispc_clock_info dispc_cinfo; + struct dsi_lp_clock_info user_lp_cinfo;

struct videomode vm; struct omap_dss_dsi_videomode_timings dsi_vm; };

-struct dsi_lp_clock_info { - unsigned long lp_clk; - u16 lp_clk_div; -}; - struct dsi_module_id_data { u32 address; int id; @@ -4794,44 +4795,55 @@ static bool dsi_is_video_mode(struct omap_dss_device *dssdev) return (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE); }

-static int dsi_set_config(struct omap_dss_device *dssdev, - const struct drm_display_mode *mode) +static int __dsi_calc_config(struct dsi_data *dsi, + const struct drm_display_mode *mode, + struct dsi_clk_calc_ctx *ctx) { - struct dsi_data *dsi = to_dsi_data(dssdev); - struct dsi_clk_calc_ctx ctx; - struct videomode vm; struct omap_dss_dsi_config cfg = dsi->config; + struct videomode vm; bool ok; int r;

drm_display_mode_to_videomode(mode, &vm); - cfg.vm = &vm; - - mutex_lock(&dsi->lock);

+ cfg.vm = &vm; cfg.mode = dsi->mode; cfg.pixel_format = dsi->pix_fmt;

if (dsi->mode == OMAP_DSS_DSI_VIDEO_MODE) - ok = dsi_vm_calc(dsi, &cfg, &ctx); + ok = dsi_vm_calc(dsi, &cfg, ctx); else - ok = dsi_cm_calc(dsi, &cfg, &ctx); + ok = dsi_cm_calc(dsi, &cfg, ctx);

- if (!ok) { - DSSERR("failed to find suitable DSI clock settings\n"); - r = -EINVAL; - goto err; - } + if (!ok) + return -EINVAL; + + dsi_pll_calc_dsi_fck(dsi, &ctx->dsi_cinfo);

- dsi_pll_calc_dsi_fck(dsi, &ctx.dsi_cinfo); + r = dsi_lp_clock_calc(ctx->dsi_cinfo.clkout[HSDIV_DSI], + cfg.lp_clk_min, cfg.lp_clk_max, &ctx->user_lp_cinfo); + if (r) + return r; + + return 0; +}

- r = dsi_lp_clock_calc(ctx.dsi_cinfo.clkout[HSDIV_DSI], - cfg.lp_clk_min, cfg.lp_clk_max, &dsi->user_lp_cinfo); +static int dsi_set_config(struct omap_dss_device *dssdev, + const struct drm_display_mode *mode) +{ + struct dsi_data *dsi = to_dsi_data(dssdev); + struct dsi_clk_calc_ctx ctx; + int r; + + mutex_lock(&dsi->lock); + + r = __dsi_calc_config(dsi, mode, &ctx); if (r) { - DSSERR("failed to find suitable DSI LP clock settings\n"); + DSSERR("failed to find suitable DSI clock settings\n"); goto err; }

+ dsi->user_lp_cinfo = ctx.user_lp_cinfo; dsi->user_dsi_cinfo = ctx.dsi_cinfo; dsi->user_dispc_cinfo = ctx.dispc_cinfo;

@@ -5008,11 +5020,17 @@ static void dsi_set_timings(struct omap_dss_device *dssdev, static int dsi_check_timings(struct omap_dss_device *dssdev, struct drm_display_mode *mode) { + struct dsi_data *dsi = to_dsi_data(dssdev); + struct dsi_clk_calc_ctx ctx; + int r; + DSSDBG("dsi_check_timings\n");

- /* TODO */ + mutex_lock(&dsi->lock); + r = __dsi_calc_config(dsi, mode, &ctx); + mutex_unlock(&dsi->lock);

- return 0; + return r; }

static int dsi_connect(struct omap_dss_device *src,

Now, that the driver implements the common DRM panel API the unbind no longer needs to be suppressed.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 0148f40eceb2..f607b3dfa31f 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -598,7 +598,7 @@ static int dsicm_probe(struct mipi_dsi_device *dsi) return r; }

-static int __exit dsicm_remove(struct mipi_dsi_device *dsi) +static int dsicm_remove(struct mipi_dsi_device *dsi) { struct panel_drv_data *ddata = mipi_dsi_get_drvdata(dsi);

@@ -628,11 +628,10 @@ MODULE_DEVICE_TABLE(of, dsicm_of_match);

static struct mipi_dsi_driver dsicm_driver = { .probe = dsicm_probe, - .remove = __exit_p(dsicm_remove), + .remove = dsicm_remove, .driver = { .name = "panel-dsi-cm", .of_match_table = dsicm_of_match, - .suppress_bind_attrs = true, }, }; module_mipi_dsi_driver(dsicm_driver);

Make sure, that we only power on/off the device once.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c index 90132d1d1f5d..7f6b1129862a 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c @@ -290,6 +290,9 @@ static int dsicm_power_on(struct panel_drv_data *ddata) u8 id1, id2, id3; int r;

+ if (ddata->enabled) + return 0; + r = regulator_bulk_enable(DCS_REGULATOR_SUPPLY_NUM, ddata->supplies); if (r) { dev_err(&ddata->dsi->dev, "failed to enable supplies: %d\n", r); @@ -354,6 +357,9 @@ static int dsicm_power_off(struct panel_drv_data *ddata) { int r;

+ if (!ddata->enabled) + return 0; + ddata->enabled = 0;

r = mipi_dsi_dcs_set_display_off(ddata->dsi);

This adds support for unbinding the panel driver and have working output again when the panel is bound again later. This is important, since the generic panel drivers do not suppress the unbind properties and the panel module might be unloaded.

Also this adds support for unbinding the DSI encoder and gets back to running setup when the encoder is rebound later. Making this possible is just a side- effect of panel unbinding support.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/dss/base.c | 2 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 63 ++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c index a1970b9db6ab..f85697784e26 100644 --- a/drivers/gpu/drm/omapdrm/dss/base.c +++ b/drivers/gpu/drm/omapdrm/dss/base.c @@ -217,7 +217,7 @@ void omapdss_device_disconnect(struct omap_dss_device *src, dst ? dev_name(dst->dev) : "NULL");

if (!dst) { - WARN_ON(!src->bridge && !src->panel); + WARN_ON(src->type != OMAP_DISPLAY_TYPE_DSI && !src->bridge && !src->panel); return; }

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index bc96f74f1740..5996e39500c6 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -38,6 +38,7 @@ #include <video/mipi_display.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h>

#include "omapdss.h" #include "dss.h" @@ -440,6 +441,9 @@ struct dsi_data { struct omap_dss_dsi_videomode_timings vm_timings;

struct omap_dss_device output; + + struct drm_device *drm_dev; + struct drm_connector *connector; };

struct dsi_packet_sent_handler_data { @@ -5143,6 +5147,7 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *client) { struct dsi_data *dsi = host_to_omap(host); + struct omap_dss_device *dssdev = &dsi->output; unsigned int channel = client->channel; struct drm_panel *panel; int r; @@ -5188,7 +5193,18 @@ int omap_dsi_host_attach(struct mipi_dsi_host *host,

dsi->ulps_auto_idle = !!(client->mode_flags & MIPI_DSI_MODE_ULPS_IDLE);

+ dssdev->panel = panel; + + if (dsi->connector) { + dsi->connector->status = connector_status_connected; + drm_panel_attach(panel, dsi->connector); + } + dsi_bus_unlock(dsi); + + if (dsi->drm_dev && dsi->drm_dev->mode_config.poll_enabled) + drm_kms_helper_hotplug_event(dsi->drm_dev); + return 0; }

@@ -5196,6 +5212,7 @@ int omap_dsi_host_detach(struct mipi_dsi_host *host, struct mipi_dsi_device *client) { struct dsi_data *dsi = host_to_omap(host); + struct omap_dss_device *dssdev = &dsi->output; unsigned int channel = client->channel;

if (channel > 3) @@ -5204,8 +5221,28 @@ int omap_dsi_host_detach(struct mipi_dsi_host *host, if (dsi->vc[channel].dest != client) return -EINVAL;

+ if (!dssdev->panel) + return -EINVAL; + + dsi_bus_lock(dsi); + + /* HACK: steal connector and drm_dev from panel */ + dsi->connector = dssdev->panel->connector; + dsi->drm_dev = dssdev->panel->drm; + + if (dsi->connector) { + dsi->connector->status = connector_status_disconnected; + drm_panel_detach(dssdev->panel); + dssdev->panel = NULL; + } + omap_dsi_unregister_te_irq(dsi); dsi->vc[channel].dest = NULL; + dsi_bus_unlock(dsi); + + if (dsi->drm_dev && dsi->drm_dev->mode_config.poll_enabled) + drm_kms_helper_hotplug_event(dsi->drm_dev); + return 0; }

@@ -5373,6 +5410,12 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) dsi->debugfs.clks = dss_debugfs_create_file(dss, name, dsi_dump_dsi_clocks, dsi);

+ r = mipi_dsi_host_register(&dsi->host); + if (r < 0) { + dev_err(dev, "failed to register DSI host: %d\n", r); + return r; + } + return 0; }

@@ -5380,6 +5423,8 @@ static void dsi_unbind(struct device *dev, struct device *master, void *data) { struct dsi_data *dsi = dev_get_drvdata(dev);

+ mipi_dsi_host_unregister(&dsi->host); + dss_debugfs_remove_file(dsi->debugfs.clks); dss_debugfs_remove_file(dsi->debugfs.irqs); dss_debugfs_remove_file(dsi->debugfs.regs); @@ -5401,7 +5446,6 @@ static const struct component_ops dsi_component_ops = { static int dsi_init_output(struct dsi_data *dsi) { struct omap_dss_device *out = &dsi->output; - int r;

out->dev = dsi->dev; out->id = dsi->module_id == 0 ? @@ -5417,10 +5461,6 @@ static int dsi_init_output(struct dsi_data *dsi) | DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;

- r = omapdss_device_init_output(out); - if (r < 0) - return r; - omapdss_device_register(out);

return 0; @@ -5687,15 +5727,9 @@ static int dsi_probe(struct platform_device *pdev) dsi->host.ops = &omap_dsi_host_ops; dsi->host.dev = &pdev->dev;

- r = mipi_dsi_host_register(&dsi->host); - if (r < 0) { - dev_err(&pdev->dev, "failed to register DSI host: %d\n", r); - goto err_pm_disable; - } - r = dsi_init_output(dsi); if (r) - goto err_dsi_host_unregister; + goto err_pm_disable;

r = dsi_probe_of(dsi); if (r) { @@ -5711,8 +5745,6 @@ static int dsi_probe(struct platform_device *pdev)

err_uninit_output: dsi_uninit_output(dsi); -err_dsi_host_unregister: - mipi_dsi_host_unregister(&dsi->host); err_pm_disable: pm_runtime_disable(dev); return r; @@ -5726,8 +5758,6 @@ static int dsi_remove(struct platform_device *pdev)

dsi_uninit_output(dsi);

- mipi_dsi_host_unregister(&dsi->host); - pm_runtime_disable(&pdev->dev);

if (dsi->vdds_dsi_reg != NULL && dsi->vdds_dsi_enabled) { @@ -5774,6 +5804,5 @@ struct platform_driver omap_dsihw_driver = { .name = "omapdss_dsi", .pm = &dsi_pm_ops, .of_match_table = dsi_of_match, - .suppress_bind_attrs = true, }, };

The panel driver is no longer using any OMAP specific APIs, so let's move it into the generic panel directory.

Signed-off-by: Sebastian Reichel sebastian.reichel@collabora.com --- drivers/gpu/drm/omapdrm/displays/Kconfig | 6 ------ drivers/gpu/drm/omapdrm/displays/Makefile | 1 - drivers/gpu/drm/panel/Kconfig | 9 +++++++++ drivers/gpu/drm/panel/Makefile | 1 + .../gpu/drm/{omapdrm/displays => panel}/panel-dsi-cm.c | 0 5 files changed, 10 insertions(+), 7 deletions(-) rename drivers/gpu/drm/{omapdrm/displays => panel}/panel-dsi-cm.c (100%)

diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig index 240dda102845..1175811a55ac 100644 --- a/drivers/gpu/drm/omapdrm/displays/Kconfig +++ b/drivers/gpu/drm/omapdrm/displays/Kconfig @@ -23,10 +23,4 @@ config DRM_OMAP_CONNECTOR_ANALOG_TV help Driver for a generic analog TV connector.

-config DRM_OMAP_PANEL_DSI_CM - tristate "Generic DSI Command Mode Panel" - depends on BACKLIGHT_CLASS_DEVICE - help - Driver for generic DSI command mode panels. - endmenu diff --git a/drivers/gpu/drm/omapdrm/displays/Makefile b/drivers/gpu/drm/omapdrm/displays/Makefile index cb76859dc574..68ff8b1d051a 100644 --- a/drivers/gpu/drm/omapdrm/displays/Makefile +++ b/drivers/gpu/drm/omapdrm/displays/Makefile @@ -3,4 +3,3 @@ obj-$(CONFIG_DRM_OMAP_ENCODER_OPA362) += encoder-opa362.o obj-$(CONFIG_DRM_OMAP_ENCODER_TPD12S015) += encoder-tpd12s015.o obj-$(CONFIG_DRM_OMAP_CONNECTOR_HDMI) += connector-hdmi.o obj-$(CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV) += connector-analog-tv.o -obj-$(CONFIG_DRM_OMAP_PANEL_DSI_CM) += panel-dsi-cm.o diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index f152bc4eeb53..91520907d3c6 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -39,6 +39,15 @@ config DRM_PANEL_SIMPLE that it can be automatically turned off when the panel goes into a low power state.

+config DRM_PANEL_DSI_CM + tristate "support for generic DSI command mode panel" + depends on OF + depends on DRM_MIPI_DSI + depends on BACKLIGHT_CLASS_DEVICE + help + DRM panel driver for DSI command mode panels with support for + embedded and external backlights. + config DRM_PANEL_FEIYANG_FY07024DI26A30D tristate "Feiyang FY07024DI26A30-D MIPI-DSI LCD panel" depends on OF diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index b6cd39fe0f20..2afed2ae171c 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_DRM_PANEL_ARM_VERSATILE) += panel-arm-versatile.o obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o +obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o obj-$(CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D) += panel-feiyang-fy07024di26a30d.o obj-$(CONFIG_DRM_PANEL_ILITEK_IL9322) += panel-ilitek-ili9322.o obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9881C) += panel-ilitek-ili9881c.o diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/panel/panel-dsi-cm.c similarity index 100% rename from drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c rename to drivers/gpu/drm/panel/panel-dsi-cm.c