[v4,3/4] drm/msm: add compatibles for sm8150/sm8250 display

Message ID 20210329120051.3401567-4-dmitry.baryshkov@linaro.org
State New
Headers show
Series
  • arm64: dts: qcom: sm8250: fix display nodes
Related show

Commit Message

Dmitry Baryshkov March 29, 2021, noon
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(-)

-- 
2.30.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Stephen Boyd March 29, 2021, 7:27 p.m. | #1
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>

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Bjorn Andersson March 30, 2021, 3:16 a.m. | #2
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

> 

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Bjorn Andersson March 30, 2021, 3:19 a.m. | #3
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

> 

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dmitry Baryshkov March 30, 2021, 8:04 a.m. | #4
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

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);