diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2019-06-30 08:19:20 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2019-07-15 18:11:31 +0200 |
| commit | 016f363ee11ce804ef6106fd737af63cb61fff3e (patch) | |
| tree | 9b770389ef9cd32364f5fbedd96109fdffdc3e90 /drivers/gpu | |
| parent | drm: add missing include to drm_vram_mm_helper.h (diff) | |
| download | linux-dev-016f363ee11ce804ef6106fd737af63cb61fff3e.tar.xz linux-dev-016f363ee11ce804ef6106fd737af63cb61fff3e.zip | |
drm/bochs: drop use of drmP.h
Drop use of the deprecated drmP.h header file.
Made bochs.h self-contained and then fixed
fallout in remaining files.
Several unused includes was dropped in the process.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: virtualization@lists.linux-foundation.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190630061922.7254-32-sam@ravnborg.org
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs.h | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_drv.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_hw.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_kms.c | 8 |
4 files changed, 14 insertions, 11 deletions
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h index cc35d492142c..498e96fb61b6 100644 --- a/drivers/gpu/drm/bochs/bochs.h +++ b/drivers/gpu/drm/bochs/bochs.h @@ -1,17 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0 */ + #include <linux/io.h> #include <linux/console.h> -#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_simple_kms_helper.h> - #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> - +#include <drm/drm_simple_kms_helper.h> #include <drm/drm_vram_mm_helper.h> /* ---------------------------------------------------------------------- */ diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index f48b212a2535..46d8312ec00d 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -2,11 +2,10 @@ /* */ -#include <linux/mm.h> #include <linux/module.h> -#include <linux/slab.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_probe_helper.h> +#include <linux/pci.h> + +#include <drm/drm_drv.h> #include <drm/drm_atomic_helper.h> #include "bochs.h" diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c index 791ab2f79947..29217e696549 100644 --- a/drivers/gpu/drm/bochs/bochs_hw.c +++ b/drivers/gpu/drm/bochs/bochs_hw.c @@ -2,6 +2,10 @@ /* */ +#include <linux/pci.h> + +#include <drm/drm_fourcc.h> + #include "bochs.h" /* ---------------------------------------------------------------------- */ diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 2a06fea0039b..2557550fe949 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -2,12 +2,14 @@ /* */ -#include "bochs.h" +#include <linux/moduleparam.h> + #include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_helper.h> -#include <drm/drm_atomic_uapi.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + +#include "bochs.h" static int defx = 1024; static int defy = 768; |