* [PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes
@ 2021-03-29 12:00 Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 1/4] " Dmitry Baryshkov
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Dmitry Baryshkov @ 2021-03-29 12:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Clark, Sean Paul, Rob Herring
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
This is a series of patches developed by Jonathan Marek, and picked up
to split them, so that dts fixes can be picked up into stable branch
Add sm8150/sm8250 compatibles to drm/msm and fix the sm8250
display nodes.
v2: do not remove mmcx-supply from dispcc node
v3: remove references to dp_phy (missed this in v2, sorry for the spam)
v4: split patches to let fixes be picked up into stable branch
----------------------------------------------------------------
Jonathan Marek (4):
arm64: dts: qcom: sm8250: fix display nodes
dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display
drm/msm: add compatibles for sm8150/sm8250 display
arm64: dts: qcom: sm8250: fix display nodes
Documentation/devicetree/bindings/display/msm/dpu.txt | 4 ++--
arch/arm64/boot/dts/qcom/sm8250.dtsi | 31 ++++++++-----------------------
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++
drivers/gpu/drm/msm/msm_drv.c | 6 +++---
4 files changed, 15 insertions(+), 28 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v4 1/4] arm64: dts: qcom: sm8250: fix display nodes
2021-03-29 12:00 [PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
@ 2021-03-29 12:00 ` Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 2/4] dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display Dmitry Baryshkov
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Dmitry Baryshkov @ 2021-03-29 12:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Clark, Sean Paul, Rob Herring
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
From: Jonathan Marek <jonathan@marek.ca>
Apply these fixes to the newly added sm8250 display ndoes
- Remove "notused" interconnect (which apparently was blindly copied from
my old patches)
- Use dispcc node example from dt-bindings, removing clocks which aren't
documented or used by the driver and fixing the region size.
Fixes: 7c1dffd471b1 ("arm64: dts: qcom: sm8250.dtsi: add display system nodes")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
[DB: compatibility changes split into separate patch]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 947e1accae3a..32f0d6a82457 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2327,10 +2327,9 @@ mdss: mdss@ae00000 {
reg = <0 0x0ae00000 0 0x1000>;
reg-names = "mdss";
- interconnects = <&gem_noc MASTER_AMPSS_M0 &config_noc SLAVE_DISPLAY_CFG>,
- <&mmss_noc MASTER_MDP_PORT0 &mc_virt SLAVE_EBI_CH0>,
+ interconnects = <&mmss_noc MASTER_MDP_PORT0 &mc_virt SLAVE_EBI_CH0>,
<&mmss_noc MASTER_MDP_PORT1 &mc_virt SLAVE_EBI_CH0>;
- interconnect-names = "notused", "mdp0-mem", "mdp1-mem";
+ interconnect-names = "mdp0-mem", "mdp1-mem";
power-domains = <&dispcc MDSS_GDSC>;
@@ -2580,7 +2579,7 @@ opp-358000000 {
dispcc: clock-controller@af00000 {
compatible = "qcom,sm8250-dispcc";
- reg = <0 0x0af00000 0 0x20000>;
+ reg = <0 0x0af00000 0 0x10000>;
mmcx-supply = <&mmcx_reg>;
clocks = <&rpmhcc RPMH_CXO_CLK>,
<&dsi0_phy 0>,
@@ -2588,28 +2587,14 @@ dispcc: clock-controller@af00000 {
<&dsi1_phy 0>,
<&dsi1_phy 1>,
<0>,
- <0>,
- <0>,
- <0>,
- <0>,
- <0>,
- <0>,
- <0>,
- <&sleep_clk>;
+ <0>;
clock-names = "bi_tcxo",
"dsi0_phy_pll_out_byteclk",
"dsi0_phy_pll_out_dsiclk",
"dsi1_phy_pll_out_byteclk",
"dsi1_phy_pll_out_dsiclk",
- "dp_link_clk_divsel_ten",
- "dp_vco_divided_clk_src_mux",
- "dptx1_phy_pll_link_clk",
- "dptx1_phy_pll_vco_div_clk",
- "dptx2_phy_pll_link_clk",
- "dptx2_phy_pll_vco_div_clk",
- "edp_phy_pll_link_clk",
- "edp_phy_pll_vco_div_clk",
- "sleep_clk";
+ "dp_phy_pll_link_clk",
+ "dp_phy_pll_vco_div_clk";
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
--
2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 2/4] dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display
2021-03-29 12:00 [PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 1/4] " Dmitry Baryshkov
@ 2021-03-29 12:00 ` Dmitry Baryshkov
2021-03-29 19:28 ` Stephen Boyd
2021-03-29 12:00 ` [PATCH v4 3/4] drm/msm: " Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 4/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
3 siblings, 1 reply; 11+ messages in thread
From: Dmitry Baryshkov @ 2021-03-29 12:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Clark, Sean Paul, Rob Herring
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree, Rob Herring
From: Jonathan Marek <jonathan@marek.ca>
The driver already has support for sm8150/sm8250, but the compatibles were
never added.
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Acked-by: Rob Herring <robh@kernel.org>
[DB: split dt-bindings into separate patch]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
Documentation/devicetree/bindings/display/msm/dpu.txt | 4 ++--
1 file changed, 2 insertions(+), 2 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"
--
2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 3/4] drm/msm: add compatibles for sm8150/sm8250 display
2021-03-29 12:00 [PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 1/4] " Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 2/4] dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display Dmitry Baryshkov
@ 2021-03-29 12:00 ` Dmitry Baryshkov
2021-03-29 19:27 ` Stephen Boyd
` (2 more replies)
2021-03-29 12:00 ` [PATCH v4 4/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
3 siblings, 3 replies; 11+ messages in thread
From: Dmitry Baryshkov @ 2021-03-29 12:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Clark, Sean Paul, Rob Herring
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
From: Jonathan Marek <jonathan@marek.ca>
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 <jonathan@marek.ca>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++
drivers/gpu/drm/msm/msm_drv.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
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.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 4/4] arm64: dts: qcom: sm8250: fix display nodes
2021-03-29 12:00 [PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
` (2 preceding siblings ...)
2021-03-29 12:00 ` [PATCH v4 3/4] drm/msm: " Dmitry Baryshkov
@ 2021-03-29 12:00 ` Dmitry Baryshkov
2021-03-29 19:29 ` Stephen Boyd
3 siblings, 1 reply; 11+ messages in thread
From: Dmitry Baryshkov @ 2021-03-29 12:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Clark, Sean Paul, Rob Herring
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
From: Jonathan Marek <jonathan@marek.ca>
- Use sm8250 compatibles instead of sdm845 compatibles
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 32f0d6a82457..693ac533f9b6 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2323,7 +2323,7 @@ usb_2_dwc3: dwc3@a800000 {
};
mdss: mdss@ae00000 {
- compatible = "qcom,sdm845-mdss";
+ compatible = "qcom,sm8250-mdss";
reg = <0 0x0ae00000 0 0x1000>;
reg-names = "mdss";
@@ -2355,7 +2355,7 @@ mdss: mdss@ae00000 {
ranges;
mdss_mdp: mdp@ae01000 {
- compatible = "qcom,sdm845-dpu";
+ compatible = "qcom,sm8250-dpu";
reg = <0 0x0ae01000 0 0x8f000>,
<0 0x0aeb0000 0 0x2008>;
reg-names = "mdp", "vbif";
--
2.30.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/4] drm/msm: add compatibles for sm8150/sm8250 display
2021-03-29 12:00 ` [PATCH v4 3/4] drm/msm: " Dmitry Baryshkov
@ 2021-03-29 19:27 ` Stephen Boyd
2021-03-30 3:16 ` Bjorn Andersson
2021-03-30 3:19 ` Bjorn Andersson
2 siblings, 0 replies; 11+ messages in thread
From: Stephen Boyd @ 2021-03-29 19:27 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Dmitry Baryshkov, Rob Clark,
Rob Herring, Sean Paul
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
Quoting Dmitry Baryshkov (2021-03-29 05:00:50)
> From: Jonathan Marek <jonathan@marek.ca>
>
> 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 <jonathan@marek.ca>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/4] dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display
2021-03-29 12:00 ` [PATCH v4 2/4] dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display Dmitry Baryshkov
@ 2021-03-29 19:28 ` Stephen Boyd
0 siblings, 0 replies; 11+ messages in thread
From: Stephen Boyd @ 2021-03-29 19:28 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Dmitry Baryshkov, Rob Clark,
Rob Herring, Sean Paul
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree, Rob Herring
Quoting Dmitry Baryshkov (2021-03-29 05:00:49)
> From: Jonathan Marek <jonathan@marek.ca>
>
> The driver already has support for sm8150/sm8250, but the compatibles were
> never added.
>
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> Acked-by: Rob Herring <robh@kernel.org>
> [DB: split dt-bindings into separate patch]
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
This will conflict with the yaml changes to this file that are also in
flight.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 4/4] arm64: dts: qcom: sm8250: fix display nodes
2021-03-29 12:00 ` [PATCH v4 4/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
@ 2021-03-29 19:29 ` Stephen Boyd
0 siblings, 0 replies; 11+ messages in thread
From: Stephen Boyd @ 2021-03-29 19:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Dmitry Baryshkov, Rob Clark,
Rob Herring, Sean Paul
Cc: Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
Quoting Dmitry Baryshkov (2021-03-29 05:00:51)
> From: Jonathan Marek <jonathan@marek.ca>
>
> - Use sm8250 compatibles instead of sdm845 compatibles
>
Does it need the " - " prefix?
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/4] drm/msm: add compatibles for sm8150/sm8250 display
2021-03-29 12:00 ` [PATCH v4 3/4] drm/msm: " Dmitry Baryshkov
2021-03-29 19:27 ` Stephen Boyd
@ 2021-03-30 3:16 ` Bjorn Andersson
2021-03-30 8:04 ` Dmitry Baryshkov
2021-03-30 3:19 ` Bjorn Andersson
2 siblings, 1 reply; 11+ messages in thread
From: Bjorn Andersson @ 2021-03-30 3:16 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Andy Gross, Rob Clark, Sean Paul, Rob Herring, Jonathan Marek,
David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno,
devicetree
On Mon 29 Mar 07:00 CDT 2021, Dmitry Baryshkov wrote:
> From: Jonathan Marek <jonathan@marek.ca>
>
> 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 <jonathan@marek.ca>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++
> drivers/gpu/drm/msm/msm_drv.c | 6 +++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> 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")) {
Please consider reviewing my proposed alternative solution for this
hunk:
https://lore.kernel.org/linux-arm-msm/20210317025634.3987908-1-bjorn.andersson@linaro.org/
For the rest
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> 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.30.2
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/4] drm/msm: add compatibles for sm8150/sm8250 display
2021-03-29 12:00 ` [PATCH v4 3/4] drm/msm: " Dmitry Baryshkov
2021-03-29 19:27 ` Stephen Boyd
2021-03-30 3:16 ` Bjorn Andersson
@ 2021-03-30 3:19 ` Bjorn Andersson
2 siblings, 0 replies; 11+ messages in thread
From: Bjorn Andersson @ 2021-03-30 3:19 UTC (permalink / raw)
To: Rob Clark
Cc: Dmitry Baryshkov, Andy Gross, Sean Paul, Rob Herring,
Jonathan Marek, David Airlie, Daniel Vetter, linux-arm-msm,
dri-devel, freedreno, devicetree
On Mon 29 Mar 07:00 CDT 2021, Dmitry Baryshkov wrote:
> From: Jonathan Marek <jonathan@marek.ca>
>
> 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 <jonathan@marek.ca>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Rob, will you pick patch 2 and 3 for 5.13?
I've picked patch 1 and would like to pick patch 4 through my tree...
Regards,
Bjorn
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++
> drivers/gpu/drm/msm/msm_drv.c | 6 +++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> 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.30.2
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/4] drm/msm: add compatibles for sm8150/sm8250 display
2021-03-30 3:16 ` Bjorn Andersson
@ 2021-03-30 8:04 ` Dmitry Baryshkov
0 siblings, 0 replies; 11+ messages in thread
From: Dmitry Baryshkov @ 2021-03-30 8:04 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Andy Gross, Rob Clark, Sean Paul, Rob Herring, Jonathan Marek,
David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR MSM ADRENO GPU,
open list:DRM DRIVER FOR MSM ADRENO GPU, freedreno,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
On Tue, 30 Mar 2021 at 06:16, Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
>
> On Mon 29 Mar 07:00 CDT 2021, Dmitry Baryshkov wrote:
>
> > From: Jonathan Marek <jonathan@marek.ca>
> >
> > 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 <jonathan@marek.ca>
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > ---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++
> > drivers/gpu/drm/msm/msm_drv.c | 6 +++---
> > 2 files changed, 5 insertions(+), 3 deletions(-)
> >
> > 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")) {
>
> Please consider reviewing my proposed alternative solution for this
> hunk:
>
> https://lore.kernel.org/linux-arm-msm/20210317025634.3987908-1-bjorn.andersson@linaro.org/
I'd slightly prefer Jonathan's approach, as it seems simpler, but no
strong preference towards one or another.
>
> For the rest
>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>
> Regards,
> Bjorn
>
> > 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.30.2
> >
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-03-30 8:05 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-29 12:00 [PATCH v4 0/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 1/4] " Dmitry Baryshkov
2021-03-29 12:00 ` [PATCH v4 2/4] dt-bindings: msm/disp: add compatibles for sm8150/sm8250 display Dmitry Baryshkov
2021-03-29 19:28 ` Stephen Boyd
2021-03-29 12:00 ` [PATCH v4 3/4] drm/msm: " Dmitry Baryshkov
2021-03-29 19:27 ` Stephen Boyd
2021-03-30 3:16 ` Bjorn Andersson
2021-03-30 8:04 ` Dmitry Baryshkov
2021-03-30 3:19 ` Bjorn Andersson
2021-03-29 12:00 ` [PATCH v4 4/4] arm64: dts: qcom: sm8250: fix display nodes Dmitry Baryshkov
2021-03-29 19:29 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).