From nobody Fri Dec 19 16:05:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0232DCD4935 for ; Wed, 20 Sep 2023 22:46:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229638AbjITWqU (ORCPT ); Wed, 20 Sep 2023 18:46:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbjITWqR (ORCPT ); Wed, 20 Sep 2023 18:46:17 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81862D8 for ; Wed, 20 Sep 2023 15:46:10 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9aa0495f9cfso322362566b.1 for ; Wed, 20 Sep 2023 15:46:10 -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=fEG5QbTle/wsryhp0cJXy9R4gVUkkTUcGpE6xI5qCmE=; b=cePh5Hz+BHbiiLOYiRopSbSf/v25ZrNmcgYLb+FWY1E97H6wlQD1GekL+QWLrxkftT oFwXDw5TDU6i/OtzniFhKygqFHjcepvI+CBJkRfTBnQvc+3L+fpGGrBGfkDNr9EdK44i SNXaVTkDbluKLusB4nPpXPYGtIXC5Mg96tcT1903XXEe0B9I1qrfmtBpwi5QbTVVkVh/ Hhoo8/F4BWXRQz+WZ3mhiRv0xTBpdVvLQAOSOPw4SvOqBfo457AvSamETzPKyyHDl4SS 1IalEmAaMNuSZs1h7ltVtu3s44B1FxWZMfbB/x/STeGIv4XZGaNXbP+hPTqnjadwFPDS CNvA== 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=fEG5QbTle/wsryhp0cJXy9R4gVUkkTUcGpE6xI5qCmE=; b=Bd2h7REIhwO+c0xHleQpvlSrb4JVZIjKyhYsfPyRKEHhP4NFjB34VWiNAv7vA0uSrM LYVq6JwMiXRgYWqnYhxSKo3clgVtOWhoZa+D5mkH4f1x5s7yevezJ7yCPEvnTYPudwjp l/50artCcxMTE1r1B978QUVg28yUZTL2V+GP0CX/goTRIC7u9B/ECnKQEmXEUikmPkcF IzOUEp02LYXgxCcTvQLUw0ACUTfeRgyYusxO69U3xYaW8E1HTy2iONMK1pSABZCMmV63 bCArv5Gf9CFgff343YPLVSv49vcGtWAYYNxQ/2Ei7bwxHXQZnR6HAnvpZruFwnGg5AEq +0ZA== X-Gm-Message-State: AOJu0YyF2hnj55SOqMgoSnRln6ufDc5ZLUETRV264QAXNdIur2oJ8rFF wcnPzuMJBVe/wBXDpMVaWwCJHQ== X-Google-Smtp-Source: AGHT+IHA8VMEhO4O0eEpANFMtvmSJUNJ62SQx1MRheCQmJMRfCP3X2rdlzItwdFMdHhxB9Yv2ZNubQ== X-Received: by 2002:a17:906:739a:b0:9ae:37d9:8043 with SMTP id f26-20020a170906739a00b009ae37d98043mr5990977ejl.31.1695249969069; 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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 15:46:08 -0700 (PDT) From: Konrad Dybcio Date: Thu, 21 Sep 2023 00:46:06 +0200 Subject: [PATCH 1/3] drm/msm/dpu: Fix SC7280 PP length MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230921-topic-7280_dpu-v1-1-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 , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Kuogee Hsieh Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.13-dev-0438c Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 macros") unrolled a macro incorrectly. Fix that. Fixes: 194347df5844 ("drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 macros") Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 3b5061c4402a..dc3198335164 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 @@ -126,7 +126,7 @@ static const struct dpu_dspp_cfg sc7280_dspp[] =3D { static const struct dpu_pingpong_cfg sc7280_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, - .base =3D 0x69000, .len =3D 0, + .base =3D 0x69000, .len =3D 0xd4, .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, @@ -134,7 +134,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] =3D { .intr_rdptr =3D -1, }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, - .base =3D 0x6a000, .len =3D 0, + .base =3D 0x6a000, .len =3D 0xd4, .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, @@ -142,7 +142,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] =3D { .intr_rdptr =3D -1, }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, - .base =3D 0x6b000, .len =3D 0, + .base =3D 0x6b000, .len =3D 0xd4, .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, @@ -150,7 +150,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] =3D { .intr_rdptr =3D -1, }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, - .base =3D 0x6c000, .len =3D 0, + .base =3D 0x6c000, .len =3D 0xd4, .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, --=20 2.39.2 From nobody Fri Dec 19 16:05:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBBD9CD4931 for ; Wed, 20 Sep 2023 22:46:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229652AbjITWqW (ORCPT ); Wed, 20 Sep 2023 18:46:22 -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 ); 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 ; Wed, 20 Sep 2023 15:46:11 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9a65f9147ccso28369566b.1 for ; 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-Google-Smtp-Source: AGHT+IGmn7SRDvmNps2xltWiAV/8ypq3MJY+6zz/ooTGSLT7+Q/E1kHCXDOP6lmDewqMh5Dw1MUueQ== 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 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: quoted-printable 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 , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Kuogee Hsieh Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.13-dev-0438c Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 chips= ets") Signed-off-by: Konrad Dybcio --- 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/drive= rs/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[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN) | BIT= (DPU_DSC_OUTPUT_CTRL), .sblk =3D &dsc_sblk_0, }, }; --=20 2.39.2 From nobody Fri Dec 19 16:05:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94121CD4934 for ; Wed, 20 Sep 2023 22:46:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229666AbjITWqY (ORCPT ); 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 ); 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 ; Wed, 20 Sep 2023 15:46:11 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9ae2cc4d17eso31130666b.1 for ; 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-Google-Smtp-Source: AGHT+IF/hPFX+k8aV648zOqgN0vtG3qxUC8bAz53xmMS3qD7B68OhuVS57Zh0nXLTxheIifi61yA+w== 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 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: quoted-printable 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 , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Kuogee Hsieh Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.13-dev-0438c Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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/drive= rs/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[] =3D { static const struct dpu_dsc_cfg sc7280_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, - .base =3D 0x80000, .len =3D 0x4, + .base =3D 0x80000, .len =3D 0x10, .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN) | BIT= (DPU_DSC_OUTPUT_CTRL), .sblk =3D &dsc_sblk_0, }, --=20 2.39.2