linux-kernel - Re: [PATCH v6 1/5] staging/vboxvideo: prepare for drmP.h removal from drm_modeset

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190201173749.GF3271@phenom.ffwll.local>
Date:   Fri, 1 Feb 2019 18:37:49 +0100
From:   Daniel Vetter <daniel@...ll.ch>
To:     Sam Ravnborg <sam@...nborg.org>
Cc:     dri-devel@...ts.freedesktop.org,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Daniel Vetter <daniel@...ll.ch>,
        David Airlie <airlied@...ux.ie>,
        Hans de Goede <hdegoede@...hat.com>,
        Jani Nikula <jani.nikula@...ux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>,
        Kieran Bingham <kieran.bingham+renesas@...asonboard.com>,
        Laurent Pinchart <laurent.pinchart@...asonboard.com>,
        Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
        Maxime Ripard <maxime.ripard@...tlin.com>,
        Rodrigo Vivi <rodrigo.vivi@...el.com>,
        Sean Paul <sean@...rly.run>, intel-gfx@...ts.freedesktop.org,
        linux-renesas-soc@...r.kernel.org, linux-kernel@...r.kernel.org,
        Daniel Vetter <daniel.vetter@...ll.ch>
Subject: Re: [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 <sam@...nborg.org>
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Cc: Hans de Goede <hdegoede@...hat.com>
> Cc: Daniel Vetter <daniel.vetter@...ll.ch>

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@...cle.com,
>   *          Hans de Goede <hdegoede@...hat.com>
>   */
> -#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@...hat.com>
>   *          Michael Thayer <michael.thayer@...cle.com,
>   */
> -#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@...hat.com>
>   */
>  #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