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

drm/tve200: drop use of drmP.h

Drop use of the deprecated header drmP.h.

Fix so header file became self-contained,
and then fixed fallout in the other files.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190630061922.7254-5-sam@ravnborg.org

+19 -7
+5 -3
drivers/gpu/drm/tve200/tve200_display.c
··· 9 9 * Copyright (C) 2011 Texas Instruments 10 10 * Copyright (C) 2017 Eric Anholt 11 11 */ 12 + 12 13 #include <linux/clk.h> 13 14 #include <linux/version.h> 14 15 #include <linux/dma-buf.h> 15 16 #include <linux/of_graph.h> 16 17 17 - #include <drm/drmP.h> 18 - #include <drm/drm_panel.h> 18 + #include <drm/drm_fb_cma_helper.h> 19 + #include <drm/drm_fourcc.h> 19 20 #include <drm/drm_gem_cma_helper.h> 20 21 #include <drm/drm_gem_framebuffer_helper.h> 21 - #include <drm/drm_fb_cma_helper.h> 22 + #include <drm/drm_panel.h> 23 + #include <drm/drm_vblank.h> 22 24 23 25 #include "tve200_drm.h" 24 26
+12 -3
drivers/gpu/drm/tve200/tve200_drm.h
··· 13 13 #ifndef _TVE200_DRM_H_ 14 14 #define _TVE200_DRM_H_ 15 15 16 + #include <linux/irqreturn.h> 17 + 18 + #include <drm/drm_simple_kms_helper.h> 19 + 20 + struct clk; 21 + struct drm_bridge; 22 + struct drm_connector; 23 + struct drm_device; 24 + struct drm_file; 25 + struct drm_mode_create_dumb; 26 + struct drm_panel; 27 + 16 28 /* Bits 2-31 are valid physical base addresses */ 17 29 #define TVE200_Y_FRAME_BASE_ADDR 0x00 18 30 #define TVE200_U_FRAME_BASE_ADDR 0x04 ··· 100 88 101 89 #define TVE200_CTRL_4 0x24 102 90 #define TVE200_CTRL_4_RESET BIT(0) /* triggers reset of TVE200 */ 103 - 104 - #include <drm/drm_gem.h> 105 - #include <drm/drm_simple_kms_helper.h> 106 91 107 92 struct tve200_drm_dev_private { 108 93 struct drm_device *drm;
+2 -1
drivers/gpu/drm/tve200/tve200_drv.c
··· 37 37 #include <linux/slab.h> 38 38 #include <linux/version.h> 39 39 40 - #include <drm/drmP.h> 41 40 #include <drm/drm_atomic_helper.h> 42 41 #include <drm/drm_bridge.h> 42 + #include <drm/drm_drv.h> 43 43 #include <drm/drm_fb_cma_helper.h> 44 44 #include <drm/drm_fb_helper.h> 45 45 #include <drm/drm_gem_cma_helper.h> ··· 47 47 #include <drm/drm_of.h> 48 48 #include <drm/drm_panel.h> 49 49 #include <drm/drm_probe_helper.h> 50 + #include <drm/drm_vblank.h> 50 51 51 52 #include "tve200_drm.h" 52 53