On Thu, Jan 24, 2019 at 03:03:20PM +0100, Daniel Vetter wrote: > On Sat, Jan 19, 2019 at 09:40:14AM +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 failure fixes in drm files after the drmP.h removal. > > > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > > Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> > > Cc: Sean Paul <sean@xxxxxxxxxx> > > Cc: David Airlie <airlied@xxxxxxxx> > > Cc: Daniel Vetter <daniel@xxxxxxxx> > > Merge the previous 5 patches from this series, but this now goes boom on > vbox in staging. Needs another prep patch I think. Soo, can we drop vboxvideo yet? Sean > -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 e16aa5ae00b4..ee67c96841fa 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 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
