From patchwork Thu Dec 8 00:08:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13067780 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 8D59CC63703 for ; Thu, 8 Dec 2022 00:09:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 06F2C10E44A; Thu, 8 Dec 2022 00:09:03 +0000 (UTC) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61F0510E43D for ; Thu, 8 Dec 2022 00:08:54 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id d6so31204806lfs.10 for ; Wed, 07 Dec 2022 16:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f1Ikr2FvvhgzNt0kU27nBgUrdbiSfG2vNFlP2dDVTHs=; b=VQBte6MFoYwlUkLoD79y3YMxEwUqfvgXN+Nc5sRUlAsJjkTErwdrF+V/CKOMPeZpjg BDf7SK8vB51+3MFUjr7lvtIxXP0FzFokav14bJCYhLuyTCjR5vWgJBKw8CIwRoHQYGxD nYj83JLnfvYvCvYdZ9S4NwOf7gbkq5/zRTw+GfxjaMaIrc+aHFyQ+hOeoAiU9J17Sn0G PaIXmRj8miKxy+1G6SGQFu/Qdo6irZ7breGbepqj7mBOrJC7qKNcVwUyaRKxWmc2WpcQ yfVR2GHksXPmzo0LuGsQ17akMfGX2MdL8Tqjy9QPCPZ9Wfl05S69ypozh/+UBdRIr+ht cVlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f1Ikr2FvvhgzNt0kU27nBgUrdbiSfG2vNFlP2dDVTHs=; b=m7M4ppHCnqLZirDy/UOA8GuKbKSf8py+At9XK0754UgMQlM/ak0Af9nDW2GW0fZAWM sHyJFc+DQNLI231rgzO2x59S+yX1XNs4GM0QkRpKDNMFNPACEXbJj9XilFkCYCDBZ9Pi yjab6m1nWSxAzZmBVN2ssMpRSh2AN1z/o8rQuRSX64VENdoHIK8gcc5sSK4Tw4mQ5U2G cYpttqHGUAlv3j3E+06PAADnQRqje8GA+nZ+zUzaAp3WcmOoAMF8JGRSfZCNQho1594N PvVJpkUFOnvSthv26ZG4R0+wZ7d8s0rMWChVAW1vRAHq8WAxyYfLceIym7Tm02N/8EO4 HiQg== X-Gm-Message-State: ANoB5pl6tvUKMqG2jyDibggRUXOvxny0DrPh2Sn3OhPDWoQz94/NCdVj PRBDXQHkBQD6IIKfUuHAfj+4Dg== X-Google-Smtp-Source: AA0mqf62HG2CgyXqtDj6Wr8hznjx6FdsA5/EAOkI3BHGNetCEwLKLRyQIr0PwPc6Xs13U3JbybzPDQ== X-Received: by 2002:a05:6512:1508:b0:4a2:4b01:8466 with SMTP id bq8-20020a056512150800b004a24b018466mr33696309lfb.34.1670458132490; Wed, 07 Dec 2022 16:08:52 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id z6-20020ac25de6000000b004a2c447598fsm2062992lfq.159.2022.12.07.16.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 16:08:52 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [RFC PATCH 1/4] drm/msm/mdss: convert UBWC setup to use match data Date: Thu, 8 Dec 2022 02:08:47 +0200 Message-Id: <20221208000850.312548-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> References: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 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: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson , dri-devel@lists.freedesktop.org, Stephen Boyd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To simplify adding new platforms and to make settings more obvious, rewrite the UBWC setup to use the data structure to pass platform config rather than just calling the functions direcly. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/msm_mdss.c | 158 ++++++++++++++++++++------------- 1 file changed, 94 insertions(+), 64 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 92773e0a8fda..2219c1bd59a9 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -29,6 +29,14 @@ #define MIN_IB_BW 400000000UL /* Min ib vote 400MB */ +struct msm_mdss_data { + u32 ubwc_version; + u32 ubwc_swizzle; + u32 ubwc_static; + u32 highest_bank_bit; + u32 macrotile_mode; +}; + struct msm_mdss { struct device *dev; @@ -40,6 +48,7 @@ struct msm_mdss { unsigned long enabled_mask; struct irq_domain *domain; } irq_controller; + const struct msm_mdss_data *mdss_data; struct icc_path *path[2]; u32 num_paths; }; @@ -180,46 +189,40 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) #define UBWC_3_0 0x30000000 #define UBWC_4_0 0x40000000 -static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss, - u32 ubwc_static) +static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss) { - writel_relaxed(ubwc_static, msm_mdss->mmio + UBWC_STATIC); + const struct msm_mdss_data *data = msm_mdss->mdss_data; + + writel_relaxed(data->ubwc_static, msm_mdss->mmio + UBWC_STATIC); } -static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss, - unsigned int ubwc_version, - u32 ubwc_swizzle, - u32 highest_bank_bit, - u32 macrotile_mode) +static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss) { - u32 value = (ubwc_swizzle & 0x1) | - (highest_bank_bit & 0x3) << 4 | - (macrotile_mode & 0x1) << 12; + const struct msm_mdss_data *data = msm_mdss->mdss_data; + u32 value = (data->ubwc_swizzle & 0x1) | + (data->highest_bank_bit & 0x3) << 4 | + (data->macrotile_mode & 0x1) << 12; - if (ubwc_version == UBWC_3_0) + if (data->ubwc_version == UBWC_3_0) value |= BIT(10); - if (ubwc_version == UBWC_1_0) + if (data->ubwc_version == UBWC_1_0) value |= BIT(8); writel_relaxed(value, msm_mdss->mmio + UBWC_STATIC); } -static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss, - unsigned int ubwc_version, - u32 ubwc_swizzle, - u32 ubwc_static, - u32 highest_bank_bit, - u32 macrotile_mode) +static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss) { - u32 value = (ubwc_swizzle & 0x7) | - (ubwc_static & 0x1) << 3 | - (highest_bank_bit & 0x7) << 4 | - (macrotile_mode & 0x1) << 12; + const struct msm_mdss_data *data = msm_mdss->mdss_data; + u32 value = (data->ubwc_swizzle & 0x7) | + (data->ubwc_static & 0x1) << 3 | + (data->highest_bank_bit & 0x7) << 4 | + (data->macrotile_mode & 0x1) << 12; writel_relaxed(value, msm_mdss->mmio + UBWC_STATIC); - if (ubwc_version == UBWC_3_0) { + if (data->ubwc_version == UBWC_3_0) { writel_relaxed(1, msm_mdss->mmio + UBWC_CTRL_2); writel_relaxed(0, msm_mdss->mmio + UBWC_PREDICTION_MODE); } else { @@ -232,6 +235,7 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss) { int ret; u32 hw_rev; + u32 ubwc_dec_hw_version; /* * Several components have AXI clocks that can only be turned on if @@ -250,53 +254,36 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss) * HW_REV requires MDSS_MDP_CLK, which is not enabled by the mdss on * mdp5 hardware. Skip reading it for now. */ - if (msm_mdss->is_mdp5) + if (msm_mdss->is_mdp5 || !msm_mdss->mdss_data) return 0; hw_rev = readl_relaxed(msm_mdss->mmio + HW_REV); dev_dbg(msm_mdss->dev, "HW_REV: 0x%x\n", hw_rev); + + ubwc_dec_hw_version = readl_relaxed(msm_mdss->mmio + UBWC_DEC_HW_VERSION); dev_dbg(msm_mdss->dev, "UBWC_DEC_HW_VERSION: 0x%x\n", - readl_relaxed(msm_mdss->mmio + UBWC_DEC_HW_VERSION)); + ubwc_dec_hw_version); /* * ubwc config is part of the "mdss" region which is not accessible * from the rest of the driver. hardcode known configurations here * * Decoder version can be read from the UBWC_DEC_HW_VERSION reg, - * UBWC_n and the rest of params comes from hw_catalog. - * Unforunately this driver can not access hw catalog, so we have to - * hardcode them here. + * UBWC_n and the rest of params comes from hw data. */ - switch (hw_rev) { - case DPU_HW_VER_500: - case DPU_HW_VER_501: - msm_mdss_setup_ubwc_dec_30(msm_mdss, UBWC_3_0, 0, 2, 0); - break; - case DPU_HW_VER_600: - /* TODO: highest_bank_bit = 2 for LP_DDR4 */ - msm_mdss_setup_ubwc_dec_40(msm_mdss, UBWC_4_0, 6, 1, 3, 1); - break; - case DPU_HW_VER_620: - /* UBWC_2_0 */ - msm_mdss_setup_ubwc_dec_20(msm_mdss, 0x1e); + switch (ubwc_dec_hw_version) { + case UBWC_2_0: + msm_mdss_setup_ubwc_dec_20(msm_mdss); break; - case DPU_HW_VER_630: - /* UBWC_2_0 */ - msm_mdss_setup_ubwc_dec_20(msm_mdss, 0x11f); + case UBWC_3_0: + msm_mdss_setup_ubwc_dec_30(msm_mdss); break; - case DPU_HW_VER_700: - /* TODO: highest_bank_bit = 2 for LP_DDR4 */ - msm_mdss_setup_ubwc_dec_40(msm_mdss, UBWC_4_0, 6, 1, 3, 1); + case UBWC_4_0: + msm_mdss_setup_ubwc_dec_40(msm_mdss); break; - case DPU_HW_VER_720: - msm_mdss_setup_ubwc_dec_40(msm_mdss, UBWC_3_0, 6, 1, 1, 1); - break; - case DPU_HW_VER_800: - msm_mdss_setup_ubwc_dec_40(msm_mdss, UBWC_4_0, 6, 1, 2, 1); - break; - case DPU_HW_VER_810: - /* TODO: highest_bank_bit = 2 for LP_DDR4 */ - msm_mdss_setup_ubwc_dec_40(msm_mdss, UBWC_4_0, 6, 1, 3, 1); + default: + dev_err(msm_mdss->dev, "Unuspported UBWC decoder version %x\n", + ubwc_dec_hw_version); break; } @@ -487,6 +474,8 @@ static int mdss_probe(struct platform_device *pdev) if (IS_ERR(mdss)) return PTR_ERR(mdss); + mdss->mdss_data = of_device_get_match_data(&pdev->dev); + platform_set_drvdata(pdev, mdss); /* @@ -516,20 +505,61 @@ static int mdss_remove(struct platform_device *pdev) return 0; } +static const struct msm_mdss_data sc7180_data = { + .ubwc_version = UBWC_2_0, + .ubwc_static = 0x1e, +}; + +static const struct msm_mdss_data sc7280_data = { + .ubwc_version = UBWC_3_0, + .ubwc_swizzle = 6, + .ubwc_static = 1, + .highest_bank_bit = 1, + .macrotile_mode = 1, +}; + +static const struct msm_mdss_data sc8280xp_data = { + .ubwc_version = UBWC_4_0, + .ubwc_swizzle = 6, + .ubwc_static = 1, + .highest_bank_bit = 2, + .macrotile_mode = 1, +}; + +static const struct msm_mdss_data sm8150_data = { + .ubwc_version = UBWC_3_0, + .highest_bank_bit = 2, +}; + +static const struct msm_mdss_data sm6115_data = { + .ubwc_version = UBWC_2_0, + .ubwc_swizzle = 7, + .ubwc_static = 0x11f, +}; + +static const struct msm_mdss_data sm8250_data = { + .ubwc_version = UBWC_4_0, + .ubwc_swizzle = 6, + .ubwc_static = 1, + /* TODO: highest_bank_bit = 2 for LP_DDR4 */ + .highest_bank_bit = 3, + .macrotile_mode = 1, +}; + static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,mdss" }, { .compatible = "qcom,msm8998-mdss" }, { .compatible = "qcom,qcm2290-mdss" }, { .compatible = "qcom,sdm845-mdss" }, - { .compatible = "qcom,sc7180-mdss" }, - { .compatible = "qcom,sc7280-mdss" }, + { .compatible = "qcom,sc7180-mdss", .data = &sc7180_data }, + { .compatible = "qcom,sc7280-mdss", .data = &sc7280_data }, { .compatible = "qcom,sc8180x-mdss" }, - { .compatible = "qcom,sc8280xp-mdss" }, - { .compatible = "qcom,sm6115-mdss" }, - { .compatible = "qcom,sm8150-mdss" }, - { .compatible = "qcom,sm8250-mdss" }, - { .compatible = "qcom,sm8350-mdss" }, - { .compatible = "qcom,sm8450-mdss" }, + { .compatible = "qcom,sc8280xp-mdss", .data = &sc8280xp_data }, + { .compatible = "qcom,sm6115-mdss", .data = &sm6115_data }, + { .compatible = "qcom,sm8150-mdss", .data = &sm8150_data }, + { .compatible = "qcom,sm8250-mdss", .data = &sm8250_data }, + { .compatible = "qcom,sm8350-mdss", .data = &sm8250_data }, + { .compatible = "qcom,sm8450-mdss", .data = &sm8250_data }, {} }; MODULE_DEVICE_TABLE(of, mdss_dt_match); From patchwork Thu Dec 8 00:08:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13067781 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 38B1DC4708D for ; Thu, 8 Dec 2022 00:09:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E40F310E44C; Thu, 8 Dec 2022 00:09:04 +0000 (UTC) Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by gabe.freedesktop.org (Postfix) with ESMTPS id E5AA110E442 for ; Thu, 8 Dec 2022 00:08:54 +0000 (UTC) Received: by mail-lf1-x132.google.com with SMTP id x28so13911430lfn.6 for ; Wed, 07 Dec 2022 16:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X4t60xpEhgA6O4JyuJHsvdFgbVG01Y1Cn5LTbT2XI1g=; b=UOuYnTNVufjoB7OsnWB9nnl2knxgjQvhl9e/z9Hcpgdwo42Ugi7YUfiuzLvzgpB5TS spdxyEkNrM0BDoXSWP/7WH4juQ8UA/uEIwKJtNqgNpKXy136oRnpjuWPgB/sV1cgiHsb klTk7tvNpzxRVGk58oKsPCl6YUoRTb9mX5PsSHtj5aHw6aLQ9S0hpK6swzdaOm3lfuxg vwjSgYFCCi0kLZCVHJSTQCj6k3hYEoaNLhAMp3p9ku4uvdRxRQZbaFzfAMgcr7SUNZ7x Hr8VMgZ/WwfQr1/d3lgX8g4hZDu+uDMpi0dKs0xbT+xLS+n6meJVV/SvhRdYEdyifM+x fykQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X4t60xpEhgA6O4JyuJHsvdFgbVG01Y1Cn5LTbT2XI1g=; b=jJSA/bQCQCw55I5eVhxD4mCT1PR2X25W9LClMXhY1ySKAiOLYsiANbL+yz2et7Fwhe mPC9bywM+oMmX7W1R3WGtRadhfWd9B40iGTrOI0YMiQs61q+Y+0nAosAnE9e4BFF8jHg 1CZuH1qtRT2lWC2PdrUEZCNC18NpEChLYnbolHE1iydxFQl29cBojfnSxZxb24cX3F4Y 4nzsA9Q6bJdRyceG3LlLYbbTWaOJieRBqJsLzYCL/OnrvdyDgD3OFQrBYrhlUj91S/VG T8qmnuYSYovAN6YHhH1l8szeYFz5KRAs8PGXfsvYh9lq+c1Vs19FU6Pantc8nhTU822F ccPQ== X-Gm-Message-State: ANoB5pmIhIPZKvGrn3ZNZpU4Cm5TpLMz8d+TxeqRdc84O1IlQfHL8QJM M9ajbOep2W24RhoyM7C6osRGYBfYNGRJxq/cq/c= X-Google-Smtp-Source: AA0mqf5Mrul8ZS23E7EVaMlRbfenhj3XEYpGW1TDXcg29rLWmQ1MES0Uu1q1bQEQKEhktAz3N916tA== X-Received: by 2002:a05:6512:2149:b0:4a2:3b95:d889 with SMTP id s9-20020a056512214900b004a23b95d889mr32407167lfr.676.1670458133143; Wed, 07 Dec 2022 16:08:53 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id z6-20020ac25de6000000b004a2c447598fsm2062992lfq.159.2022.12.07.16.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 16:08:52 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [RFC PATCH 2/4] drm/msm/mdss: correct the ubwc version for sm6115 platform Date: Thu, 8 Dec 2022 02:08:48 +0200 Message-Id: <20221208000850.312548-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> References: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 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: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson , dri-devel@lists.freedesktop.org, Stephen Boyd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" According to the vendor DT, sm6115 has UBWC 1.0, not 2.0. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/msm_mdss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 2219c1bd59a9..4401f945b966 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -532,7 +532,7 @@ static const struct msm_mdss_data sm8150_data = { }; static const struct msm_mdss_data sm6115_data = { - .ubwc_version = UBWC_2_0, + .ubwc_version = UBWC_1_0, .ubwc_swizzle = 7, .ubwc_static = 0x11f, }; From patchwork Thu Dec 8 00:08:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13067782 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 5F416C4708D for ; Thu, 8 Dec 2022 00:09:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8126910E443; Thu, 8 Dec 2022 00:09:06 +0000 (UTC) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9702A88FF9 for ; Thu, 8 Dec 2022 00:08:55 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id bn5so22730703ljb.2 for ; Wed, 07 Dec 2022 16:08:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sFLaHZzkiofOVWIbXQa8n2M4jPc4703bol8Amy6xF6Q=; b=q4QZscJbVJ4+cMD+Sd5P4PS2VTHzKRk2e5IlSgibIu5y9guIxKS1LXNQaHZiPWm+Fc WcoZOAgLCb+qxrKwRDeRVhVHreqdTjhSe+WAx5zlUsgFtjyC475KrjNUDZP008mHnZcz IJQMhkfX7EN+R8zZWOrry4aLzuzUz9ghbsSSA9byzC0s2AOchiyiGRHxhZ6dPLy9Ld3k 9dwcT0a8ipDVgUE5JnoDekBjuRNTJyJBJEdgRCO8EhXu5+uFXVdS2jUnuJKDqP8Rho22 54ZegU8t5SOwNKSOu0Rka/1mJyjEbpcSHC7PKAWpwnDgFCocDPRnbB67X9qqwU5wXxYH 1x6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sFLaHZzkiofOVWIbXQa8n2M4jPc4703bol8Amy6xF6Q=; b=tiJS7MJ1HuryAocjmZlZHCynu+tH4l+/tXZPcbn+wyA3UDjnFud0o8X8s8AQNuhzH2 bVMGr+WaA3ECrvz1iWTP7lilpavjF9Z773juS30YDWdCLInGGXjB/C8MUILhttLrtdiB L5dyBn/LwZT+vosdjgp53v1SalT4sPFgBlHphcsAsl3eQzmX7tdkbHLWGHzRQJJ4N9Rh xDpvfY7V978lmscOT75q5o1Xc7YgDY4GKFGc93hPXKvEEkv01rmzW0U0ZZ+i87BG8QRq dtYSwGG2wD6GqPpPEkMYjWpou7nscbPoQE6DeuBZlD3F9ZfcTsqD03adNZpVjyjBrHqr mpzA== X-Gm-Message-State: ANoB5pnVz6aRMAfMDn0L/H/U0GZZ/+tz3CG51QuWm2oVzQMHidBB+AQ+ RysvI6ENSWB6BqfVJpjsTX2z6w== X-Google-Smtp-Source: AA0mqf5OGwIKsS/5oBYlLFBiB9Kk6hm9x1GyIUM8OdXypovLhfvBw+K61Qeka6zugKsZ01GiELeeAA== X-Received: by 2002:a05:651c:171c:b0:279:f169:9b53 with SMTP id be28-20020a05651c171c00b00279f1699b53mr5898335ljb.132.1670458133887; Wed, 07 Dec 2022 16:08:53 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id z6-20020ac25de6000000b004a2c447598fsm2062992lfq.159.2022.12.07.16.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 16:08:53 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [RFC PATCH 3/4] drm/msm/mdss: add data for sc8180xp Date: Thu, 8 Dec 2022 02:08:49 +0200 Message-Id: <20221208000850.312548-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> References: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 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: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson , dri-devel@lists.freedesktop.org, Stephen Boyd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add platform data for sc8180xp based on sdmshrike-sde.dtsi. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/msm_mdss.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 4401f945b966..5e19ec897670 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -518,6 +518,12 @@ static const struct msm_mdss_data sc7280_data = { .macrotile_mode = 1, }; +static const struct msm_mdss_data sc8180x_data = { + .ubwc_version = UBWC_3_0, + .highest_bank_bit = 3, + .macrotile_mode = 1, +}; + static const struct msm_mdss_data sc8280xp_data = { .ubwc_version = UBWC_4_0, .ubwc_swizzle = 6, @@ -553,7 +559,7 @@ static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,sdm845-mdss" }, { .compatible = "qcom,sc7180-mdss", .data = &sc7180_data }, { .compatible = "qcom,sc7280-mdss", .data = &sc7280_data }, - { .compatible = "qcom,sc8180x-mdss" }, + { .compatible = "qcom,sc8180x-mdss", .data = &sc8180x_data }, { .compatible = "qcom,sc8280xp-mdss", .data = &sc8280xp_data }, { .compatible = "qcom,sm6115-mdss", .data = &sm6115_data }, { .compatible = "qcom,sm8150-mdss", .data = &sm8150_data }, From patchwork Thu Dec 8 00:08:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13067779 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 25D03C4708D for ; Thu, 8 Dec 2022 00:09:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5DCF10E449; Thu, 8 Dec 2022 00:09:02 +0000 (UTC) Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD70810E43D for ; Thu, 8 Dec 2022 00:08:56 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id x11so22709482ljh.7 for ; Wed, 07 Dec 2022 16:08:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QbAKHJWrOTkMAELbvt2QMnXAO5NByRRluyCbsXhWCPs=; b=jAl25flR7nlMAESp+VUdSq60nP/4NJRliKy7nLuYm0k6v0QZA8n/Jqoab30ZmYhmfT m/vCR9nw3EVb08VIhiJwt9LCzUQShMLJNUUQq9GlRt6Hh+MZ7N3BpCdBZxenc8RO3VeW 56orTWP4d/jCXamGptBZ8pwv+xh44UCVtDcvGga/rW4KFXdYexs2MCCbfpREHRPVArB8 i14AJ6bvVLYkWeaAB78VqZLoEj68WSI/52y1IW7zydgXM+aqAz9SEjABK3yPQ1dOrcTy 6w3le9b1XJ5H6VgfHTywpm3dgwzMzaIkuJuKzn73XSqgrS17MWNlWk9p64RnM4P7zVcI Er1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QbAKHJWrOTkMAELbvt2QMnXAO5NByRRluyCbsXhWCPs=; b=oHogyQ3e4sy0pRnQ0WmBWXa/UlYNW4vNn2hhFJwGDVL7s68C+Zmp4dZa+cU2kCUnQs MGI7dW4sJW3aLnwcTquLumQoz12e6pjvp24dFkAY0+dCtuqu5e9pkcGybNCk9/z8eKWA q0O0SjZLsA4NOfzJTLnIu6ASrUB7Y4YFKQxqIMk/pCNJPmVaW3lubOrOogN/ATY5WNLL 3nes+6o53KAheeMKy0BrruvBlZN3Xw72AG6+2oMuUb1Vgh2OaLpsgvnh+Z8Ejulf767G Qd+bxWSyUcu1ZDaRJYE5sAYVFYR5qh+lF7ZPmyew1F3u7uG3zBHLccneUHfuKCwaxcS6 UcQA== X-Gm-Message-State: ANoB5pnhwIqbTBjOCYNcV21j9EptaLPXZ1aUEBy1ZoITNW7i4FN5LtzT 8h6obsJzSZUmk6+fFGsYZO8RFA== X-Google-Smtp-Source: AA0mqf6rg1/8mcTW/Evo411C8zTcTr3dplVLsHsFrB4xVnO0HLWXUW2rx18TnyUEHHMZp8ooRWO9bg== X-Received: by 2002:a2e:a717:0:b0:27a:176f:5263 with SMTP id s23-20020a2ea717000000b0027a176f5263mr2232103lje.451.1670458134634; Wed, 07 Dec 2022 16:08:54 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id z6-20020ac25de6000000b004a2c447598fsm2062992lfq.159.2022.12.07.16.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 16:08:54 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Subject: [RFC PATCH 4/4] drm/msm/mdss: add the sdm845 data for completeness Date: Thu, 8 Dec 2022 02:08:50 +0200 Message-Id: <20221208000850.312548-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> References: <20221208000850.312548-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 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: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson , dri-devel@lists.freedesktop.org, Stephen Boyd Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add the platform data for sdm845 platform. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/msm_mdss.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 5e19ec897670..b2c6e8b12469 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -532,6 +532,11 @@ static const struct msm_mdss_data sc8280xp_data = { .macrotile_mode = 1, }; +static const struct msm_mdss_data sdm845_data = { + .ubwc_version = UBWC_2_0, + .highest_bank_bit = 2, +}; + static const struct msm_mdss_data sm8150_data = { .ubwc_version = UBWC_3_0, .highest_bank_bit = 2, @@ -556,7 +561,7 @@ static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,mdss" }, { .compatible = "qcom,msm8998-mdss" }, { .compatible = "qcom,qcm2290-mdss" }, - { .compatible = "qcom,sdm845-mdss" }, + { .compatible = "qcom,sdm845-mdss", .data = &sdm845_data }, { .compatible = "qcom,sc7180-mdss", .data = &sc7180_data }, { .compatible = "qcom,sc7280-mdss", .data = &sc7280_data }, { .compatible = "qcom,sc8180x-mdss", .data = &sc8180x_data },