Re: [Intel-gfx] [PATCH v6 1/5] staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h
On Fri, Feb 01, 2019 at 06:37:49PM +0100, Daniel Vetter wrote: > 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 > > Cc: Greg Kroah-Hartman > > Cc: Hans de Goede > > Cc: Daniel Vetter > > Hi Greg, > > Ack for merging this through drm-misc? I think we've defacto-maintained > vboxvideo in drm anyway this release ... Sorry, feel free to just always take this type of stuff without my ack, I can merge around you if I ever have any problems. Acked-by: Greg Kroah-Hartman ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v6 1/5] staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h
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 > Cc: Greg Kroah-Hartman > Cc: Hans de Goede > Cc: Daniel Vetter 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* Hans de Goede > */ > -#include > #include > +#include > +#include > #include > > #include > +#include > +#include > +#include > > #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 > * Michael Thayer*/ > -#include > -#include > -#include > -#include > -#include > -#include > -#include > #include > +#include > #include > #include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > > #include > -#include > #include > +#include > +#include > > #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 > */ > #include > + > #include > #include > +#include > #include > #include > +#include > > +#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 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH v6 1/5] staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h
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 Cc: Greg Kroah-Hartman Cc: Hans de Goede Cc: Daniel Vetter --- 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 */ -#include #include +#include +#include #include #include +#include +#include +#include #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 * Michael Thayer -#include -#include -#include -#include -#include -#include #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include -#include #include +#include +#include #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 */ #include + #include #include +#include #include #include +#include +#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 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
