From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EC68C2D0A3 for ; Mon, 9 Nov 2020 08:40:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0172320719 for ; Mon, 9 Nov 2020 08:40:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Q9cj1zSE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727920AbgKIIkS (ORCPT ); Mon, 9 Nov 2020 03:40:18 -0500 Received: from perceval.ideasonboard.com ([213.167.242.64]:39502 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726127AbgKIIkS (ORCPT ); Mon, 9 Nov 2020 03:40:18 -0500 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3EF2B2FE; Mon, 9 Nov 2020 09:40:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604911215; bh=XkbLnyZZZ48Id9Bun93AV4ocNqB99mT/+cLZ70nKRhE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Q9cj1zSELihAt59dGsOy3Z5CNwKRTehwwGD6nSkJvIJryOz5z689++oD+7vhMor0/ 1M4tlzCisltURzUDUtQegPl8pnMm86oOOkeNAf2vYHS+s/c4WgONCiSLsyASYjCrsd lyFQ3oKKPI2pdkYHB3+KFEoIvXaf0jaTBMh16zM4= Date: Mon, 9 Nov 2020 10:40:12 +0200 From: Laurent Pinchart To: Tomi Valkeinen Cc: Sebastian Reichel , Nikhil Devshatwar , linux-omap@vger.kernel.org, dri-devel@lists.freedesktop.org, Sekhar Nori , Tony Lindgren , "H . Nikolaus Schaller" , Sebastian Reichel Subject: Re: [PATCH v3 14/56] drm/omap: panel-dsi-cm: use DSI helpers Message-ID: <20201109084012.GK6029@pendragon.ideasonboard.com> References: <20201105120333.947408-1-tomi.valkeinen@ti.com> <20201105120333.947408-15-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201105120333.947408-15-tomi.valkeinen@ti.com> Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Hi Tomi and Sebastian, Thank you for the patch. On Thu, Nov 05, 2020 at 02:02:51PM +0200, Tomi Valkeinen wrote: > From: Sebastian Reichel > > After converting the driver to mipi_dsi_device we can use the generic > message helpers to simplify the driver a lot. > > Signed-off-by: Sebastian Reichel > Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart > --- > .../gpu/drm/omapdrm/displays/panel-dsi-cm.c | 125 +++--------------- > 1 file changed, 18 insertions(+), 107 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > index c3190223d192..ec36e62ddc3a 100644 > --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c > @@ -138,62 +138,22 @@ 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 mipi_dsi_device *dsi = ddata->dsi; > - const struct mipi_dsi_msg msg = { > - .channel = ddata->channel, > - .type = MIPI_DSI_DCS_READ, > - .tx_len = 1, > - .tx_buf = &dcs_cmd, > - .rx_len = 1, > - .rx_buf = data > - }; > - > - return dsi->host->ops->transfer(dsi->host, &msg); > -} > - > -static int dsicm_dcs_write_0(struct panel_drv_data *ddata, u8 dcs_cmd) > -{ > - struct mipi_dsi_device *dsi = ddata->dsi; > - const struct mipi_dsi_msg msg = { > - .channel = ddata->channel, > - .type = MIPI_DSI_DCS_SHORT_WRITE, > - .tx_buf = &dcs_cmd, > - .tx_len = 1, > - }; > - > - return dsi->host->ops->transfer(dsi->host, &msg); > + return mipi_dsi_dcs_read(ddata->dsi, dcs_cmd, data, 1); > } > > static int dsicm_dcs_write_1(struct panel_drv_data *ddata, u8 dcs_cmd, u8 param) > { > - struct mipi_dsi_device *dsi = ddata->dsi; > - const u8 buf[] = { dcs_cmd, param }; > - const struct mipi_dsi_msg msg = { > - .channel = ddata->channel, > - .type = MIPI_DSI_DCS_SHORT_WRITE_PARAM, > - .tx_buf = &buf, > - .tx_len = 2, > - }; > - > - return dsi->host->ops->transfer(dsi->host, &msg); > + return mipi_dsi_dcs_write(ddata->dsi, dcs_cmd, ¶m, 1); > } > > static int dsicm_sleep_in(struct panel_drv_data *ddata) > > { > - struct mipi_dsi_device *dsi = ddata->dsi; > int r; > - const u8 cmd = MIPI_DCS_ENTER_SLEEP_MODE; > - const struct mipi_dsi_msg msg = { > - .channel = ddata->channel, > - .type = MIPI_DSI_DCS_SHORT_WRITE, > - .tx_buf = &cmd, > - .tx_len = 1, > - }; > > hw_guard_wait(ddata); > > - r = dsi->host->ops->transfer(dsi->host, &msg); > + r = mipi_dsi_dcs_enter_sleep_mode(ddata->dsi); > if (r) > return r; > > @@ -210,7 +170,7 @@ static int dsicm_sleep_out(struct panel_drv_data *ddata) > > hw_guard_wait(ddata); > > - r = dsicm_dcs_write_0(ddata, MIPI_DCS_EXIT_SLEEP_MODE); > + r = mipi_dsi_dcs_exit_sleep_mode(ddata->dsi); > if (r) > return r; > > @@ -248,45 +208,15 @@ static int dsicm_set_update_window(struct panel_drv_data *ddata, > u16 y1 = y; > u16 y2 = y + h - 1; > > - const u8 paramX[] = { > - MIPI_DCS_SET_COLUMN_ADDRESS, > - (x1 >> 8) & 0xff, > - (x1 >> 0) & 0xff, > - (x2 >> 8) & 0xff, > - (x2 >> 0) & 0xff, > - }; > - > - const struct mipi_dsi_msg msgX = { > - .channel = ddata->channel, > - .type = MIPI_DSI_GENERIC_LONG_WRITE, > - .tx_buf = paramX, > - .tx_len = 5, > - }; > - > - const u8 paramY[] = { > - MIPI_DCS_SET_PAGE_ADDRESS, > - (y1 >> 8) & 0xff, > - (y1 >> 0) & 0xff, > - (y2 >> 8) & 0xff, > - (y2 >> 0) & 0xff, > - }; > - > - const struct mipi_dsi_msg msgY = { > - .channel = ddata->channel, > - .type = MIPI_DSI_GENERIC_LONG_WRITE, > - .tx_buf = paramY, > - .tx_len = 5, > - }; > - > - r = dsi->host->ops->transfer(dsi->host, &msgX); > - if (r) > + r = mipi_dsi_dcs_set_column_address(dsi, x1, x2); > + if (r < 0) > return r; > > - r = dsi->host->ops->transfer(dsi->host, &msgY); > - if (r) > + r = mipi_dsi_dcs_set_page_address(dsi, y1, y2); > + if (r < 0) > return r; > > - return r; > + return 0; > } > > static void dsicm_queue_ulps_work(struct panel_drv_data *ddata) > @@ -680,12 +610,11 @@ static int dsicm_power_on(struct panel_drv_data *ddata) > if (r) > goto err; > > - r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_PIXEL_FORMAT, > - MIPI_DCS_PIXEL_FMT_24BIT); > + r = mipi_dsi_dcs_set_pixel_format(ddata->dsi, MIPI_DCS_PIXEL_FMT_24BIT); > if (r) > goto err; > > - r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_DISPLAY_ON); > + r = mipi_dsi_dcs_set_display_on(ddata->dsi); > if (r) > goto err; > > @@ -731,7 +660,7 @@ static void dsicm_power_off(struct panel_drv_data *ddata) > > src->ops->dsi.disable_video_output(src, ddata->channel); > > - r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_DISPLAY_OFF); > + r = mipi_dsi_dcs_set_display_off(ddata->dsi); > if (!r) > r = dsicm_sleep_in(ddata); > > @@ -949,12 +878,13 @@ static int dsicm_sync(struct omap_dss_device *dssdev) > static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable) > { > struct omap_dss_device *src = ddata->src; > + struct mipi_dsi_device *dsi = ddata->dsi; > int r; > > if (enable) > - r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_TEAR_ON, 0); > + r = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK); > else > - r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_TEAR_OFF); > + r = mipi_dsi_dcs_set_tear_off(dsi); > > if (!ddata->ext_te_gpio) > src->ops->dsi.enable_te(src, enable); > @@ -1020,19 +950,7 @@ static int dsicm_set_max_rx_packet_size(struct omap_dss_device *dssdev, > struct panel_drv_data *ddata = to_panel_data(dssdev); > struct mipi_dsi_device *dsi = ddata->dsi; > > - const u8 buf[] = { > - size & 0xff, > - size >> 8 & 0xff, > - }; > - > - const struct mipi_dsi_msg msg = { > - .channel = ddata->channel, > - .type = MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, > - .tx_buf = buf, > - .tx_len = 2, > - }; > - > - return dsi->host->ops->transfer(dsi->host, &msg); > + return mipi_dsi_set_maximum_return_packet_size(dsi, size); > } > > static int dsicm_memory_read(struct omap_dss_device *dssdev, > @@ -1082,17 +1000,10 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev, > > while (buf_used < size) { > u8 dcs_cmd = first ? 0x2e : 0x3e; > - const struct mipi_dsi_msg msg = { > - .channel = ddata->channel, > - .type = MIPI_DSI_DCS_READ, > - .tx_buf = &dcs_cmd, > - .tx_len = 1, > - .rx_buf = buf + buf_used, > - .rx_len = size - buf_used, > - }; > first = 0; > > - r = dsi->host->ops->transfer(dsi->host, &msg); > + r = mipi_dsi_dcs_read(dsi, dcs_cmd, > + buf + buf_used, size - buf_used); > if (r < 0) { > dev_err(dssdev->dev, "read error\n"); > goto err3; -- Regards, Laurent Pinchart