[RFC PATCH 1/4] drm/msm/mdss: convert UBWC setup to use match data
Abhinav Kumar
quic_abhinavk at quicinc.com
Mon Jan 9 20:32:18 UTC 2023
On 1/9/2023 12:17 PM, Dmitry Baryshkov wrote:
> On 09/01/2023 21:53, Abhinav Kumar wrote:
>>
>>
>> On 12/7/2022 4:08 PM, Dmitry Baryshkov wrote:
>>> 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.
>>
>> Why not use the catalog to store this information rather than using
>> the platform device match data?
>>
>> This seems more appropriate for the catalog.
>
> Which catalog?
>
> If you are talking about the DPU hw catalog, it's not possible. DPU and
> MDSS are two distinct drivers even if they are built into the same module.
>
> And if you are talking about adding mdss_catalog, I'd abstain from that
> idea. It is too easy to update one piece and forget the other one. Using
> match data is what other drivers are using (and it ensures that each new
> supported device gets its correct match data).
>
Yes, I was referring to the DPU catalog.
But now I recall the mess because of the UBWC register being part of
mmio base which the DPU doesnt map.
I do think that the platform match data is a bit of an overkill just to
store the UBWC values but the msm_mdss driver today doesnt program
anything else today so lets go with this.
But ... some comments below.
>>
>>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
>>> ---
>>> 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);
hw_rev is not used anymore now so why not just drop that reg read
altogether.
>>> 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);
If we are going to tie UBWC version to the HW compatible match, then
even this register read can be skipped and instead you can add
ubwc_dec_hw_version to your match data struct and skip this read as well.
That way we get rid of all register reads in this path which have
continuously bugged us with crashes.
>>> 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);
>
More information about the dri-devel
mailing list