diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2019-06-23 12:35:42 +0200 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2019-06-30 09:58:08 +0200 |
commit | 9f397801110476da9d450886d48b666ee22b39b0 (patch) | |
tree | e39a3fd26b1d07384ec72462c5e7f8881141c8ec | |
parent | 36999fd02d92e21142471867973d0e3786370724 (diff) | |
download | linux-9f397801110476da9d450886d48b666ee22b39b0.tar.bz2 |
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: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas 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
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.h | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_fb.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_i2c.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_main.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_mode.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 |
8 files changed, 29 insertions, 17 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c index 117eaedec7aa..13f32df7e357 100644 --- a/drivers/gpu/drm/mgag200/mgag200_cursor.c +++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c @@ -5,7 +5,8 @@ * Author: Christopher Harvey <charvey@matrox.com> */ -#include <drm/drmP.h> +#include <drm/drm_pci.h> + #include "mgag200_drv.h" static bool warn_transparent = true; diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index aafa1cb31f50..afd9119b6cf1 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -5,14 +5,18 @@ * Authors: Matthew Garrett * Dave Airlie */ + #include <linux/module.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 "mgag200_drv.h" + /* * 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 diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index 36862824b567..3ab27f1053c1 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -10,19 +10,17 @@ #ifndef __MGAG200_DRV_H__ #define __MGAG200_DRV_H__ +#include <linux/i2c-algo-bit.h> +#include <linux/i2c.h> + #include <video/vga.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> - #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> - #include <drm/drm_vram_mm_helper.h> -#include <linux/i2c.h> -#include <linux/i2c-algo-bit.h> - #include "mgag200_reg.h" #define DRIVER_AUTHOR "Matthew Garrett" diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index e02d5479ea46..c77cf1b34c98 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c @@ -7,12 +7,15 @@ * Matt Turner * Dave Airlie */ + #include <linux/module.h> -#include <drm/drmP.h> -#include <drm/drm_util.h> +#include <linux/vmalloc.h> + +#include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_crtc_helper.h> +#include <drm/drm_util.h> #include "mgag200_drv.h" diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c index 77d1c4771786..51d4037f00d4 100644 --- a/drivers/gpu/drm/mgag200/mgag200_i2c.c +++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c @@ -25,10 +25,12 @@ /* * Authors: Dave Airlie <airlied@redhat.com> */ + #include <linux/export.h> -#include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#include <drm/drmP.h> +#include <linux/i2c.h> + +#include <drm/drm_pci.h> #include "mgag200_drv.h" diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c index 4936fb8b68ed..b10f7265b5c4 100644 --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c @@ -7,9 +7,11 @@ * Matt Turner * Dave Airlie */ -#include <drm/drmP.h> + #include <drm/drm_crtc_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_pci.h> + #include "mgag200_drv.h" static const struct drm_mode_config_funcs mga_mode_funcs = { diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 5e382bf7fc1e..a7cef78d426f 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -10,8 +10,9 @@ #include <linux/delay.h> -#include <drm/drmP.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_probe_helper.h> diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index 59294c0fd24a..73a6b848601c 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c @@ -25,7 +25,8 @@ /* * Authors: Dave Airlie <airlied@redhat.com> */ -#include <drm/drmP.h> + +#include <drm/drm_pci.h> #include "mgag200_drv.h" |