Message ID | 20230405-add-dsc-support-v4-5-15daf84f8dcb@quicinc.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1707442vqo; Mon, 22 May 2023 13:41:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mMPcwrf61/n17ZR1Se1lQo9t3aHHbNH7Xbe0I3vawmng3RYLVZjnWqFrspVoARkG55aMN X-Received: by 2002:a05:6a00:1689:b0:643:b653:3aa with SMTP id k9-20020a056a00168900b00643b65303aamr18948315pfc.32.1684788100697; Mon, 22 May 2023 13:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684788100; cv=none; d=google.com; s=arc-20160816; b=u2GgeMGRad+AER0WL6nfDaCJ7fbnWmhSJQjaK4kQWAfM4Q5PP8fa52Gm1aIzttdrQz /0yqbb59WGIixZqNQTjzpC5jLGW4YV+rBYlyhwRVtf30FpVJ5aJfdOSt75n6wu3D2CxD Q+Ne+ZXBjOOybYY1z1j9me1S+YhlwyTPYCEdqlc7k1ahjwGFm3si8gQNqO+KXwmNVPIb DUzUTHrVHlS3Xr4hIfOLcKjT6b/Jaz3WeV640V9kkGgz06F/c+ESVtmdQ9B3zR6b7tl9 RNDAKJzLjAUdqS+aCYz2HNML0FW3/xbj7B93vZ+BbDfzaI1ev38W7+PDRUyMKxpXm/6r 9NRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=qGhFfcyIucRyycSL68bAcGa6q6wpbCAhWMA4o0v3myE=; b=Y012ar6WyVPJKrFk7WhLst8oyK4wJi5eqRHtks7CdjF9XR85k2W8PL8kboOUXn8UgN JJ/SQ+A3Re/6RDJnNIQ6XVtuekaR11zlEu/VoMWkJysPSwEBMaM48XSbOEvW8tFQCaIH OUuHwBdVdty0ZrXPyH6si/ArNkWoBgWytRnVOFGVZb/cb/dJifW8wOPZa6WkBDhu3+JY YHuN7FLY9socu4Cxkcy10mTZP7UTn1nDhYdmoq5YnzErtkqgHsYOTehIUGf3oUPq2TeT 3NwTyjXpYjdzyVCGwXEb5IUAlkoFkxCyQiCNWM4l7hC9QmE1tBxyTt4S+f32z9T6ovZZ LV4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Y7SIfyUU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m188-20020a6258c5000000b0064a15fc65d5si5196771pfb.83.2023.05.22.13.41.28; Mon, 22 May 2023 13:41:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Y7SIfyUU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233928AbjEVUbP (ORCPT <rfc822;wlfightup@gmail.com> + 99 others); Mon, 22 May 2023 16:31:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233318AbjEVUas (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 22 May 2023 16:30:48 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE39AC1; Mon, 22 May 2023 13:30:46 -0700 (PDT) Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34MJv0gk028434; Mon, 22 May 2023 20:30:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : date : subject : mime-version : content-type : content-transfer-encoding : message-id : references : in-reply-to : to : cc; s=qcppdkim1; bh=qGhFfcyIucRyycSL68bAcGa6q6wpbCAhWMA4o0v3myE=; b=Y7SIfyUUy5M5l/ESWrR6GHtXK+d4tkMzrPr6Rhiw5Z6gEJ3U1NR77XZcNHCX6K6UHFyH EemwzFm/WRdIrdilyUVgbwEQ8Wt60Dg5hUqozVRmGFnpsqSaic+p5ZcW0VcdEeqBz8sK IqEM0B6oUR78T0gnKflWirLVdIDFqnWItUSCbj4esVx38byMKsiCtJNLy+BvvqMN5IF0 MtvpcbUyQx8FZcBfXS79uQfQ/c3Uul5aE6B18SVKXkKB4LNCEWk7nNHR8Aw/Jlaulth6 Fi7xI6d7dQaLFADPBOF5miVpwjrGJsXG5RrwGHD2wYsmZbZYQOCj4n7nk3uJq/JifOAH 4A== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qr8qr8xxn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 20:30:40 +0000 Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 34MKUetm005690 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 20:30:40 GMT Received: from jesszhan-linux.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Mon, 22 May 2023 13:30:39 -0700 From: Jessica Zhang <quic_jesszhan@quicinc.com> Date: Mon, 22 May 2023 13:30:24 -0700 Subject: [PATCH v4 5/5] drm/msm/dsi: Remove incorrect references to slice_count MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20230405-add-dsc-support-v4-5-15daf84f8dcb@quicinc.com> References: <20230405-add-dsc-support-v4-0-15daf84f8dcb@quicinc.com> In-Reply-To: <20230405-add-dsc-support-v4-0-15daf84f8dcb@quicinc.com> To: Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Marijn Suijten <marijn.suijten@somainline.org> CC: Konrad Dybcio <konrad.dybcio@linaro.org>, <linux-arm-msm@vger.kernel.org>, <dri-devel@lists.freedesktop.org>, <freedreno@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>, Jessica Zhang <quic_jesszhan@quicinc.com> X-Mailer: b4 0.13-dev-bfdf5 X-Developer-Signature: v=1; a=ed25519-sha256; t=1684787438; l=2829; i=quic_jesszhan@quicinc.com; s=20230329; h=from:subject:message-id; bh=CrzlopdfZxDeqzsqgOzel+FoVfZkpej7bl0jllAxUqg=; b=9YuXW72rkOey8EqGRpW5sDumtAKUpMMfMZE7z+daA3d1OF4Q8MqFlmtpw+Wr+Gd+dvpJisBhj KRTqx03IuS0DEX3y8MbtdSgdgjtEx30yT9oOfDhZdncaf/i82fwpuVs X-Developer-Key: i=quic_jesszhan@quicinc.com; a=ed25519; pk=gAUCgHZ6wTJOzQa3U0GfeCDH7iZLlqIEPo4rrjfDpWE= X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: uPKrMoX6vIydOHy4hKch0nt7oRg4vtMR X-Proofpoint-ORIG-GUID: uPKrMoX6vIydOHy4hKch0nt7oRg4vtMR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-05-22_15,2023-05-22_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305220173 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766628367859404440?= X-GMAIL-MSGID: =?utf-8?q?1766628367859404440?= |
Series |
Add DSC v1.2 Support for DSI
|
|
Commit Message
Jessica Zhang
May 22, 2023, 8:30 p.m. UTC
Currently, slice_count is being used to calculate word count and
pkt_per_line. Instead, these values should be calculated using slice per
packet, which is not the same as slice_count.
Slice count represents the number of soft slices per interface, and its
value will not always match that of slice per packet. For example, it is
possible to have cases where there are multiple soft slices per interface
but the panel specifies only one slice per packet.
Thus, use the default value of one slice per packet and remove slice_count
from the aforementioned calculations.
Fixes: 08802f515c3c ("drm/msm/dsi: Add support for DSC configuration")
Fixes: bc6b6ff8135c ("drm/msm/dsi: Use DSC slice(s) packet size to compute word count")
Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
---
drivers/gpu/drm/msm/dsi/dsi_host.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
Comments
On 2023-05-22 13:30:24, Jessica Zhang wrote: > Currently, slice_count is being used to calculate word count and > pkt_per_line. Instead, these values should be calculated using slice per > packet, which is not the same as slice_count. > > Slice count represents the number of soft slices per interface, and its > value will not always match that of slice per packet. For example, it is > possible to have cases where there are multiple soft slices per interface > but the panel specifies only one slice per packet. As discussed in many patches before, there is no definition of "soft slices" anyhwere. Unless we can have that, and reference it, this should more clearly explain what it means or leave out the word "soft" altogether. > Thus, use the default value of one slice per packet and remove slice_count > from the aforementioned calculations. > > Fixes: 08802f515c3c ("drm/msm/dsi: Add support for DSC configuration") > Fixes: bc6b6ff8135c ("drm/msm/dsi: Use DSC slice(s) packet size to compute word count") > Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> > --- > drivers/gpu/drm/msm/dsi/dsi_host.c | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c > index d04f8bbd707d..2eed99afdba9 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -866,18 +866,17 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_mod > */ > slice_per_intf = msm_dsc_get_slices_per_intf(dsc, hdisplay); > > - /* > - * If slice_count is greater than slice_per_intf > - * then default to 1. This can happen during partial > - * update. > - */ > - if (dsc->slice_count > slice_per_intf) > - dsc->slice_count = 1; > - > total_bytes_per_intf = dsc->slice_chunk_size * slice_per_intf; > > eol_byte_num = total_bytes_per_intf % 3; > - pkt_per_line = slice_per_intf / dsc->slice_count; > + > + /* > + * Typically, pkt_per_line = slice_per_intf * slice_per_pkt. > + * > + * Since the current driver only supports slice_per_pkt = 1, > + * pkt_per_line will be equal to slice per intf for now. > + */ > + pkt_per_line = slice_per_intf; > > if (is_cmd_mode) /* packet data type */ > reg = DSI_COMMAND_COMPRESSION_MODE_CTRL_STREAM0_DATATYPE(MIPI_DSI_DCS_LONG_WRITE); > @@ -1001,7 +1000,14 @@ static void dsi_timing_setup(struct msm_dsi_host *msm_host, bool is_bonded_dsi) > if (!msm_host->dsc) > wc = hdisplay * dsi_get_bpp(msm_host->format) / 8 + 1; > else > - wc = msm_host->dsc->slice_chunk_size * msm_host->dsc->slice_count + 1; > + /* > + * When DSC is enabled, WC = slice_chunk_size * slice_per_packet + 1. > + * Currently, the driver only supports default value of slice_per_packet = 1 > + * > + * TODO: Expand mipi_dsi_device struct to hold slice_per_packet info > + * and adjust DSC math to account for slice_per_packet. > + */ Either rename this all to slice_per_pkt, or rename the above comment to slice_per_packet. After improving on that: Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> We all learned the wrong thing initially, thanks for clearing up that slice_count != slice_per_pkt. - Marijn > + wc = msm_host->dsc->slice_chunk_size + 1; > > dsi_write(msm_host, REG_DSI_CMD_MDP_STREAM0_CTRL, > DSI_CMD_MDP_STREAM0_CTRL_WORD_COUNT(wc) | > > -- > 2.40.1 >
One more suggestion: DSC slice_count* On 2023-05-22 13:30:24, Jessica Zhan <Snip> - Marijn
On 5/22/2023 2:01 PM, Marijn Suijten wrote: > On 2023-05-22 13:30:24, Jessica Zhang wrote: >> Currently, slice_count is being used to calculate word count and >> pkt_per_line. Instead, these values should be calculated using slice per >> packet, which is not the same as slice_count. >> >> Slice count represents the number of soft slices per interface, and its >> value will not always match that of slice per packet. For example, it is >> possible to have cases where there are multiple soft slices per interface >> but the panel specifies only one slice per packet. > > As discussed in many patches before, there is no definition of "soft > slices" anyhwere. Unless we can have that, and reference it, this > should more clearly explain what it means or leave out the word "soft" > altogether. Hi Marijn, Acked. > >> Thus, use the default value of one slice per packet and remove slice_count >> from the aforementioned calculations. >> >> Fixes: 08802f515c3c ("drm/msm/dsi: Add support for DSC configuration") >> Fixes: bc6b6ff8135c ("drm/msm/dsi: Use DSC slice(s) packet size to compute word count") >> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> >> --- >> drivers/gpu/drm/msm/dsi/dsi_host.c | 26 ++++++++++++++++---------- >> 1 file changed, 16 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c >> index d04f8bbd707d..2eed99afdba9 100644 >> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c >> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c >> @@ -866,18 +866,17 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_mod >> */ >> slice_per_intf = msm_dsc_get_slices_per_intf(dsc, hdisplay); >> >> - /* >> - * If slice_count is greater than slice_per_intf >> - * then default to 1. This can happen during partial >> - * update. >> - */ >> - if (dsc->slice_count > slice_per_intf) >> - dsc->slice_count = 1; >> - >> total_bytes_per_intf = dsc->slice_chunk_size * slice_per_intf; >> >> eol_byte_num = total_bytes_per_intf % 3; >> - pkt_per_line = slice_per_intf / dsc->slice_count; >> + >> + /* >> + * Typically, pkt_per_line = slice_per_intf * slice_per_pkt. >> + * >> + * Since the current driver only supports slice_per_pkt = 1, >> + * pkt_per_line will be equal to slice per intf for now. >> + */ >> + pkt_per_line = slice_per_intf; >> >> if (is_cmd_mode) /* packet data type */ >> reg = DSI_COMMAND_COMPRESSION_MODE_CTRL_STREAM0_DATATYPE(MIPI_DSI_DCS_LONG_WRITE); >> @@ -1001,7 +1000,14 @@ static void dsi_timing_setup(struct msm_dsi_host *msm_host, bool is_bonded_dsi) >> if (!msm_host->dsc) >> wc = hdisplay * dsi_get_bpp(msm_host->format) / 8 + 1; >> else >> - wc = msm_host->dsc->slice_chunk_size * msm_host->dsc->slice_count + 1; >> + /* >> + * When DSC is enabled, WC = slice_chunk_size * slice_per_packet + 1. >> + * Currently, the driver only supports default value of slice_per_packet = 1 >> + * >> + * TODO: Expand mipi_dsi_device struct to hold slice_per_packet info >> + * and adjust DSC math to account for slice_per_packet. >> + */ > > Either rename this all to slice_per_pkt, or rename the above comment to > slice_per_packet. Acked. Thanks, Jessica Zhang > > After improving on that: > > Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > > We all learned the wrong thing initially, thanks for clearing up that > slice_count != slice_per_pkt. > > - Marijn > >> + wc = msm_host->dsc->slice_chunk_size + 1; >> >> dsi_write(msm_host, REG_DSI_CMD_MDP_STREAM0_CTRL, >> DSI_CMD_MDP_STREAM0_CTRL_WORD_COUNT(wc) | >> >> -- >> 2.40.1 >>
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index d04f8bbd707d..2eed99afdba9 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -866,18 +866,17 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_mod */ slice_per_intf = msm_dsc_get_slices_per_intf(dsc, hdisplay); - /* - * If slice_count is greater than slice_per_intf - * then default to 1. This can happen during partial - * update. - */ - if (dsc->slice_count > slice_per_intf) - dsc->slice_count = 1; - total_bytes_per_intf = dsc->slice_chunk_size * slice_per_intf; eol_byte_num = total_bytes_per_intf % 3; - pkt_per_line = slice_per_intf / dsc->slice_count; + + /* + * Typically, pkt_per_line = slice_per_intf * slice_per_pkt. + * + * Since the current driver only supports slice_per_pkt = 1, + * pkt_per_line will be equal to slice per intf for now. + */ + pkt_per_line = slice_per_intf; if (is_cmd_mode) /* packet data type */ reg = DSI_COMMAND_COMPRESSION_MODE_CTRL_STREAM0_DATATYPE(MIPI_DSI_DCS_LONG_WRITE); @@ -1001,7 +1000,14 @@ static void dsi_timing_setup(struct msm_dsi_host *msm_host, bool is_bonded_dsi) if (!msm_host->dsc) wc = hdisplay * dsi_get_bpp(msm_host->format) / 8 + 1; else - wc = msm_host->dsc->slice_chunk_size * msm_host->dsc->slice_count + 1; + /* + * When DSC is enabled, WC = slice_chunk_size * slice_per_packet + 1. + * Currently, the driver only supports default value of slice_per_packet = 1 + * + * TODO: Expand mipi_dsi_device struct to hold slice_per_packet info + * and adjust DSC math to account for slice_per_packet. + */ + wc = msm_host->dsc->slice_chunk_size + 1; dsi_write(msm_host, REG_DSI_CMD_MDP_STREAM0_CTRL, DSI_CMD_MDP_STREAM0_CTRL_WORD_COUNT(wc) |