| Message ID | 20190630061922.7254-5-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: drop use of drmp.h in drm-misc | expand |
On Sun, Jun 30, 2019 at 8:19 AM Sam Ravnborg <sam@ravnborg.org> wrote: > 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> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Thu, Jul 04, 2019 at 09:32:10AM +0200, Linus Walleij wrote: > On Sun, Jun 30, 2019 at 8:19 AM Sam Ravnborg <sam@ravnborg.org> wrote: > > > 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> > > Cc: Linus Walleij <linus.walleij@linaro.org> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Applied, thanks. Sam
diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c index 58fd31030834..d733bbc4ac0e 100644 --- a/drivers/gpu/drm/tve200/tve200_display.c +++ b/drivers/gpu/drm/tve200/tve200_display.c @@ -9,16 +9,18 @@ * Copyright (C) 2011 Texas Instruments * Copyright (C) 2017 Eric Anholt */ + #include <linux/clk.h> #include <linux/version.h> #include <linux/dma-buf.h> #include <linux/of_graph.h> -#include <drm/drmP.h> -#include <drm/drm_panel.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_panel.h> +#include <drm/drm_vblank.h> #include "tve200_drm.h" diff --git a/drivers/gpu/drm/tve200/tve200_drm.h b/drivers/gpu/drm/tve200/tve200_drm.h index 62061b518397..5420b52ea16b 100644 --- a/drivers/gpu/drm/tve200/tve200_drm.h +++ b/drivers/gpu/drm/tve200/tve200_drm.h @@ -13,6 +13,18 @@ #ifndef _TVE200_DRM_H_ #define _TVE200_DRM_H_ +#include <linux/irqreturn.h> + +#include <drm/drm_simple_kms_helper.h> + +struct clk; +struct drm_bridge; +struct drm_connector; +struct drm_device; +struct drm_file; +struct drm_mode_create_dumb; +struct drm_panel; + /* Bits 2-31 are valid physical base addresses */ #define TVE200_Y_FRAME_BASE_ADDR 0x00 #define TVE200_U_FRAME_BASE_ADDR 0x04 @@ -89,9 +101,6 @@ #define TVE200_CTRL_4 0x24 #define TVE200_CTRL_4_RESET BIT(0) /* triggers reset of TVE200 */ -#include <drm/drm_gem.h> -#include <drm/drm_simple_kms_helper.h> - struct tve200_drm_dev_private { struct drm_device *drm; diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 830a5af25ac4..416f24823c0a 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -37,9 +37,9 @@ #include <linux/slab.h> #include <linux/version.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem_cma_helper.h> @@ -47,6 +47,7 @@ #include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "tve200_drm.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> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> --- The list of cc: was too large to add all recipients to the cover letter. Please find cover letter here: https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html Search for "drm: drop use of drmp.h in drm-misc" Sam drivers/gpu/drm/tve200/tve200_display.c | 8 +++++--- drivers/gpu/drm/tve200/tve200_drm.h | 15 ++++++++++++--- drivers/gpu/drm/tve200/tve200_drv.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-)