Message ID | 20230921-topic-7280_dpu-v1-3-6912a97183d5@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4662387vqi; Thu, 21 Sep 2023 00:13:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEv7y1wvzX1EMgEYwtxWJoeEzbjmMIiDMVBKb1rBPehCtZ0xSJlFL47uw2DgoeygVFYevWN X-Received: by 2002:a25:cf0a:0:b0:d06:4f8a:53d5 with SMTP id f10-20020a25cf0a000000b00d064f8a53d5mr5098184ybg.1.1695280391692; Thu, 21 Sep 2023 00:13:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695280391; cv=none; d=google.com; s=arc-20160816; b=db0iFrjSZ91yipFImwYkptLqgX2n6DClitJPIFuGl0mQsxmQITLKpccx81NZLagq4q iYF5sObdRkwRttTOfdMXmcOwWpHke/6Yo/3Za9f1j7ggxGzwAYt1Hn4XWqwrmooZXsYE kwKrUnacgzTdcJNFvuU3EG+9+T1Jo5lHQhAwW0sIHPvQKrnwz9306elxg4vzlwS8yWLA k8XHRk+Z4a4f4iZ7ydRuO8uUOHfIfIiai10yRiHysQfdOL2KgME66YPgncFO8gF3I8A2 L722KIPWTYYZytGri8HSlNoYlu8ZO4imPskuVEF/ukDlu15uT98o3SHvwyyeFu8M+HYj 3ONQ== 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=faQgYvcRr+Q8Wbd4/aYnbbCq/6v22SMhkw9gB15Q9b8=; fh=bZJe4FgiQhOv9m9NV7yVQBRVZe79B6HAzRSFfZMOxHo=; b=Y6vWOfeGljvCYNUBlgwC2eHPmY9b+1aSjJ853YCBj7QHdYtYJlE1QUARnafU3UR4lE AUUf+qEYCrHNCI/iPMI92poTOe5jJTJlM7hnSt78jfB1n2AOHDvilif8fGyNOZr4uewr KiwRzvLd6XV+a0WePXFXUhq+Vn/dC24WPU8GYOuTF3q7VbOHEvwxnjNLl55rz8OPbHtn WfTUBq1ww/48JVA0YJUtxloPj0/yMLK9bm3yWuG4Bti/DWAQkNhbVDcn6TB7E/G8eP9w VPy7z1GOmM/bgAn4aB7xWBsQuKPuQfqrUPc2edfn7qbhgKPP9eCNEe/GNdJS/IkepzxE PFfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="JyXCh/FU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id i70-20020a639d49000000b0057b62ce0673si596325pgd.639.2023.09.21.00.13.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:13:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="JyXCh/FU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 0FBBE818CC89; Wed, 20 Sep 2023 15:46:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229660AbjITWqY (ORCPT <rfc822;realc9580@gmail.com> + 27 others); Wed, 20 Sep 2023 18:46:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbjITWqR (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 20 Sep 2023 18:46:17 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9472C9 for <linux-kernel@vger.kernel.org>; Wed, 20 Sep 2023 15:46:11 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9ae2cc4d17eso31130666b.1 for <linux-kernel@vger.kernel.org>; Wed, 20 Sep 2023 15:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695249970; x=1695854770; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=faQgYvcRr+Q8Wbd4/aYnbbCq/6v22SMhkw9gB15Q9b8=; b=JyXCh/FUNujP1rA9A/je9XH8U1OmARzlM2Bi9/rdS7y+Cr4ZK0Rv3626c5T2P9QHpU KDXTVb4MODnytmWPyYre6Q8E9MCijKPP0gh0wsoqBG0j1YiQwO7uvI23273xMTkBmG9z 6ix29KU2ROcoEc2mxL8ry0Wlju72RlAzSALwXx0OJUkRaygnhjOXnvu3f0A/cWu1FUTM JnqHpYPjgnT6r7w7NGr5wu0jBV08OS1n+4nF2RO7d9sSZasUIBW0F+IfxyhoGmF56DNv oV+ECSybbNScd+bqwOSGlVvMi4FnpXZuVrMgxjuEh/2pEDyhhgiAUr9TME7qBCZkT0fw 5rYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695249970; x=1695854770; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=faQgYvcRr+Q8Wbd4/aYnbbCq/6v22SMhkw9gB15Q9b8=; b=HA/7YPTA29NudZHVEL4qb9LsSxjweycTzn0LiT7KBfmSYxqvDZyz5FUhsE5XJoF4AL EzAVN7TbFGtN3LRSS52FQPFdFYozM6mtN8D1hWuzkf4o3Ijs+uW7h9LEmYP3cLsHli+0 Vh85GBxJc48Mw/+MdwDIiahc16PqNiiq72GxRPeBuHJqb9jyOCTDjS9Mg0c1HkdAGxXd tb1c0P2xV9EiL66vzckqI7JYMRj//xYrR9tKBJj53bSq2PPgGYmrfBkT8WV60M2ItLqs EykQsNOXjOON8fBUzst6AlbIYWRvfTP9j9DuSz11GAz/L9vbvLPedvDtHwMXq2yzpt9R d0og== X-Gm-Message-State: AOJu0Yxfmua6jhVJiRXgfLP350V2ywsO60Xk8hxb64XbASl02PjiLLnV rQPzF2iM0UDkoeXCccZGwtVIRQ== X-Received: by 2002:a17:906:3003:b0:9a5:d16b:6631 with SMTP id 3-20020a170906300300b009a5d16b6631mr3561901ejz.70.1695249970372; Wed, 20 Sep 2023 15:46:10 -0700 (PDT) Received: from [127.0.1.1] ([217.67.225.27]) by smtp.gmail.com with ESMTPSA id z23-20020a170906435700b00992f309cfe8sm118285ejm.178.2023.09.20.15.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 15:46:10 -0700 (PDT) From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Thu, 21 Sep 2023 00:46:08 +0200 Subject: [PATCH 3/3] drm/msm/dpu: Fix SC7280 DSC block length MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230921-topic-7280_dpu-v1-3-6912a97183d5@linaro.org> References: <20230921-topic-7280_dpu-v1-0-6912a97183d5@linaro.org> In-Reply-To: <20230921-topic-7280_dpu-v1-0-6912a97183d5@linaro.org> To: Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sean Paul <sean@poorly.run>, Marijn Suijten <marijn.suijten@somainline.org>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Kuogee Hsieh <quic_khsieh@quicinc.com> Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio <konrad.dybcio@linaro.org> X-Mailer: b4 0.13-dev-0438c X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 20 Sep 2023 15:46:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777630331888571191 X-GMAIL-MSGID: 1777630331888571191 |
Series |
SC7280 DPU fixups
|
|
Commit Message
Konrad Dybcio
Sept. 20, 2023, 10:46 p.m. UTC
Commit e550ad0e5c3d ("drm/msm/dpu: fix DSC 1.2 block lengths") changed
the block length from a wrong value to another wrong value.
Use the correct one this time.
Fixes: e550ad0e5c3d ("drm/msm/dpu: fix DSC 1.2 block lengths")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 9/20/2023 3:46 PM, Konrad Dybcio wrote: > Commit e550ad0e5c3d ("drm/msm/dpu: fix DSC 1.2 block lengths") changed > the block length from a wrong value to another wrong value. > > Use the correct one this time. > No that change is correct as well. After we moved to sub-blk parsing, we have enc and ctl blocks length used from the dsc_sblk_* instead: static const struct dpu_dsc_sub_blks dsc_sblk_0 = { .enc = {.name = "enc", .base = 0x100, .len = 0x9c}, .ctl = {.name = "ctl", .base = 0xF00, .len = 0x10}, }; static const struct dpu_dsc_sub_blks dsc_sblk_1 = { .enc = {.name = "enc", .base = 0x200, .len = 0x9c}, .ctl = {.name = "ctl", .base = 0xF80, .len = 0x10}, }; The main block has only one register now which is the DSC_CMN register. Hence len = 0x4 is correct for that. Sorry, but this is right too :) > Fixes: e550ad0e5c3d ("drm/msm/dpu: fix DSC 1.2 block lengths") > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > index b6a59d7b94c4..de5e1a57a142 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h > @@ -163,7 +163,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { > static const struct dpu_dsc_cfg sc7280_dsc[] = { > { > .name = "dce_0_0", .id = DSC_0, > - .base = 0x80000, .len = 0x4, > + .base = 0x80000, .len = 0x10, > .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN) | BIT(DPU_DSC_OUTPUT_CTRL), > .sblk = &dsc_sblk_0, > }, >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index b6a59d7b94c4..de5e1a57a142 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -163,7 +163,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { static const struct dpu_dsc_cfg sc7280_dsc[] = { { .name = "dce_0_0", .id = DSC_0, - .base = 0x80000, .len = 0x4, + .base = 0x80000, .len = 0x10, .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN) | BIT(DPU_DSC_OUTPUT_CTRL), .sblk = &dsc_sblk_0, },