Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/vkms: drop use of drmP.h

Drop use of the deprecated drmP.h header.
Replace it with the necessary includes in the individual .c files.
The header files was self-contained, and extra includes were not added
there.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20190630061922.7254-13-sam@ravnborg.org

+23 -8
+4 -1
drivers/gpu/drm/vkms/vkms_composer.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 2 3 - #include "vkms_drv.h" 4 3 #include <linux/crc32.h> 4 + 5 5 #include <drm/drm_atomic.h> 6 6 #include <drm/drm_atomic_helper.h> 7 7 #include <drm/drm_gem_framebuffer_helper.h> 8 + #include <drm/drm_vblank.h> 9 + 10 + #include "vkms_drv.h" 8 11 9 12 /** 10 13 * compute_crc - Compute CRC value on output frame
+3 -1
drivers/gpu/drm/vkms/vkms_crtc.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 2 3 - #include "vkms_drv.h" 4 3 #include <drm/drm_atomic.h> 5 4 #include <drm/drm_atomic_helper.h> 6 5 #include <drm/drm_probe_helper.h> 6 + #include <drm/drm_vblank.h> 7 + 8 + #include "vkms_drv.h" 7 9 8 10 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) 9 11 {
+9 -2
drivers/gpu/drm/vkms/vkms_drv.c
··· 10 10 */ 11 11 12 12 #include <linux/module.h> 13 - #include <drm/drm_gem.h> 13 + #include <linux/platform_device.h> 14 + 14 15 #include <drm/drm_atomic.h> 15 16 #include <drm/drm_atomic_helper.h> 16 - #include <drm/drm_gem_framebuffer_helper.h> 17 + #include <drm/drm_drv.h> 17 18 #include <drm/drm_fb_helper.h> 19 + #include <drm/drm_file.h> 20 + #include <drm/drm_gem.h> 21 + #include <drm/drm_gem_framebuffer_helper.h> 22 + #include <drm/drm_ioctl.h> 18 23 #include <drm/drm_probe_helper.h> 24 + #include <drm/drm_vblank.h> 25 + 19 26 #include "vkms_drv.h" 20 27 21 28 #define DRIVER_NAME "vkms"
+2 -2
drivers/gpu/drm/vkms/vkms_drv.h
··· 3 3 #ifndef _VKMS_DRV_H_ 4 4 #define _VKMS_DRV_H_ 5 5 6 - #include <drm/drmP.h> 6 + #include <linux/hrtimer.h> 7 + 7 8 #include <drm/drm.h> 8 9 #include <drm/drm_gem.h> 9 10 #include <drm/drm_encoder.h> 10 - #include <linux/hrtimer.h> 11 11 12 12 #define XRES_MIN 20 13 13 #define YRES_MIN 20
+1
drivers/gpu/drm/vkms/vkms_gem.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 2 3 3 #include <linux/shmem_fs.h> 4 + #include <linux/vmalloc.h> 4 5 5 6 #include "vkms_drv.h" 6 7
+4 -2
drivers/gpu/drm/vkms/vkms_plane.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0+ 2 2 3 - #include "vkms_drv.h" 4 - #include <drm/drm_plane_helper.h> 5 3 #include <drm/drm_atomic.h> 6 4 #include <drm/drm_atomic_helper.h> 5 + #include <drm/drm_fourcc.h> 7 6 #include <drm/drm_gem_framebuffer_helper.h> 7 + #include <drm/drm_plane_helper.h> 8 + 9 + #include "vkms_drv.h" 8 10 9 11 static const u32 vkms_formats[] = { 10 12 DRM_FORMAT_XRGB8888,