On Sat, Jan 26, 2019 at 01:25:23PM +0100, Sam Ravnborg wrote: > The use of drmP.h is discouraged and removal of it from > drm_modeset_helper.h caused vboxvideo to fail to build. > > This patch introduce the necessary fixes to prepare for the > drmP.h removal from drm_modeset_helper.h. > > In the files touched sort the include files > > Build tested on x86 and arm allmodconfig / allyesconfig. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Hans de Goede <hdegoede@xxxxxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> Hi Greg, Ack for merging this through drm-misc? I think we've defacto-maintained vboxvideo in drm anyway this release ... -Daniel > --- > drivers/staging/vboxvideo/vbox_drv.c | 6 +++++- > drivers/staging/vboxvideo/vbox_fb.c | 18 ++++++++++-------- > drivers/staging/vboxvideo/vbox_mode.c | 5 ++++- > 3 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c > index cc6532d8c2fa..d1b0d7b4886a 100644 > --- a/drivers/staging/vboxvideo/vbox_drv.c > +++ b/drivers/staging/vboxvideo/vbox_drv.c > @@ -7,11 +7,15 @@ > * Michael Thayer <michael.thayer@xxxxxxxxxx, > * Hans de Goede <hdegoede@xxxxxxxxxx> > */ > -#include <linux/module.h> > #include <linux/console.h> > +#include <linux/module.h> > +#include <linux/pci.h> > #include <linux/vt_kern.h> > > #include <drm/drm_crtc_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_file.h> > +#include <drm/drm_ioctl.h> > > #include "vbox_drv.h" > > diff --git a/drivers/staging/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c > index 397496cf0bdf..83a04afd1766 100644 > --- a/drivers/staging/vboxvideo/vbox_fb.c > +++ b/drivers/staging/vboxvideo/vbox_fb.c > @@ -6,20 +6,22 @@ > * Authors: Dave Airlie <airlied@xxxxxxxxxx> > * Michael Thayer <michael.thayer@xxxxxxxxxx, > */ > -#include <linux/module.h> > -#include <linux/kernel.h> > -#include <linux/errno.h> > -#include <linux/string.h> > -#include <linux/mm.h> > -#include <linux/tty.h> > -#include <linux/sysrq.h> > #include <linux/delay.h> > +#include <linux/errno.h> > #include <linux/fb.h> > #include <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/mm.h> > +#include <linux/module.h> > +#include <linux/pci.h> > +#include <linux/string.h> > +#include <linux/sysrq.h> > +#include <linux/tty.h> > > #include <drm/drm_crtc.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_crtc_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_fourcc.h> > > #include "vbox_drv.h" > #include "vboxvideo.h" > diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c > index 1aaff02c07ff..213551394495 100644 > --- a/drivers/staging/vboxvideo/vbox_mode.c > +++ b/drivers/staging/vboxvideo/vbox_mode.c > @@ -10,14 +10,17 @@ > * Hans de Goede <hdegoede@xxxxxxxxxx> > */ > #include <linux/export.h> > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_plane_helper.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > > +#include "hgsmi_channels.h" > #include "vbox_drv.h" > #include "vboxvideo.h" > -#include "hgsmi_channels.h" > > /* > * Set a graphics mode. Poke any required values into registers, do an HGSMI > -- > 2.12.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
