Message ID | 20230921-topic-7280_dpu-v1-2-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 h50csp4609290vqi; Wed, 20 Sep 2023 21:53:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGOuOldejSYFi+9BqhHEiuNd/CfM/fiQaDvQOm9bm47zY6Fn39TRMwWN6RxnpYAKyqRROtq X-Received: by 2002:a05:6a21:7887:b0:159:e4ab:15ce with SMTP id bf7-20020a056a21788700b00159e4ab15cemr7121474pzc.15.1695272032778; Wed, 20 Sep 2023 21:53:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695272032; cv=none; d=google.com; s=arc-20160816; b=Duli0s5RLL8whPjlRNXVygIc3pZ5WrZM+iSCPKgD0y1uJ9UWoXuBxWFijAPiX7x1Z5 DmHLiB6RawVFd7MCqNSMJ7nVM3sXDyhIw6kJk8rBCQdIm+sz5FdS70MSqcWHgf/WLFxc DyC1s0wjXSj2rPH6v6BPo55yX0FneSAKQmksa7PF5zQZS5GOWj7lvfTDHBXVZrOWa+ro eO+fHelF6q136+By9NSiKLiQ/6FTnIVH3YM1Ky1SMh8wefgfALsKL0lkxgA0X1B7qopM WCscHp5dWUfH8Uac6mFPacT602hdtQ7cMNfdxb5k8jPVNdEaFgVsUq8u/n9EOzQ/GPqU 5V1A== 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=IdSuAkG4VTCtPFnst9Jv9C/wFXy4KDDgAI8d6hl528I=; fh=bZJe4FgiQhOv9m9NV7yVQBRVZe79B6HAzRSFfZMOxHo=; b=aRk4YpctHN2M/P5fSfKBDYQWWk2B6zO+Mw8XnvLxoFC/Fp+zor7AGQrBQ4CwRJbtRF eGgzZ9QkZ3Pdpq2HAvN+s/i1z52G5bzPdFQeJUe0B9rPpEZDfdMCFI9p6dpMGn5dXlcG hWOGDDiNgQDmsQPBVXkhnDjFxCQM27pa4gPWGuKquIl284B2JF5aXQBOGVm1xXs39JS/ 8F0CM/S7c/OXHU+5qXS8pxxDBJE0aR0dgrk3lO8B3ei7E16a+e8rVGfJnaLy196GPWve jN6mg/4nhK9B95QLeTLIvVPL2BkWKHM8Mf3D4b8NQZ7cXBcaVjSmPvWdMtu/u/0AFhwi wPnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zmUHaUEd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id cj18-20020a056a00299200b0068fe12b361dsi652255pfb.249.2023.09.20.21.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 21:53:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zmUHaUEd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 590F68289516; Wed, 20 Sep 2023 15:46:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229648AbjITWqV (ORCPT <rfc822;realc9580@gmail.com> + 27 others); Wed, 20 Sep 2023 18:46:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbjITWqR (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 20 Sep 2023 18:46:17 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D043DD for <linux-kernel@vger.kernel.org>; Wed, 20 Sep 2023 15:46:11 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9a65f9147ccso28369566b.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=1695249969; x=1695854769; 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=IdSuAkG4VTCtPFnst9Jv9C/wFXy4KDDgAI8d6hl528I=; b=zmUHaUEdzDyYlqyrB4Lve7V6uUU52sqFV2Eu67kI3Yw/niDrOviUbZKaghbDLJj01R XdRJKss4/gAaumBGg+m9vcAiabkF6OFEzoD93YVLUiDIPNitvnx6GsgPgtbAu+WNN2FV vq6Zx/4n0unzW23nG9qTJ4XNiTQG69/cPo2GQHwLGJ+/kbtM0dJ9SdpqkAijamJuA04V eKcdvEagDCpsWUy6ny4XzRNoRhAgZcmswmgbuJe+HhPZzYhOK25IYJ2ru847YeUc3A+8 5O3Yw+XAflTT7srQ57egs+ASPdgLHJbPjdGbx/7Q5+9jQMN8qdxQ05OWvvvzg5/pzesF I06w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695249969; x=1695854769; 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=IdSuAkG4VTCtPFnst9Jv9C/wFXy4KDDgAI8d6hl528I=; b=g2dvvFdNVzV6bx7/dD+TF9gImk9NCS/h4yU1nof0N0Wg9yVwib0wXoQ9LBiST10ghA A+rlxENtyw9LEu1yvoy2RyfYB7rVViax+Uuwf3u4p6KjwcZwGNv6Pm0Lu5LZRSz87AK7 eg2FJQrkSzepDOJRmm/qpJH0G3i9O4o3e9V3qRFBZCygLaRsA4pIHlNh/OeEJ0GLfPNo Pp5bVesMakEfunSZBH8WeiHI4oTSL6HSBkt0KOgqaZu9H/KNFbDBCkxeAbNU6fmKJ3KK s/HdZCt5r4yCAWKKNADHmLg+Yt/tn6rU0zSteEi83m6hZSvhaSoX8ezzE9pnzhDbl2FO 0j3A== X-Gm-Message-State: AOJu0YyLmOVmIN0SCIyyl6rQxaEGYcESylM1PcK239GUQF5oCkfP8ONd K8r/+1TJy1HtPUYYgjjpIIJQ0w== X-Received: by 2002:a17:907:b609:b0:9ae:61d:4248 with SMTP id vl9-20020a170907b60900b009ae061d4248mr3049732ejc.48.1695249969770; Wed, 20 Sep 2023 15:46:09 -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:09 -0700 (PDT) From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Thu, 21 Sep 2023 00:46:07 +0200 Subject: [PATCH 2/3] drm/msm/dpu: Add missing DPU_DSC_OUTPUT_CTRL to SC7280 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230921-topic-7280_dpu-v1-2-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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Wed, 20 Sep 2023 15:46:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777621566642546813 X-GMAIL-MSGID: 1777621566642546813 |
Series |
SC7280 DPU fixups
|
|
Commit Message
Konrad Dybcio
Sept. 20, 2023, 10:46 p.m. UTC
DPU_DSC_OUTPUT_CTRL should be enabled for all platforms with a CTL
CFG 1.0.0. SC7280 is one of them. Add it.
Fixes: 0d1b10c63346 ("drm/msm/dpu: add DSC 1.2 hw blocks for relevant chipsets")
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: > DPU_DSC_OUTPUT_CTRL should be enabled for all platforms with a CTL > CFG 1.0.0. SC7280 is one of them. Add it. > sc7280 and all other chipsets using DSC 1.2 use dpu_hw_dsc_init_1_2 and not dpu_hw_dsc_init. dpu_hw_dsc_init_1_2 assigns the dsc_bind_pingpong_blk op by default. So this change is not needed. > Fixes: 0d1b10c63346 ("drm/msm/dpu: add DSC 1.2 hw blocks for relevant chipsets") > 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 dc3198335164..b6a59d7b94c4 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 > @@ -164,7 +164,7 @@ static const struct dpu_dsc_cfg sc7280_dsc[] = { > { > .name = "dce_0_0", .id = DSC_0, > .base = 0x80000, .len = 0x4, > - .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), > + .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN) | BIT(DPU_DSC_OUTPUT_CTRL), > .sblk = &dsc_sblk_0, > }, > }; >
On 9/21/23 02:01, Abhinav Kumar wrote: > > > On 9/20/2023 3:46 PM, Konrad Dybcio wrote: >> DPU_DSC_OUTPUT_CTRL should be enabled for all platforms with a CTL >> CFG 1.0.0. SC7280 is one of them. Add it. >> > > sc7280 and all other chipsets using DSC 1.2 use dpu_hw_dsc_init_1_2 and > not dpu_hw_dsc_init. > > dpu_hw_dsc_init_1_2 assigns the dsc_bind_pingpong_blk op by default. > > So this change is not needed. Gah, I don't like that we do it behind the scenes but I agree it's a NOP.. Konrad
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 dc3198335164..b6a59d7b94c4 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 @@ -164,7 +164,7 @@ static const struct dpu_dsc_cfg sc7280_dsc[] = { { .name = "dce_0_0", .id = DSC_0, .base = 0x80000, .len = 0x4, - .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features = BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN) | BIT(DPU_DSC_OUTPUT_CTRL), .sblk = &dsc_sblk_0, }, };