Commit 2ea2269e authored by Sam Ravnborg's avatar Sam Ravnborg

drm/xen: drop use of drmP.h

The drmP.h header is deprecated.  Drop all uses.
Added includes/forwards to the header files and
then fixed fallout in the .c files.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Cc: xen-devel@lists.xenproject.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190630061922.7254-3-sam@ravnborg.org
parent c3bbb48e
...@@ -8,13 +8,18 @@ ...@@ -8,13 +8,18 @@
* Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> * Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
*/ */
#include <drm/drmP.h> #include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_drv.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_file.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <linux/of_device.h>
#include <xen/platform_pci.h> #include <xen/platform_pci.h>
#include <xen/xen.h> #include <xen/xen.h>
#include <xen/xenbus.h> #include <xen/xenbus.h>
......
...@@ -11,13 +11,18 @@ ...@@ -11,13 +11,18 @@
#ifndef __XEN_DRM_FRONT_H_ #ifndef __XEN_DRM_FRONT_H_
#define __XEN_DRM_FRONT_H_ #define __XEN_DRM_FRONT_H_
#include <drm/drmP.h>
#include <drm/drm_simple_kms_helper.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <drm/drm_connector.h>
#include <drm/drm_simple_kms_helper.h>
#include "xen_drm_front_cfg.h" #include "xen_drm_front_cfg.h"
struct drm_device;
struct drm_framebuffer;
struct drm_gem_object;
struct drm_pending_vblank_event;
/** /**
* DOC: Driver modes of operation in terms of display buffers used * DOC: Driver modes of operation in terms of display buffers used
* *
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> * Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
*/ */
#include <drm/drmP.h>
#include <linux/device.h> #include <linux/device.h>
#include <drm/drm_print.h>
#include <xen/interface/io/displif.h> #include <xen/interface/io/displif.h>
#include <xen/xenbus.h> #include <xen/xenbus.h>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_drv.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <video/videomode.h> #include <video/videomode.h>
......
...@@ -11,11 +11,10 @@ ...@@ -11,11 +11,10 @@
#ifndef __XEN_DRM_FRONT_CONN_H_ #ifndef __XEN_DRM_FRONT_CONN_H_
#define __XEN_DRM_FRONT_CONN_H_ #define __XEN_DRM_FRONT_CONN_H_
#include <drm/drmP.h> #include <linux/types.h>
#include <drm/drm_crtc.h>
#include <drm/drm_encoder.h>
#include <linux/wait.h> struct drm_connector;
struct xen_drm_front_drm_info;
struct xen_drm_front_drm_info; struct xen_drm_front_drm_info;
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
* Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> * Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
*/ */
#include <drm/drmP.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <drm/drm_print.h>
#include <xen/xenbus.h> #include <xen/xenbus.h>
#include <xen/events.h> #include <xen/events.h>
#include <xen/grant_table.h> #include <xen/grant_table.h>
......
...@@ -8,20 +8,19 @@ ...@@ -8,20 +8,19 @@
* Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> * Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
*/ */
#include "xen_drm_front_gem.h" #include <linux/dma-buf.h>
#include <linux/scatterlist.h>
#include <linux/shmem_fs.h>
#include <drm/drmP.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_prime.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <linux/dma-buf.h>
#include <linux/scatterlist.h>
#include <linux/shmem_fs.h>
#include <xen/balloon.h> #include <xen/balloon.h>
#include "xen_drm_front.h" #include "xen_drm_front.h"
#include "xen_drm_front_gem.h"
struct xen_gem_object { struct xen_gem_object {
struct drm_gem_object base; struct drm_gem_object base;
......
...@@ -11,7 +11,12 @@ ...@@ -11,7 +11,12 @@
#ifndef __XEN_DRM_FRONT_GEM_H #ifndef __XEN_DRM_FRONT_GEM_H
#define __XEN_DRM_FRONT_GEM_H #define __XEN_DRM_FRONT_GEM_H
#include <drm/drmP.h> struct dma_buf_attachment;
struct drm_device;
struct drm_gem_object;
struct file;
struct sg_table;
struct vm_area_struct;
struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev, struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev,
size_t size); size_t size);
......
...@@ -8,17 +8,18 @@ ...@@ -8,17 +8,18 @@
* Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> * Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
*/ */
#include "xen_drm_front_kms.h"
#include <drm/drmP.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_drv.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h>
#include "xen_drm_front.h" #include "xen_drm_front.h"
#include "xen_drm_front_conn.h" #include "xen_drm_front_conn.h"
#include "xen_drm_front_kms.h"
/* /*
* Timeout in ms to wait for frame done event from the backend: * Timeout in ms to wait for frame done event from the backend:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment