From patchwork Wed Sep 20 22:46:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13393553 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0A9BCD4933 for ; Wed, 20 Sep 2023 22:46:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F42010E545; Wed, 20 Sep 2023 22:46:13 +0000 (UTC) Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9440810E53B for ; Wed, 20 Sep 2023 22:46:10 +0000 (UTC) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-9adb9fa7200so60309066b.0 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=lists.freedesktop.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=Y5ZKV/7O5xzf7ASNj4uF7F2zqoqix9Mk1ZDlFXcwh6ASHM32tmD3/0ONV3RJn9gi4m TcVmcobxrSTJ76LG6s/24LxnmyLSY9f7bhmH5lyIHIVZZZNBLMBaWyU5mJ8ewxhCCutD x5XOrBw/uKSj5spwR2cfvsLYgxfJ8+2bb8QYfZfp94RhmM6yiO54LVRDC4+9yitfai5d osxmpoT5cQ2UPrP/ceAJkUtpknEnjNJvg9CUyCkkPsL69T0/4ixgQx/lPRVsEj7vJM0M 4OZvGUbd/guv/fMm6HjpS2dGM5ujEzwYdMNT4KTqFe9o05mwXGuCNuSsuLuoQZgtSIn3 EoGg== 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=uBCSlwljm2YnoPbq9LMQy9/FbMAMMWq7+yWO/PYWtaDF7hn3KF3S1dJpDt3OS4kyCz o1ldhyfOm9Mm1k+mxwaSuqYKjc5tLcx3NQaDdqqv01Z2JbxmAZoFj1vGf64tc3Zc0nkL Un9H9B+Tov3fuGg9TAwn9SEtNyImTxL9kcU0/PrYgjGEEk8+1feQ/MBhUBpKWcGR7wrV tDMZrBLoRRT6TY4ihrrKHqITG3PFzOfkSm9PmPomzf9K/clHssshl1QzqjFDbxbeHbet p4au6EXcOv0AEfFE9xnsYR6yyBdv3cSabdilTZoqh2klUdgaexHz0bCknrMLSQV9NdmW JeQg== X-Gm-Message-State: AOJu0YyabJr8ARKw2HVagBhFGEi7arpwAlPnDxw7zFFXrEGz4kFJqB8a xsEXHt0g/+fbOoghMsHTc+cpeQ== 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 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 X-Mailer: b4 0.13-dev-0438c X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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/drivers/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[] = { static const struct dpu_pingpong_cfg sc7280_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, - .base = 0x69000, .len = 0, + .base = 0x69000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, @@ -134,7 +134,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { .intr_rdptr = -1, }, { .name = "pingpong_1", .id = PINGPONG_1, - .base = 0x6a000, .len = 0, + .base = 0x6a000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, @@ -142,7 +142,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { .intr_rdptr = -1, }, { .name = "pingpong_2", .id = PINGPONG_2, - .base = 0x6b000, .len = 0, + .base = 0x6b000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, @@ -150,7 +150,7 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = { .intr_rdptr = -1, }, { .name = "pingpong_3", .id = PINGPONG_3, - .base = 0x6c000, .len = 0, + .base = 0x6c000, .len = 0xd4, .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sc7280_pp_sblk, .merge_3d = 0, From patchwork Wed Sep 20 22:46:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13393555 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 244FBCD4933 for ; Wed, 20 Sep 2023 22:46:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A787B10E554; Wed, 20 Sep 2023 22:46:20 +0000 (UTC) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55C1D10E53B for ; Wed, 20 Sep 2023 22:46:11 +0000 (UTC) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9aa2c6f0806so27118466b.3 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=lists.freedesktop.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=lIr4v5sQlqZL8Xnq2AG/p/tZNbgL0MD13YFhz2AYkSUxu/ihGcFQEKwSukQLbYFUSU yR4bXBspSNW1zhBP/BB976pD+6951RzINjvMBvUpEicv3v/l2+bWZNKvdhSvfgUbr5xu THuDQJsg5hXjQKfRmaWFB7O3/fTxM08CZzS4z45BbgkmEX/m+ev4nwT75kxuTD12am71 Zga08z3qm+QE424BJ9AARk7QWGJupDYX7rfWPFr99jLZ0SwZM6C5CzDhpXbRLKHe27rR lpZD0w6d55XZDnn77855Ngy3+QTSCtckuZ/UEYVmjqwkcckJDd3TiXmUTdA6sVymdPrr Kzfw== 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=ESUCBgv8NSfCCjGbVRzIV5AYe+0eIuqmFicrBctQrzr3HtkdVZb9ktoEjW6bjTeK94 HG4af82lpHYZ0ncW+WvMUFao6BnGwp/y8cAa/8VaAuChRmYmKV/NksgcKLW5QX7Z46dq AR/AVCPMvUEw5H1hbtfIqSgaFYLGubWHOjHO2GPtptv5rWVUO4poT0zn30bPXkd9Yn7f vUMVPbFkydKp+YqTBQcsBkH+yvHSAT+wyZqIDvqk39WwSwIUZRCqYpLGGoDWLVysQhK6 neR/8dOPhPPYShrHoP8NfuA7Iwxl6DXX5V/3xxJ601i0zyBOF9s6dkPwZwwCRlJkG+PA Sa1Q== X-Gm-Message-State: AOJu0Yz9kNWnOsq3Gsxrxvsc85t0T3aWYqoC1p8V027bdHLOGsf03C1w +GG/1nfrtUEv4sG7MhKmLaBQmg== 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 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 X-Mailer: b4 0.13-dev-0438c X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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, }, }; From patchwork Wed Sep 20 22:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13393554 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C52ACD4931 for ; Wed, 20 Sep 2023 22:46:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D48F10E553; Wed, 20 Sep 2023 22:46:20 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by gabe.freedesktop.org (Postfix) with ESMTPS id EEF5E10E545 for ; Wed, 20 Sep 2023 22:46:11 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-9a58dbd5daeso29476866b.2 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=lists.freedesktop.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=KmzdblHjiT+Wd/Ovb7rrkHPMe6aSAebfZy0kYlKg/6W4lVHHxF/YkX+dRCuvwuyhKT b+8MOZv0vrze3MU0GIhqbnPIYUwlayT35WT9SUwYp42wPinCBEw0x8x8zsW8kx+KKPy9 Aiu/QeWSZq3B+82vuEjpY+0l97/JIAg4xfEURpQw7nwsIS6cnO/B8mBK1wd+3RyCb3Yl PjK8OJZk68wgB5xX8LjXqe3LhR//mHXyk9hLFw/P9v+dLzb8P9lu9g5jJo4ixvf/YXZp qIRgOtNCKIkPX4zdTLKV85ZqTXvHH3lfR2YOqIQlmQaSBrHIe/k0uyKCwoFbi2kzWqg+ zJ4g== 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=ast2YysyU+3SpLE4xJXtDlztqOPBe62EYK90rIHeYFsGlRDBK02itl/P5NnDizUT9+ OAD3F7ChZmkwJAuRZkIkWAgtHV3fQNren6i002QxCWy4UQJwKfnWuWROKefQkBYBY27E EfMlkxY/iRMCjGWcLQ6s1G+FmEPoLTse2pQMA20tQ9JpwUxJlx8ZX32ot4bglHwnLdNc pmdQErJO4q5I5MmsM4CHppO9edWmncDlShGOwlK1ku9KSuRqXm08CQEn3JJfvkL0NkEx FjjNOnX/pjOg5vi8rTXuxDYerzb1V5IswqulhdO/H226W9gW7G06e6jpmBsXIbY0pEVo Wj/Q== X-Gm-Message-State: AOJu0Yz56/B7ekC1QZ5Vq3RUSIXNXhiqH+mXxE8zYfoyZuY8agwmP3rA KhDwRW9csoXJKJXZnQmKqsTHZg== 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 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 X-Mailer: b4 0.13-dev-0438c X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Konrad Dybcio , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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/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, },