| Message ID | 20190112193251.20450-9-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: minimize drmP.h dependencies | expand |
On Sat, Jan 12, 2019 at 08:32:51PM +0100, Sam Ravnborg wrote: > With the removal of drmP.h from drm_modeset_helper.h > the drmP.h are no longer included by any include files > in include/drm. > The drmP.h file is thus only included explicit > either in .c files or in local .h files. > This makes the process of deleting the drmP.h includes easier > as we have a more local dependency chain. > > Include build failures fixes in drm files after the drmP.h removal. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <maxime.ripard@bootlin.com> > Cc: Sean Paul <sean@poorly.run> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> Note that as soon as drm-intel-next lands in drm-misc-next this won't be enough. I have a patch which I think toghether with yours here should take care of things though. I merged the first 2 patches, I'll wait with the driver ones for a few more acks first. Thanks for respinning. -Daniel > --- > drivers/gpu/drm/drm_damage_helper.c | 1 + > drivers/gpu/drm/drm_modeset_helper.c | 2 ++ > include/drm/drm_modeset_helper.h | 6 +++++- > 3 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c > index 31032407254d..b575a768f51c 100644 > --- a/drivers/gpu/drm/drm_damage_helper.c > +++ b/drivers/gpu/drm/drm_damage_helper.c > @@ -32,6 +32,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_damage_helper.h> > +#include <drm/drm_device.h> > > /** > * DOC: overview > diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c > index 9150fa385bba..9bc1ef788c77 100644 > --- a/drivers/gpu/drm/drm_modeset_helper.c > +++ b/drivers/gpu/drm/drm_modeset_helper.c > @@ -23,8 +23,10 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_fb_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_modeset_helper.h> > #include <drm/drm_plane_helper.h> > +#include <drm/drm_print.h> > > /** > * DOC: aux kms helpers > diff --git a/include/drm/drm_modeset_helper.h b/include/drm/drm_modeset_helper.h > index efa337f03129..995fd981cab0 100644 > --- a/include/drm/drm_modeset_helper.h > +++ b/include/drm/drm_modeset_helper.h > @@ -23,7 +23,11 @@ > #ifndef __DRM_KMS_HELPER_H__ > #define __DRM_KMS_HELPER_H__ > > -#include <drm/drmP.h> > +struct drm_crtc; > +struct drm_crtc_funcs; > +struct drm_device; > +struct drm_framebuffer; > +struct drm_mode_fb_cmd2; > > void drm_helper_move_panel_connectors_to_head(struct drm_device *); > > -- > 2.12.0 >
Hi Sam, Thank you for the patch. On Sat, Jan 12, 2019 at 08:32:51PM +0100, Sam Ravnborg wrote: > With the removal of drmP.h from drm_modeset_helper.h > the drmP.h are no longer included by any include files > in include/drm. > The drmP.h file is thus only included explicit > either in .c files or in local .h files. > This makes the process of deleting the drmP.h includes easier > as we have a more local dependency chain. > > Include build failures fixes in drm files after the drmP.h removal. Great work! Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <maxime.ripard@bootlin.com> > Cc: Sean Paul <sean@poorly.run> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > --- > drivers/gpu/drm/drm_damage_helper.c | 1 + > drivers/gpu/drm/drm_modeset_helper.c | 2 ++ > include/drm/drm_modeset_helper.h | 6 +++++- > 3 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c > index 31032407254d..b575a768f51c 100644 > --- a/drivers/gpu/drm/drm_damage_helper.c > +++ b/drivers/gpu/drm/drm_damage_helper.c > @@ -32,6 +32,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_damage_helper.h> > +#include <drm/drm_device.h> > > /** > * DOC: overview > diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c > index 9150fa385bba..9bc1ef788c77 100644 > --- a/drivers/gpu/drm/drm_modeset_helper.c > +++ b/drivers/gpu/drm/drm_modeset_helper.c > @@ -23,8 +23,10 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_fb_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_modeset_helper.h> > #include <drm/drm_plane_helper.h> > +#include <drm/drm_print.h> > > /** > * DOC: aux kms helpers > diff --git a/include/drm/drm_modeset_helper.h b/include/drm/drm_modeset_helper.h > index efa337f03129..995fd981cab0 100644 > --- a/include/drm/drm_modeset_helper.h > +++ b/include/drm/drm_modeset_helper.h > @@ -23,7 +23,11 @@ > #ifndef __DRM_KMS_HELPER_H__ > #define __DRM_KMS_HELPER_H__ > > -#include <drm/drmP.h> > +struct drm_crtc; > +struct drm_crtc_funcs; > +struct drm_device; > +struct drm_framebuffer; > +struct drm_mode_fb_cmd2; > > void drm_helper_move_panel_connectors_to_head(struct drm_device *); >
diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index 31032407254d..b575a768f51c 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -32,6 +32,7 @@ #include <drm/drm_atomic.h> #include <drm/drm_damage_helper.h> +#include <drm/drm_device.h> /** * DOC: overview diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c index 9150fa385bba..9bc1ef788c77 100644 --- a/drivers/gpu/drm/drm_modeset_helper.c +++ b/drivers/gpu/drm/drm_modeset_helper.c @@ -23,8 +23,10 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_plane_helper.h> +#include <drm/drm_print.h> /** * DOC: aux kms helpers diff --git a/include/drm/drm_modeset_helper.h b/include/drm/drm_modeset_helper.h index efa337f03129..995fd981cab0 100644 --- a/include/drm/drm_modeset_helper.h +++ b/include/drm/drm_modeset_helper.h @@ -23,7 +23,11 @@ #ifndef __DRM_KMS_HELPER_H__ #define __DRM_KMS_HELPER_H__ -#include <drm/drmP.h> +struct drm_crtc; +struct drm_crtc_funcs; +struct drm_device; +struct drm_framebuffer; +struct drm_mode_fb_cmd2; void drm_helper_move_panel_connectors_to_head(struct drm_device *);
With the removal of drmP.h from drm_modeset_helper.h the drmP.h are no longer included by any include files in include/drm. The drmP.h file is thus only included explicit either in .c files or in local .h files. This makes the process of deleting the drmP.h includes easier as we have a more local dependency chain. Include build failures fixes in drm files after the drmP.h removal. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: Sean Paul <sean@poorly.run> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> --- drivers/gpu/drm/drm_damage_helper.c | 1 + drivers/gpu/drm/drm_modeset_helper.c | 2 ++ include/drm/drm_modeset_helper.h | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-)