* [PATCH] gpu:drm: Remove duplicate headers
@ 2019-03-27 21:11 jagdsh.linux
2019-03-28 6:41 ` Mukesh Ojha
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: jagdsh.linux @ 2019-03-27 21:11 UTC (permalink / raw)
To: a.hajda, Laurent.pinchart, airlied, daniel, jani.nikula,
joonas.lahtinen, rodrigo.vivi
Cc: dri-devel, linux-kernel, intel-gfx, Jagadeesh Pagadala
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/bridge/panel.c | 1 -
drivers/gpu/drm/i915/intel_display.c | 7 -------
2 files changed, 8 deletions(-)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 38eeaf8..eb9567d 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -15,7 +15,6 @@
#include <drm/drm_encoder.h>
#include <drm/drm_modeset_helper_vtables.h>
#include <drm/drm_probe_helper.h>
-#include <drm/drm_panel.h>
struct panel_bridge {
struct drm_bridge bridge;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ccb6163..1166342 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -51,14 +51,7 @@
#include "intel_dsi.h"
#include "intel_frontbuffer.h"
-#include "intel_drv.h"
-#include "intel_dsi.h"
-#include "intel_frontbuffer.h"
-
-#include "i915_drv.h"
-#include "i915_gem_clflush.h"
#include "i915_reset.h"
-#include "i915_trace.h"
/* Primary plane formats for gen <= 3 */
static const u32 i8xx_primary_formats[] = {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] gpu:drm: Remove duplicate headers
2019-03-27 21:11 [PATCH] gpu:drm: Remove duplicate headers jagdsh.linux
@ 2019-03-28 6:41 ` Mukesh Ojha
2019-03-28 6:51 ` Laurent Pinchart
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Mukesh Ojha @ 2019-03-28 6:41 UTC (permalink / raw)
To: jagdsh.linux, a.hajda, Laurent.pinchart, airlied, daniel,
jani.nikula, joonas.lahtinen, rodrigo.vivi
Cc: dri-devel, linux-kernel, intel-gfx
On 3/28/2019 2:41 AM, 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>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
-Mukesh
> ---
> drivers/gpu/drm/bridge/panel.c | 1 -
> drivers/gpu/drm/i915/intel_display.c | 7 -------
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 38eeaf8..eb9567d 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -15,7 +15,6 @@
> #include <drm/drm_encoder.h>
> #include <drm/drm_modeset_helper_vtables.h>
> #include <drm/drm_probe_helper.h>
> -#include <drm/drm_panel.h>
>
> struct panel_bridge {
> struct drm_bridge bridge;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ccb6163..1166342 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -51,14 +51,7 @@
> #include "intel_dsi.h"
> #include "intel_frontbuffer.h"
>
> -#include "intel_drv.h"
> -#include "intel_dsi.h"
> -#include "intel_frontbuffer.h"
> -
> -#include "i915_drv.h"
> -#include "i915_gem_clflush.h"
> #include "i915_reset.h"
> -#include "i915_trace.h"
>
> /* Primary plane formats for gen <= 3 */
> static const u32 i8xx_primary_formats[] = {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] gpu:drm: Remove duplicate headers
2019-03-27 21:11 [PATCH] gpu:drm: Remove duplicate headers jagdsh.linux
2019-03-28 6:41 ` Mukesh Ojha
@ 2019-03-28 6:51 ` Laurent Pinchart
[not found] ` <20190328160206.GA94653@CentOS76.localdomain>
2019-04-02 12:19 ` ✗ Fi.CI.CHECKPATCH: warning for gpu:drm: Remove duplicate headers (rev2) Patchwork
2019-04-02 12:54 ` ✓ Fi.CI.BAT: success " Patchwork
3 siblings, 1 reply; 9+ messages in thread
From: Laurent Pinchart @ 2019-03-28 6:51 UTC (permalink / raw)
To: jagdsh.linux
Cc: a.hajda, airlied, daniel, jani.nikula, joonas.lahtinen,
rodrigo.vivi, dri-devel, linux-kernel, intel-gfx
Hi Jagadeesh,
Thank you for the patch.
On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux@gmail.com wrote:
> From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>
> Remove duplicate headers which are included twice.
Could you, while at it, also sort the existing #include statements
alphabetically ? This should help avoiding similar issues in the future.
> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> ---
> drivers/gpu/drm/bridge/panel.c | 1 -
> drivers/gpu/drm/i915/intel_display.c | 7 -------
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 38eeaf8..eb9567d 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -15,7 +15,6 @@
> #include <drm/drm_encoder.h>
> #include <drm/drm_modeset_helper_vtables.h>
> #include <drm/drm_probe_helper.h>
> -#include <drm/drm_panel.h>
>
> struct panel_bridge {
> struct drm_bridge bridge;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ccb6163..1166342 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -51,14 +51,7 @@
> #include "intel_dsi.h"
> #include "intel_frontbuffer.h"
>
> -#include "intel_drv.h"
> -#include "intel_dsi.h"
> -#include "intel_frontbuffer.h"
> -
> -#include "i915_drv.h"
> -#include "i915_gem_clflush.h"
> #include "i915_reset.h"
> -#include "i915_trace.h"
>
> /* Primary plane formats for gen <= 3 */
> static const u32 i8xx_primary_formats[] = {
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] gpu:drm: Remove duplicate headers
2019-03-28 19:02 ` Jagadeesh Pagadala
(?)
@ 2019-03-28 17:48 ` Jani Nikula
-1 siblings, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2019-03-28 17:48 UTC (permalink / raw)
To: Jagadeesh Pagadala, Laurent Pinchart, a.hajda, airlied, daniel,
joonas.lahtinen, rodrigo.vivi
Cc: intel-gfx, linux-kernel, dri-devel
On Fri, 29 Mar 2019, Jagadeesh Pagadala <jagdsh.linux@gmail.com> wrote:
> On Thu, Mar 28, 2019 at 04:12:10PM +0200, Laurent Pinchart wrote:
>> Hi Jagadeesh,
>>
>> On Thu, Mar 28, 2019 at 09:32:06PM +0530, Jagadeesh Pagadala wrote:
>> > On Thu, Mar 28, 2019 at 08:51:24AM +0200, Laurent Pinchart wrote:
>> > > On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux@gmail.com wrote:
>> > > > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>> > > >
>> > > > Remove duplicate headers which are included twice.
>> > >
>> > > Could you, while at it, also sort the existing #include statements
>> > > alphabetically ? This should help avoiding similar issues in the future.
>> > >
>> > > > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>> > > > ---
>> > > > drivers/gpu/drm/bridge/panel.c | 1 -
>> > > > drivers/gpu/drm/i915/intel_display.c | 7 -------
>> > > > 2 files changed, 8 deletions(-)
>> > > >
>> > > > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
>> > > > index 38eeaf8..eb9567d 100644
>> > > > --- a/drivers/gpu/drm/bridge/panel.c
>> > > > +++ b/drivers/gpu/drm/bridge/panel.c
>> > > > @@ -15,7 +15,6 @@
>> > > > #include <drm/drm_encoder.h>
>> > > > #include <drm/drm_modeset_helper_vtables.h>
>> > > > #include <drm/drm_probe_helper.h>
>> > > > -#include <drm/drm_panel.h>
>> > > >
>> > > > struct panel_bridge {
>> > > > struct drm_bridge bridge;
>> > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> > > > index ccb6163..1166342 100644
>> > > > --- a/drivers/gpu/drm/i915/intel_display.c
>> > > > +++ b/drivers/gpu/drm/i915/intel_display.c
>> > > > @@ -51,14 +51,7 @@
>> > > > #include "intel_dsi.h"
>> > > > #include "intel_frontbuffer.h"
>> > > >
>> > > > -#include "intel_drv.h"
>> > > > -#include "intel_dsi.h"
>> > > > -#include "intel_frontbuffer.h"
>> > > > -
>> > > > -#include "i915_drv.h"
>> > > > -#include "i915_gem_clflush.h"
>> > > > #include "i915_reset.h"
>> > > > -#include "i915_trace.h"
>> > > >
>> > > > /* Primary plane formats for gen <= 3 */
>> > > > static const u32 i8xx_primary_formats[] = {
>>
>> > From c9a68b204fe4bb013c2b8481ca8239c957dd69cc Mon Sep 17 00:00:00 2001
>> > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>> > Date: Thu, 28 Mar 2019 21:20:12 +0530
>> > Subject: [PATCH] gpu:drm: sort the existing #includes alphabetically
>> >
>> > Hi Laurent,
>> >
>> > Hopefully this helps.
>>
>> It does, thanks. If you squash it with your original patch and send a
>> v2, you can add my
>>
>> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>
>> > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>> > ---
>> > drivers/gpu/drm/bridge/panel.c | 2 +-
>> > drivers/gpu/drm/i915/intel_display.c | 4 ++--
>> > 2 files changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
>> > index eb9567d..000ba7c 100644
>> > --- a/drivers/gpu/drm/bridge/panel.c
>> > +++ b/drivers/gpu/drm/bridge/panel.c
>> > @@ -9,11 +9,11 @@
>> > */
>> >
>> > #include <drm/drmP.h>
>> > -#include <drm/drm_panel.h>
>> > #include <drm/drm_atomic_helper.h>
>> > #include <drm/drm_connector.h>
>> > #include <drm/drm_encoder.h>
>> > #include <drm/drm_modeset_helper_vtables.h>
>> > +#include <drm/drm_panel.h>
>> > #include <drm/drm_probe_helper.h>
>> >
>> > struct panel_bridge {
>> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> > index 1166342..7956e89 100644
>> > --- a/drivers/gpu/drm/i915/intel_display.c
>> > +++ b/drivers/gpu/drm/i915/intel_display.c
>> > @@ -46,13 +46,13 @@
>> >
>> > #include "i915_drv.h"
>> > #include "i915_gem_clflush.h"
>> > +#include "i915_reset.h"
>> > #include "i915_trace.h"
>> > +
>> > #include "intel_drv.h"
>> > #include "intel_dsi.h"
>> > #include "intel_frontbuffer.h"
>> >
>> > -#include "i915_reset.h"
>> > -
>> > /* Primary plane formats for gen <= 3 */
>> > static const u32 i8xx_primary_formats[] = {
>> > DRM_FORMAT_C8,
>>
>> --
>> Regards,
>>
>> Laurent Pinchart
> From 25776c74d289f8c2e6c89d8838f3110981ce2515 Mon Sep 17 00:00:00 2001
> From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> Date: Fri, 29 Mar 2019 00:04:29 +0530
> Subject: [PATCH v2] gpu:drm: Remove duplicate headers
>
> 1. Remove duplicate headers which are included twice.
> 2. Sort the existing #includes alphabetically
>
> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
For further reference, please see how to use git send-email to reply to
previous versions instead of attaching. Also see 'git log --
drivers/gpu/drm' on the subject prefix; nobody uses "gpu:drm:".
Acked-by: Jani Nikula <jani.nikula@intel.com>
for merging via drm-misc
> ---
> drivers/gpu/drm/bridge/panel.c | 3 +--
> drivers/gpu/drm/i915/intel_display.c | 9 +--------
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 38eeaf8..000ba7c 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -9,13 +9,12 @@
> */
>
> #include <drm/drmP.h>
> -#include <drm/drm_panel.h>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_connector.h>
> #include <drm/drm_encoder.h>
> #include <drm/drm_modeset_helper_vtables.h>
> -#include <drm/drm_probe_helper.h>
> #include <drm/drm_panel.h>
> +#include <drm/drm_probe_helper.h>
>
> struct panel_bridge {
> struct drm_bridge bridge;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ccb6163..7956e89 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -46,20 +46,13 @@
>
> #include "i915_drv.h"
> #include "i915_gem_clflush.h"
> +#include "i915_reset.h"
> #include "i915_trace.h"
> -#include "intel_drv.h"
> -#include "intel_dsi.h"
> -#include "intel_frontbuffer.h"
>
> #include "intel_drv.h"
> #include "intel_dsi.h"
> #include "intel_frontbuffer.h"
>
> -#include "i915_drv.h"
> -#include "i915_gem_clflush.h"
> -#include "i915_reset.h"
> -#include "i915_trace.h"
> -
> /* Primary plane formats for gen <= 3 */
> static const u32 i8xx_primary_formats[] = {
> DRM_FORMAT_C8,
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] gpu:drm: Remove duplicate headers
[not found] ` <20190328141210.GA4813@pendragon.ideasonboard.com>
@ 2019-03-28 19:02 ` Jagadeesh Pagadala
0 siblings, 0 replies; 9+ messages in thread
From: Jagadeesh Pagadala @ 2019-03-28 19:02 UTC (permalink / raw)
To: Laurent Pinchart, a.hajda, airlied, daniel, jani.nikula,
joonas.lahtinen, rodrigo.vivi
Cc: dri-devel, linux-kernel, intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3952 bytes --]
On Thu, Mar 28, 2019 at 04:12:10PM +0200, Laurent Pinchart wrote:
> Hi Jagadeesh,
>
> On Thu, Mar 28, 2019 at 09:32:06PM +0530, Jagadeesh Pagadala wrote:
> > On Thu, Mar 28, 2019 at 08:51:24AM +0200, Laurent Pinchart wrote:
> > > On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux@gmail.com wrote:
> > > > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > > >
> > > > Remove duplicate headers which are included twice.
> > >
> > > Could you, while at it, also sort the existing #include statements
> > > alphabetically ? This should help avoiding similar issues in the future.
> > >
> > > > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > > > ---
> > > > drivers/gpu/drm/bridge/panel.c | 1 -
> > > > drivers/gpu/drm/i915/intel_display.c | 7 -------
> > > > 2 files changed, 8 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> > > > index 38eeaf8..eb9567d 100644
> > > > --- a/drivers/gpu/drm/bridge/panel.c
> > > > +++ b/drivers/gpu/drm/bridge/panel.c
> > > > @@ -15,7 +15,6 @@
> > > > #include <drm/drm_encoder.h>
> > > > #include <drm/drm_modeset_helper_vtables.h>
> > > > #include <drm/drm_probe_helper.h>
> > > > -#include <drm/drm_panel.h>
> > > >
> > > > struct panel_bridge {
> > > > struct drm_bridge bridge;
> > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > > > index ccb6163..1166342 100644
> > > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > > @@ -51,14 +51,7 @@
> > > > #include "intel_dsi.h"
> > > > #include "intel_frontbuffer.h"
> > > >
> > > > -#include "intel_drv.h"
> > > > -#include "intel_dsi.h"
> > > > -#include "intel_frontbuffer.h"
> > > > -
> > > > -#include "i915_drv.h"
> > > > -#include "i915_gem_clflush.h"
> > > > #include "i915_reset.h"
> > > > -#include "i915_trace.h"
> > > >
> > > > /* Primary plane formats for gen <= 3 */
> > > > static const u32 i8xx_primary_formats[] = {
>
> > From c9a68b204fe4bb013c2b8481ca8239c957dd69cc Mon Sep 17 00:00:00 2001
> > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > Date: Thu, 28 Mar 2019 21:20:12 +0530
> > Subject: [PATCH] gpu:drm: sort the existing #includes alphabetically
> >
> > Hi Laurent,
> >
> > Hopefully this helps.
>
> It does, thanks. If you squash it with your original patch and send a
> v2, you can add my
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > ---
> > drivers/gpu/drm/bridge/panel.c | 2 +-
> > drivers/gpu/drm/i915/intel_display.c | 4 ++--
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> > index eb9567d..000ba7c 100644
> > --- a/drivers/gpu/drm/bridge/panel.c
> > +++ b/drivers/gpu/drm/bridge/panel.c
> > @@ -9,11 +9,11 @@
> > */
> >
> > #include <drm/drmP.h>
> > -#include <drm/drm_panel.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_connector.h>
> > #include <drm/drm_encoder.h>
> > #include <drm/drm_modeset_helper_vtables.h>
> > +#include <drm/drm_panel.h>
> > #include <drm/drm_probe_helper.h>
> >
> > struct panel_bridge {
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 1166342..7956e89 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -46,13 +46,13 @@
> >
> > #include "i915_drv.h"
> > #include "i915_gem_clflush.h"
> > +#include "i915_reset.h"
> > #include "i915_trace.h"
> > +
> > #include "intel_drv.h"
> > #include "intel_dsi.h"
> > #include "intel_frontbuffer.h"
> >
> > -#include "i915_reset.h"
> > -
> > /* Primary plane formats for gen <= 3 */
> > static const u32 i8xx_primary_formats[] = {
> > DRM_FORMAT_C8,
>
> --
> Regards,
>
> Laurent Pinchart
[-- Attachment #2: 0001-gpu-drm-Remove-duplicate-headers.patch --]
[-- Type: text/plain, Size: 1864 bytes --]
From 25776c74d289f8c2e6c89d8838f3110981ce2515 Mon Sep 17 00:00:00 2001
From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
Date: Fri, 29 Mar 2019 00:04:29 +0530
Subject: [PATCH v2] gpu:drm: Remove duplicate headers
1. Remove duplicate headers which are included twice.
2. Sort the existing #includes alphabetically
Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/gpu/drm/bridge/panel.c | 3 +--
drivers/gpu/drm/i915/intel_display.c | 9 +--------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 38eeaf8..000ba7c 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -9,13 +9,12 @@
*/
#include <drm/drmP.h>
-#include <drm/drm_panel.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_encoder.h>
#include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_probe_helper.h>
#include <drm/drm_panel.h>
+#include <drm/drm_probe_helper.h>
struct panel_bridge {
struct drm_bridge bridge;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ccb6163..7956e89 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -46,20 +46,13 @@
#include "i915_drv.h"
#include "i915_gem_clflush.h"
+#include "i915_reset.h"
#include "i915_trace.h"
-#include "intel_drv.h"
-#include "intel_dsi.h"
-#include "intel_frontbuffer.h"
#include "intel_drv.h"
#include "intel_dsi.h"
#include "intel_frontbuffer.h"
-#include "i915_drv.h"
-#include "i915_gem_clflush.h"
-#include "i915_reset.h"
-#include "i915_trace.h"
-
/* Primary plane formats for gen <= 3 */
static const u32 i8xx_primary_formats[] = {
DRM_FORMAT_C8,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] gpu:drm: Remove duplicate headers
@ 2019-03-28 19:02 ` Jagadeesh Pagadala
0 siblings, 0 replies; 9+ messages in thread
From: Jagadeesh Pagadala @ 2019-03-28 19:02 UTC (permalink / raw)
To: Laurent Pinchart, a.hajda, airlied, daniel, jani.nikula,
joonas.lahtinen, rodrigo.vivi
Cc: dri-devel, linux-kernel, intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3952 bytes --]
On Thu, Mar 28, 2019 at 04:12:10PM +0200, Laurent Pinchart wrote:
> Hi Jagadeesh,
>
> On Thu, Mar 28, 2019 at 09:32:06PM +0530, Jagadeesh Pagadala wrote:
> > On Thu, Mar 28, 2019 at 08:51:24AM +0200, Laurent Pinchart wrote:
> > > On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux@gmail.com wrote:
> > > > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > > >
> > > > Remove duplicate headers which are included twice.
> > >
> > > Could you, while at it, also sort the existing #include statements
> > > alphabetically ? This should help avoiding similar issues in the future.
> > >
> > > > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > > > ---
> > > > drivers/gpu/drm/bridge/panel.c | 1 -
> > > > drivers/gpu/drm/i915/intel_display.c | 7 -------
> > > > 2 files changed, 8 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> > > > index 38eeaf8..eb9567d 100644
> > > > --- a/drivers/gpu/drm/bridge/panel.c
> > > > +++ b/drivers/gpu/drm/bridge/panel.c
> > > > @@ -15,7 +15,6 @@
> > > > #include <drm/drm_encoder.h>
> > > > #include <drm/drm_modeset_helper_vtables.h>
> > > > #include <drm/drm_probe_helper.h>
> > > > -#include <drm/drm_panel.h>
> > > >
> > > > struct panel_bridge {
> > > > struct drm_bridge bridge;
> > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > > > index ccb6163..1166342 100644
> > > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > > @@ -51,14 +51,7 @@
> > > > #include "intel_dsi.h"
> > > > #include "intel_frontbuffer.h"
> > > >
> > > > -#include "intel_drv.h"
> > > > -#include "intel_dsi.h"
> > > > -#include "intel_frontbuffer.h"
> > > > -
> > > > -#include "i915_drv.h"
> > > > -#include "i915_gem_clflush.h"
> > > > #include "i915_reset.h"
> > > > -#include "i915_trace.h"
> > > >
> > > > /* Primary plane formats for gen <= 3 */
> > > > static const u32 i8xx_primary_formats[] = {
>
> > From c9a68b204fe4bb013c2b8481ca8239c957dd69cc Mon Sep 17 00:00:00 2001
> > From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > Date: Thu, 28 Mar 2019 21:20:12 +0530
> > Subject: [PATCH] gpu:drm: sort the existing #includes alphabetically
> >
> > Hi Laurent,
> >
> > Hopefully this helps.
>
> It does, thanks. If you squash it with your original patch and send a
> v2, you can add my
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> > Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
> > ---
> > drivers/gpu/drm/bridge/panel.c | 2 +-
> > drivers/gpu/drm/i915/intel_display.c | 4 ++--
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> > index eb9567d..000ba7c 100644
> > --- a/drivers/gpu/drm/bridge/panel.c
> > +++ b/drivers/gpu/drm/bridge/panel.c
> > @@ -9,11 +9,11 @@
> > */
> >
> > #include <drm/drmP.h>
> > -#include <drm/drm_panel.h>
> > #include <drm/drm_atomic_helper.h>
> > #include <drm/drm_connector.h>
> > #include <drm/drm_encoder.h>
> > #include <drm/drm_modeset_helper_vtables.h>
> > +#include <drm/drm_panel.h>
> > #include <drm/drm_probe_helper.h>
> >
> > struct panel_bridge {
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 1166342..7956e89 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -46,13 +46,13 @@
> >
> > #include "i915_drv.h"
> > #include "i915_gem_clflush.h"
> > +#include "i915_reset.h"
> > #include "i915_trace.h"
> > +
> > #include "intel_drv.h"
> > #include "intel_dsi.h"
> > #include "intel_frontbuffer.h"
> >
> > -#include "i915_reset.h"
> > -
> > /* Primary plane formats for gen <= 3 */
> > static const u32 i8xx_primary_formats[] = {
> > DRM_FORMAT_C8,
>
> --
> Regards,
>
> Laurent Pinchart
[-- Attachment #2: 0001-gpu-drm-Remove-duplicate-headers.patch --]
[-- Type: text/plain, Size: 1865 bytes --]
>From 25776c74d289f8c2e6c89d8838f3110981ce2515 Mon Sep 17 00:00:00 2001
From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
Date: Fri, 29 Mar 2019 00:04:29 +0530
Subject: [PATCH v2] gpu:drm: Remove duplicate headers
1. Remove duplicate headers which are included twice.
2. Sort the existing #includes alphabetically
Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/gpu/drm/bridge/panel.c | 3 +--
drivers/gpu/drm/i915/intel_display.c | 9 +--------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 38eeaf8..000ba7c 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -9,13 +9,12 @@
*/
#include <drm/drmP.h>
-#include <drm/drm_panel.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_encoder.h>
#include <drm/drm_modeset_helper_vtables.h>
-#include <drm/drm_probe_helper.h>
#include <drm/drm_panel.h>
+#include <drm/drm_probe_helper.h>
struct panel_bridge {
struct drm_bridge bridge;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ccb6163..7956e89 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -46,20 +46,13 @@
#include "i915_drv.h"
#include "i915_gem_clflush.h"
+#include "i915_reset.h"
#include "i915_trace.h"
-#include "intel_drv.h"
-#include "intel_dsi.h"
-#include "intel_frontbuffer.h"
#include "intel_drv.h"
#include "intel_dsi.h"
#include "intel_frontbuffer.h"
-#include "i915_drv.h"
-#include "i915_gem_clflush.h"
-#include "i915_reset.h"
-#include "i915_trace.h"
-
/* Primary plane formats for gen <= 3 */
static const u32 i8xx_primary_formats[] = {
DRM_FORMAT_C8,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] gpu:drm: Remove duplicate headers
2019-03-28 19:02 ` Jagadeesh Pagadala
(?)
(?)
@ 2019-03-29 6:32 ` Mukesh Ojha
-1 siblings, 0 replies; 9+ messages in thread
From: Mukesh Ojha @ 2019-03-29 6:32 UTC (permalink / raw)
To: Jagadeesh Pagadala, Laurent Pinchart, a.hajda, airlied, daniel,
jani.nikula, joonas.lahtinen, rodrigo.vivi
Cc: dri-devel, linux-kernel, intel-gfx
On 3/29/2019 12:32 AM, Jagadeesh Pagadala wrote:
> On Thu, Mar 28, 2019 at 04:12:10PM +0200, Laurent Pinchart wrote:
>> Hi Jagadeesh,
>>
>> On Thu, Mar 28, 2019 at 09:32:06PM +0530, Jagadeesh Pagadala wrote:
>>> On Thu, Mar 28, 2019 at 08:51:24AM +0200, Laurent Pinchart wrote:
>>>> On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux@gmail.com wrote:
>>>>> From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>>>>>
>>>>> Remove duplicate headers which are included twice.
>>>> Could you, while at it, also sort the existing #include statements
>>>> alphabetically ? This should help avoiding similar issues in the future.
>>>>
>>>>> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
-Mukesh
>>>>> ---
>>>>> drivers/gpu/drm/bridge/panel.c | 1 -
>>>>> drivers/gpu/drm/i915/intel_display.c | 7 -------
>>>>> 2 files changed, 8 deletions(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
>>>>> index 38eeaf8..eb9567d 100644
>>>>> --- a/drivers/gpu/drm/bridge/panel.c
>>>>> +++ b/drivers/gpu/drm/bridge/panel.c
>>>>> @@ -15,7 +15,6 @@
>>>>> #include <drm/drm_encoder.h>
>>>>> #include <drm/drm_modeset_helper_vtables.h>
>>>>> #include <drm/drm_probe_helper.h>
>>>>> -#include <drm/drm_panel.h>
>>>>>
>>>>> struct panel_bridge {
>>>>> struct drm_bridge bridge;
>>>>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>>>>> index ccb6163..1166342 100644
>>>>> --- a/drivers/gpu/drm/i915/intel_display.c
>>>>> +++ b/drivers/gpu/drm/i915/intel_display.c
>>>>> @@ -51,14 +51,7 @@
>>>>> #include "intel_dsi.h"
>>>>> #include "intel_frontbuffer.h"
>>>>>
>>>>> -#include "intel_drv.h"
>>>>> -#include "intel_dsi.h"
>>>>> -#include "intel_frontbuffer.h"
>>>>> -
>>>>> -#include "i915_drv.h"
>>>>> -#include "i915_gem_clflush.h"
>>>>> #include "i915_reset.h"
>>>>> -#include "i915_trace.h"
>>>>>
>>>>> /* Primary plane formats for gen <= 3 */
>>>>> static const u32 i8xx_primary_formats[] = {
>>> From c9a68b204fe4bb013c2b8481ca8239c957dd69cc Mon Sep 17 00:00:00 2001
>>> From: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>>> Date: Thu, 28 Mar 2019 21:20:12 +0530
>>> Subject: [PATCH] gpu:drm: sort the existing #includes alphabetically
>>>
>>> Hi Laurent,
>>>
>>> Hopefully this helps.
>> It does, thanks. If you squash it with your original patch and send a
>> v2, you can add my
>>
>> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>>
>>> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux@gmail.com>
>>> ---
>>> drivers/gpu/drm/bridge/panel.c | 2 +-
>>> drivers/gpu/drm/i915/intel_display.c | 4 ++--
>>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
>>> index eb9567d..000ba7c 100644
>>> --- a/drivers/gpu/drm/bridge/panel.c
>>> +++ b/drivers/gpu/drm/bridge/panel.c
>>> @@ -9,11 +9,11 @@
>>> */
>>>
>>> #include <drm/drmP.h>
>>> -#include <drm/drm_panel.h>
>>> #include <drm/drm_atomic_helper.h>
>>> #include <drm/drm_connector.h>
>>> #include <drm/drm_encoder.h>
>>> #include <drm/drm_modeset_helper_vtables.h>
>>> +#include <drm/drm_panel.h>
>>> #include <drm/drm_probe_helper.h>
>>>
>>> struct panel_bridge {
>>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>>> index 1166342..7956e89 100644
>>> --- a/drivers/gpu/drm/i915/intel_display.c
>>> +++ b/drivers/gpu/drm/i915/intel_display.c
>>> @@ -46,13 +46,13 @@
>>>
>>> #include "i915_drv.h"
>>> #include "i915_gem_clflush.h"
>>> +#include "i915_reset.h"
>>> #include "i915_trace.h"
>>> +
>>> #include "intel_drv.h"
>>> #include "intel_dsi.h"
>>> #include "intel_frontbuffer.h"
>>>
>>> -#include "i915_reset.h"
>>> -
>>> /* Primary plane formats for gen <= 3 */
>>> static const u32 i8xx_primary_formats[] = {
>>> DRM_FORMAT_C8,
>> --
>> Regards,
>>
>> Laurent Pinchart
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for gpu:drm: Remove duplicate headers (rev2)
2019-03-27 21:11 [PATCH] gpu:drm: Remove duplicate headers jagdsh.linux
2019-03-28 6:41 ` Mukesh Ojha
2019-03-28 6:51 ` Laurent Pinchart
@ 2019-04-02 12:19 ` Patchwork
2019-04-02 12:54 ` ✓ Fi.CI.BAT: success " Patchwork
3 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2019-04-02 12:19 UTC (permalink / raw)
To: Jagadeesh Pagadala; +Cc: intel-gfx
== Series Details ==
Series: gpu:drm: Remove duplicate headers (rev2)
URL : https://patchwork.freedesktop.org/series/58844/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
d36613f503ec gpu:drm: Remove duplicate headers
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#11:
> > > On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux@gmail.com wrote:
-:57: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit fatal: bad o ("1ca8239c957dd69cc")'
#57:
> > From c9a68b204fe4bb013c2b8481ca8239c957dd69cc Mon Sep 17 00:00:00 2001
-:119: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit fatal: bad o ("838f3110981ce2515")'
#119:
>From 25776c74d289f8c2e6c89d8838f3110981ce2515 Mon Sep 17 00:00:00 2001
total: 2 errors, 1 warnings, 0 checks, 35 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for gpu:drm: Remove duplicate headers (rev2)
2019-03-27 21:11 [PATCH] gpu:drm: Remove duplicate headers jagdsh.linux
` (2 preceding siblings ...)
2019-04-02 12:19 ` ✗ Fi.CI.CHECKPATCH: warning for gpu:drm: Remove duplicate headers (rev2) Patchwork
@ 2019-04-02 12:54 ` Patchwork
3 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2019-04-02 12:54 UTC (permalink / raw)
To: Jagadeesh Pagadala; +Cc: intel-gfx
== Series Details ==
Series: gpu:drm: Remove duplicate headers (rev2)
URL : https://patchwork.freedesktop.org/series/58844/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5854 -> Patchwork_12652
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58844/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12652 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parallel@basic:
- fi-byt-j1900: PASS -> INCOMPLETE [fdo#102657]
* igt@gem_exec_suspend@basic-s3:
- fi-icl-y: PASS -> FAIL [fdo#103375]
* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-bsw-n3050: PASS -> FAIL [fdo#100368]
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
#### Possible fixes ####
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: DMESG-FAIL [fdo#110235 ] -> PASS
- fi-skl-gvtdvm: DMESG-FAIL [fdo#110235 ] -> PASS
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS
* igt@i915_selftest@live_uncore:
- fi-ivb-3770: DMESG-FAIL [fdo#110210] -> PASS
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: FAIL [fdo#103167] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#102657]: https://bugs.freedesktop.org/show_bug.cgi?id=102657
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
[fdo#110210]: https://bugs.freedesktop.org/show_bug.cgi?id=110210
[fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
Participating hosts (51 -> 42)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-ctg-p8600 fi-pnv-d510 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5854 -> Patchwork_12652
CI_DRM_5854: 3b59d4fb5ba3fb53a87c7a4495d81b0a25aa96eb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4919: f539e21e934019f0196fee646f351b4e30a8c341 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12652: d36613f503ecfdc0b107c9ae9589d4a12d0e4b35 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d36613f503ec gpu:drm: Remove duplicate headers
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12652/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-04-02 12:54 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-27 21:11 [PATCH] gpu:drm: Remove duplicate headers jagdsh.linux
2019-03-28 6:41 ` Mukesh Ojha
2019-03-28 6:51 ` Laurent Pinchart
[not found] ` <20190328160206.GA94653@CentOS76.localdomain>
[not found] ` <20190328141210.GA4813@pendragon.ideasonboard.com>
2019-03-28 19:02 ` [PATCH v2] " Jagadeesh Pagadala
2019-03-28 19:02 ` Jagadeesh Pagadala
2019-03-28 17:48 ` Jani Nikula
2019-03-29 6:32 ` Mukesh Ojha
2019-04-02 12:19 ` ✗ Fi.CI.CHECKPATCH: warning for gpu:drm: Remove duplicate headers (rev2) Patchwork
2019-04-02 12:54 ` ✓ Fi.CI.BAT: success " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.