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=-7.0 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, UNWANTED_LANGUAGE_BODY,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 3DFBBC2D0A3 for ; Mon, 9 Nov 2020 08:33:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4D70206ED for ; Mon, 9 Nov 2020 08:33:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="XPSXDeLq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729442AbgKIId1 (ORCPT ); Mon, 9 Nov 2020 03:33:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726176AbgKIId1 (ORCPT ); Mon, 9 Nov 2020 03:33:27 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D41B4C0613CF for ; Mon, 9 Nov 2020 00:33:26 -0800 (PST) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F9AFB2B; Mon, 9 Nov 2020 09:33:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604910805; bh=yBOfNohKqeEDv5RWqbEq4qhjImTsPBvL03Zwq84oTRA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XPSXDeLqtx/JEm7XxkSBdE4Wnuh7WzweGPyCGK0dPYug3ybzvG+/bOnY05NhuST2T SNk4DWCXO81cwPGyI+6uIUhickcyf5snk/ubijnheZKFeEMsP2eubv45trBoUYapyW C88QYb2068KFqAsDc2gWY0IkwdcN0xGG6DEI7Prw= Date: Mon, 9 Nov 2020 10:33:22 +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 12/56] drm/omap: dsi: switch dsi_vc_send_long/short to mipi_dsi_msg Message-ID: <20201109083322.GI6029@pendragon.ideasonboard.com> References: <20201105120333.947408-1-tomi.valkeinen@ti.com> <20201105120333.947408-13-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201105120333.947408-13-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:49PM +0200, Tomi Valkeinen wrote: > From: Sebastian Reichel > > 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 > Signed-off-by: Tomi Valkeinen > --- > drivers/gpu/drm/omapdrm/dss/dsi.c | 89 ++++++++++++++----------------- > 1 file changed, 40 insertions(+), 49 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index bbdc52ee3559..6fa7833e32ad 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -2599,8 +2599,8 @@ 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) > { > /*u32 val; */ > int i; > @@ -2609,20 +2609,20 @@ static int dsi_vc_send_long(struct dsi_data *dsi, int channel, u8 data_type, > u8 b1, b2, b3, b4; > > 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, 0); > > - 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 +2631,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,65 +2656,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 pkt; > u32 r; > - u8 data_id; > + > + r = mipi_dsi_create_packet(&pkt, 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, pkt.header[1], pkt.header[2]); You could fix the indentation while at it. Reviewed-by: Laurent Pinchart > > - 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 = pkt.header[3] << 24 | pkt.header[2] << 16 | pkt.header[1] << 8 | > + pkt.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; > @@ -2854,14 +2853,14 @@ 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 dcs_cmd = ((u8 *)msg->tx_buf)[0]; > + u8 cmd = ((u8 *)msg->tx_buf)[0]; > u8 channel = msg->channel; > int r; > > if (dsi->debug_read) > - DSSDBG("%s(ch %d, cmd %x)\n", __func__, channel, dcs_cmd); > + DSSDBG("%s(ch %d, cmd %x)\n", __func__, channel, cmd); > > - r = dsi_vc_send_short(dsi, channel, MIPI_DSI_DCS_READ, dcs_cmd, 0); > + r = dsi_vc_send_short(dsi, msg); > if (r) > goto err; > > @@ -2881,7 +2880,7 @@ static int dsi_vc_dcs_read(struct omap_dss_device *dssdev, > > return 0; > err: > - DSSERR("%s(ch %d, cmd 0x%02x) failed\n", __func__, msg->channel, dcs_cmd); > + DSSERR("%s(ch %d, cmd 0x%02x) failed\n", __func__, msg->channel, cmd); > return r; > } > > @@ -2889,17 +2888,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; > -- Regards, Laurent Pinchart