Skip to content

Commit

Permalink
drm/mgag200: drop use of drmP.h
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Sam Ravnborg committed Jun 30, 2019
1 parent 36999fd commit 9f39780
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 17 deletions.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/mgag200/mgag200_cursor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 7 additions & 3 deletions drivers/gpu/drm/mgag200/mgag200_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions drivers/gpu/drm/mgag200/mgag200_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions drivers/gpu/drm/mgag200/mgag200_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/mgag200/mgag200_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion drivers/gpu/drm/mgag200/mgag200_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/mgag200/mgag200_mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/mgag200/mgag200_ttm.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
/*
* Authors: Dave Airlie <airlied@redhat.com>
*/
#include <drm/drmP.h>

#include <drm/drm_pci.h>

#include "mgag200_drv.h"

Expand Down

0 comments on commit 9f39780

Please sign in to comment.