Commit 9f397801 authored by Sam Ravnborg's avatar Sam Ravnborg

drm/mgag200: drop use of drmP.h

Drop use of the deprecated drmP.h header file.
Replace with necessary include files to fix build.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20190623103542.30697-5-sam@ravnborg.org
parent 36999fd0
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
* Author: Christopher Harvey <charvey@matrox.com> * Author: Christopher Harvey <charvey@matrox.com>
*/ */
#include <drm/drmP.h> #include <drm/drm_pci.h>
#include "mgag200_drv.h" #include "mgag200_drv.h"
static bool warn_transparent = true; static bool warn_transparent = true;
......
...@@ -5,14 +5,18 @@ ...@@ -5,14 +5,18 @@
* Authors: Matthew Garrett * Authors: Matthew Garrett
* Dave Airlie * Dave Airlie
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/console.h> #include <linux/console.h>
#include <drm/drmP.h>
#include "mgag200_drv.h"
#include <drm/drm_drv.h>
#include <drm/drm_file.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_pci.h>
#include <drm/drm_pciids.h> #include <drm/drm_pciids.h>
#include "mgag200_drv.h"
/* /*
* This is the generic driver code. This binds the driver to the drm core, * This is the generic driver code. This binds the driver to the drm core,
* which then performs further device association and calls our graphics init * which then performs further device association and calls our graphics init
......
...@@ -10,19 +10,17 @@ ...@@ -10,19 +10,17 @@
#ifndef __MGAG200_DRV_H__ #ifndef __MGAG200_DRV_H__
#define __MGAG200_DRV_H__ #define __MGAG200_DRV_H__
#include <linux/i2c-algo-bit.h>
#include <linux/i2c.h>
#include <video/vga.h> #include <video/vga.h>
#include <drm/drm_encoder.h> #include <drm/drm_encoder.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_gem_vram_helper.h> #include <drm/drm_gem_vram_helper.h>
#include <drm/drm_vram_mm_helper.h> #include <drm/drm_vram_mm_helper.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include "mgag200_reg.h" #include "mgag200_reg.h"
#define DRIVER_AUTHOR "Matthew Garrett" #define DRIVER_AUTHOR "Matthew Garrett"
......
...@@ -7,12 +7,15 @@ ...@@ -7,12 +7,15 @@
* Matt Turner * Matt Turner
* Dave Airlie * Dave Airlie
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <drm/drmP.h> #include <linux/vmalloc.h>
#include <drm/drm_util.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_util.h>
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
...@@ -25,10 +25,12 @@ ...@@ -25,10 +25,12 @@
/* /*
* Authors: Dave Airlie <airlied@redhat.com> * Authors: Dave Airlie <airlied@redhat.com>
*/ */
#include <linux/export.h> #include <linux/export.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <drm/drmP.h> #include <linux/i2c.h>
#include <drm/drm_pci.h>
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
* Matt Turner * Matt Turner
* Dave Airlie * Dave Airlie
*/ */
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_pci.h>
#include "mgag200_drv.h" #include "mgag200_drv.h"
static const struct drm_mode_config_funcs mga_mode_funcs = { static const struct drm_mode_config_funcs mga_mode_funcs = {
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_pci.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
/* /*
* Authors: Dave Airlie <airlied@redhat.com> * Authors: Dave Airlie <airlied@redhat.com>
*/ */
#include <drm/drmP.h>
#include <drm/drm_pci.h>
#include "mgag200_drv.h" #include "mgag200_drv.h"
......
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