[PATCH] gpu/drm: Remove duplicate headers

[PATCH] gpu/drm: Remove duplicate headers

[jagdsh.linux]

From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>

Remove duplicate headers which are included twice.

Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c             | 1 -
 drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c        | 2 --
 drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 -
 3 files changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
index 018df2c..45a5bc6 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
@@ -15,7 +15,6 @@
 #include "dpu_hwio.h"
 #include "dpu_hw_lm.h"
 #include "dpu_hw_mdss.h"
-#include "dpu_kms.h"
 
 #define LM_OP_MODE                        0x00
 #define LM_OUT_SIZE                       0x04
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
index c80b967..2b44ba5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
@@ -26,8 +26,6 @@
 
 #include <subdev/gpio.h>
 
-#include <subdev/gpio.h>
-
 static void
 nv04_bus_intr(struct nvkm_bus *bus)
 {
diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
index 2c9c972..cacf2e0 100644
--- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
@@ -53,7 +53,6 @@
 #include <linux/of_graph.h>
 #include <linux/pm.h>
 
-#include <drm/drm_panel.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_mipi_dsi.h>
-- 
1.8.3.1

Re: [PATCH] gpu/drm: Remove duplicate headers

[Daniel Vetter]

On Fri, May 03, 2019 at 11:28:13PM +0530, jagdsh.linux@gmail.com wrote:
> From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> 
> Remove duplicate headers which are included twice.
> 
> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>

I collected some acks for the msm and nouveau parts and pushed this. For
next time around would be great if you split these up along driver/module
boundaries, so that each maintainer can pick this up directly.

Thanks for your patch.
-Daniel

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c             | 1 -
>  drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c        | 2 --
>  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 -
>  3 files changed, 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> index 018df2c..45a5bc6 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> @@ -15,7 +15,6 @@
>  #include "dpu_hwio.h"
>  #include "dpu_hw_lm.h"
>  #include "dpu_hw_mdss.h"
> -#include "dpu_kms.h"
>  
>  #define LM_OP_MODE                        0x00
>  #define LM_OUT_SIZE                       0x04
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
> index c80b967..2b44ba5 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
> @@ -26,8 +26,6 @@
>  
>  #include <subdev/gpio.h>
>  
> -#include <subdev/gpio.h>
> -
>  static void
>  nv04_bus_intr(struct nvkm_bus *bus)
>  {
> diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> index 2c9c972..cacf2e0 100644
> --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> @@ -53,7 +53,6 @@
>  #include <linux/of_graph.h>
>  #include <linux/pm.h>
>  
> -#include <drm/drm_panel.h>
>  #include <drm/drmP.h>
>  #include <drm/drm_crtc.h>
>  #include <drm/drm_mipi_dsi.h>
> -- 
> 1.8.3.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno

Re: [PATCH] gpu/drm: Remove duplicate headers

[Daniel Vetter]

On Mon, May 06, 2019 at 04:43:34PM +0200, Daniel Vetter wrote:
> On Fri, May 03, 2019 at 11:28:13PM +0530, jagdsh.linux@gmail.com wrote:
> > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > 
> > Remove duplicate headers which are included twice.
> > 
> > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> 
> I collected some acks for the msm and nouveau parts and pushed this. For
> next time around would be great if you split these up along driver/module
> boundaries, so that each maintainer can pick this up directly.
> 
> Thanks for your patch.
> -Daniel
> 
> > ---
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c             | 1 -
> >  drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c        | 2 --
> >  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 -

Correction, this didn't compile, so I dropped the changes to panel-rpi.
Another reason to split patches more for next time around. Also, needs
more compile testing (you need cross compilers for at least arm to test
this stuff).
-Daniel

> >  3 files changed, 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> > index 018df2c..45a5bc6 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c
> > @@ -15,7 +15,6 @@
> >  #include "dpu_hwio.h"
> >  #include "dpu_hw_lm.h"
> >  #include "dpu_hw_mdss.h"
> > -#include "dpu_kms.h"
> >  
> >  #define LM_OP_MODE                        0x00
> >  #define LM_OUT_SIZE                       0x04
> > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
> > index c80b967..2b44ba5 100644
> > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
> > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c
> > @@ -26,8 +26,6 @@
> >  
> >  #include <subdev/gpio.h>
> >  
> > -#include <subdev/gpio.h>
> > -
> >  static void
> >  nv04_bus_intr(struct nvkm_bus *bus)
> >  {
> > diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> > index 2c9c972..cacf2e0 100644
> > --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> > +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
> > @@ -53,7 +53,6 @@
> >  #include <linux/of_graph.h>
> >  #include <linux/pm.h>
> >  
> > -#include <drm/drm_panel.h>
> >  #include <drm/drmP.h>
> >  #include <drm/drm_crtc.h>
> >  #include <drm/drm_mipi_dsi.h>
> > -- 
> > 1.8.3.1
> > 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno

Re: [PATCH] gpu/drm: Remove duplicate headers

[Sam Ravnborg]

On Tue, May 07, 2019 at 12:05:32PM +0200, Daniel Vetter wrote:
> On Mon, May 06, 2019 at 04:43:34PM +0200, Daniel Vetter wrote:
> > On Fri, May 03, 2019 at 11:28:13PM +0530, jagdsh.linux@gmail.com wrote:
> > > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > > 
> > > Remove duplicate headers which are included twice.
> > > 
> > > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > 
> > I collected some acks for the msm and nouveau parts and pushed this. For
> > next time around would be great if you split these up along driver/module
> > boundaries, so that each maintainer can pick this up directly.
> > 
> > Thanks for your patch.
> > -Daniel
> > 
> > > ---
> > >  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c             | 1 -
> > >  drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv04.c        | 2 --
> > >  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 -
> 
> Correction, this didn't compile, so I dropped the changes to panel-rpi.
> Another reason to split patches more for next time around. Also, needs
> more compile testing (you need cross compilers for at least arm to test
> this stuff).
I will try to resurrect my patch series for drm/panel/ that
addresses:
- removal of drmP.h
- removal of duplicated include files
- sort all include files

In other words - panel-raspberrypi-touchscreen.c will be dealt with.
I expect to look at it in two weeks time (on vacation starting friday).

	Sam
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau