From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58B52C433E6 for ; Tue, 16 Feb 2021 18:07:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EABE64E13 for ; Tue, 16 Feb 2021 18:07:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbhBPSHF (ORCPT ); Tue, 16 Feb 2021 13:07:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbhBPSHD (ORCPT ); Tue, 16 Feb 2021 13:07:03 -0500 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 950D5C061574 for ; Tue, 16 Feb 2021 10:06:23 -0800 (PST) Received: by mail-qt1-x829.google.com with SMTP id v10so7687554qtq.7 for ; Tue, 16 Feb 2021 10:06:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=jY9iK1+FYhqLlmeOaaKNMJnRWWpPl1FPPGfZFgnoHOA=; b=J61crQvmK+qVVsBKTRgxh97TUx35Xd9UngcxEIQ/FyDCnqG3ntUYW6zNuklrBgg7x5 ShKstpDoEWs9PStyAOU+UKjYTs6+5LthtKz9Rg4OdVpGi0Zv3SkYd4HXkdhQvm/NfgdN YprLyz0UaIbY8olus8ju7DrI7UfbrWx/hAZi2BXnPFnU3f2VZ0si/d2X/sfJdfLviiKA 1Euhj4lzODbXo/VEV3LvfmPFEY+nKCsAGI51foeMn1jiL289OS7qcCHVaz2+jPqSiPSx MLnSqIDr8fokhb3RBdL+sZA+blwRG/leGdFtkBDxvvrvwBFPcR65/tRVe+4aKs9CI2Ai JhSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jY9iK1+FYhqLlmeOaaKNMJnRWWpPl1FPPGfZFgnoHOA=; b=ldX98SkRz2DRHjC09xjcvUohKGV7SRenw/XD0OJ9pHWnOKhO7FeklSI8ingd8lNFQk 03AIdNMh6ZXJCgldrMIDlvAvOd0Eb0UBhyv38unikXa5c31+XopbX4fHw7fkmW8QgoeF YQrAy25eoilEsXPiyXTVADSyUJ+1EdSPeLLqBZxhV2psWDX0jHTD+0vsK7y56IrCtmeJ q3RGrTmETHeXrNnQOcJvSIDjG/4BhSGKRGEPsS/Np0Lq3RG3IsqMBqhBL6b06Ydn996y XX806chgd6HgzHDg4E+JOGdwhzWQJ/xKlNHkR17eG0OEoeQCEnXXFmdSIU6dsYhekh7W iV7Q== X-Gm-Message-State: AOAM531Ey/pCWYSds6nt+MMQnJ42G+YS008d0UKVn26SR5HwBGiZfu5f XMY7bm6e4Ajyq8d5VNOtyWKyFg== X-Google-Smtp-Source: ABdhPJwokn1VAbBbWme8hbQKD48AY7keANjDwy6xiTFqQEmNtcyAGSGs2OgTmgYhB+BvFCvS44aLWw== X-Received: by 2002:a05:622a:216:: with SMTP id b22mr19554660qtx.163.1613498782789; Tue, 16 Feb 2021 10:06:22 -0800 (PST) Received: from [192.168.0.189] (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id x6sm3255622qkj.118.2021.02.16.10.06.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Feb 2021 10:06:22 -0800 (PST) Subject: Re: [PATCH v2 1/2] drm/msm: add compatibles for sm8150/sm8250 display To: Dmitry Baryshkov Cc: "open list:DRM DRIVER FOR MSM ADRENO GPU" , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Jordan Crouse , Kalyan Thota , Eric Anholt , Tanmay Shah , Drew Davenport , Jeykumar Sankaran , Rajendra Nayak , tongtiangen , Qinglang Miao , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list References: <20210215161537.14696-1-jonathan@marek.ca> <20210215161537.14696-2-jonathan@marek.ca> From: Jonathan Marek Message-ID: <29231c68-0cc4-9d8a-8cb1-791511780bcd@marek.ca> Date: Tue, 16 Feb 2021 13:05:34 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2/16/21 11:54 AM, Dmitry Baryshkov wrote: > On Mon, 15 Feb 2021 at 19:25, Jonathan Marek wrote: >> >> The driver already has support for sm8150/sm8250, but the compatibles were >> never added. >> >> Also inverse the non-mdp4 condition in add_display_components() to avoid >> having to check every new compatible in the condition. >> >> Signed-off-by: Jonathan Marek >> --- >> Documentation/devicetree/bindings/display/msm/dpu.txt | 4 ++-- >> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++ >> drivers/gpu/drm/msm/msm_drv.c | 6 +++--- >> 3 files changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/display/msm/dpu.txt b/Documentation/devicetree/bindings/display/msm/dpu.txt >> index 551ae26f60da..5763f43200a0 100644 >> --- a/Documentation/devicetree/bindings/display/msm/dpu.txt >> +++ b/Documentation/devicetree/bindings/display/msm/dpu.txt >> @@ -8,7 +8,7 @@ The DPU display controller is found in SDM845 SoC. >> >> MDSS: >> Required properties: >> -- compatible: "qcom,sdm845-mdss", "qcom,sc7180-mdss" >> +- compatible: "qcom,sdm845-mdss", "qcom,sc7180-mdss", "qcom,sm8150-mdss", "qcom,sm8250-mdss" >> - reg: physical base address and length of contoller's registers. >> - reg-names: register region names. The following region is required: >> * "mdss" >> @@ -41,7 +41,7 @@ Optional properties: >> >> MDP: >> Required properties: >> -- compatible: "qcom,sdm845-dpu", "qcom,sc7180-dpu" >> +- compatible: "qcom,sdm845-dpu", "qcom,sc7180-dpu", "qcom,sm8150-dpu", "qcom,sm8250-dpu" >> - reg: physical base address and length of controller's registers. >> - reg-names : register region names. The following region is required: >> * "mdp" > > These two chunks should probably go to the separate patch 'dt-bindings:...'. > In this case I think its better to have this change in the same patch, but maybe one of the Robs will disagree. > Also, could you please pinpoint the reason for adding more > compatibility strings, while they map to the same internal data? > I think we might want instead to use some generic name for the dpu > block, like "qcom,dpu" or "qcom,mdp-dpu" instead of specifying the > platform name. > sdm845 and sc7180 aren't using generic compatibles, this is just being consistent with that. > >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> index 5a8e3e1fc48c..fff12a4c8bfc 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >> @@ -1219,6 +1219,8 @@ static const struct dev_pm_ops dpu_pm_ops = { >> static const struct of_device_id dpu_dt_match[] = { >> { .compatible = "qcom,sdm845-dpu", }, >> { .compatible = "qcom,sc7180-dpu", }, >> + { .compatible = "qcom,sm8150-dpu", }, >> + { .compatible = "qcom,sm8250-dpu", }, >> {} >> }; >> MODULE_DEVICE_TABLE(of, dpu_dt_match); >> diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c >> index 94525ac76d4e..928f13d4bfbc 100644 >> --- a/drivers/gpu/drm/msm/msm_drv.c >> +++ b/drivers/gpu/drm/msm/msm_drv.c >> @@ -1185,9 +1185,7 @@ static int add_display_components(struct device *dev, >> * Populate the children devices, find the MDP5/DPU node, and then add >> * the interfaces to our components list. >> */ >> - if (of_device_is_compatible(dev->of_node, "qcom,mdss") || >> - of_device_is_compatible(dev->of_node, "qcom,sdm845-mdss") || >> - of_device_is_compatible(dev->of_node, "qcom,sc7180-mdss")) { >> + if (!of_device_is_compatible(dev->of_node, "qcom,mdp4")) { >> ret = of_platform_populate(dev->of_node, NULL, NULL, dev); >> if (ret) { >> DRM_DEV_ERROR(dev, "failed to populate children devices\n"); >> @@ -1320,6 +1318,8 @@ static const struct of_device_id dt_match[] = { >> { .compatible = "qcom,mdss", .data = (void *)KMS_MDP5 }, >> { .compatible = "qcom,sdm845-mdss", .data = (void *)KMS_DPU }, >> { .compatible = "qcom,sc7180-mdss", .data = (void *)KMS_DPU }, >> + { .compatible = "qcom,sm8150-mdss", .data = (void *)KMS_DPU }, >> + { .compatible = "qcom,sm8250-mdss", .data = (void *)KMS_DPU }, >> {} >> }; >> MODULE_DEVICE_TABLE(of, dt_match); >> -- >> 2.26.1 >> > >