Re: [PATCH v1 32/33] drm/ast: drop use of drmP.h

From: Thomas Zimmermann <tzimmermann@suse.de>
To: Sam Ravnborg <sam@ravnborg.org>, dri-devel@lists.freedesktop.org
Cc: "Sam Bobroff" <sbobroff@linux.ibm.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	YueHaibing <yuehaibing@huawei.com>,
	"Hans de Goede" <hdegoede@redhat.com>,
	"Huang Rui" <ray.huang@amd.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Alex Deucher" <alexander.deucher@amd.com>,
	"Dave Airlie" <airlied@redhat.com>,
	"Christian König" <christian.koenig@amd.com>
Subject: Re: [PATCH v1 32/33] drm/ast: drop use of drmP.h
Date: Sun, 30 Jun 2019 09:34:49 +0200	[thread overview]
Message-ID: <65727066-7d53-3e47-b2cc-389c9505bfc2@suse.de> (raw)
In-Reply-To: <20190630061922.7254-33-sam@ravnborg.org>


[-- Attachment #1.1.1: Type: text/plain, Size: 7620 bytes --]

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

Am 30.06.19 um 08:19 schrieb Sam Ravnborg:
> Drop use of the deprecated drmP.h header file.
> While touching the files divide include files in blocks
> and sort the include files in the individual blocks.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Cc: Dave Airlie <airlied@redhat.com>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: Sam Bobroff <sbobroff@linux.ibm.com>
> Cc: YueHaibing <yuehaibing@huawei.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: "Y.C. Chen" <yc_chen@aspeedtech.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
> ---
> 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/ast/ast_dp501.c |  5 ++++-
>  drivers/gpu/drm/ast/ast_drv.c   |  9 +++++++--
>  drivers/gpu/drm/ast/ast_drv.h   | 17 +++++++++--------
>  drivers/gpu/drm/ast/ast_fb.c    | 20 ++++++++++++--------
>  drivers/gpu/drm/ast/ast_main.c  |  9 +++++++--
>  drivers/gpu/drm/ast/ast_mode.c  |  8 ++++++--
>  drivers/gpu/drm/ast/ast_post.c  |  7 +++++--
>  drivers/gpu/drm/ast/ast_ttm.c   |  7 ++++++-
>  8 files changed, 56 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_dp501.c b/drivers/gpu/drm/ast/ast_dp501.c
> index 4c7375b45281..98cd69269263 100644
> --- a/drivers/gpu/drm/ast/ast_dp501.c
> +++ b/drivers/gpu/drm/ast/ast_dp501.c
> @@ -1,8 +1,11 @@
>  // SPDX-License-Identifier: GPL-2.0
>  
> +#include <linux/delay.h>
>  #include <linux/firmware.h>
> -#include <drm/drmP.h>
> +#include <linux/module.h>
> +
>  #include "ast_drv.h"
> +
>  MODULE_FIRMWARE("ast_dp501_fw.bin");
>  
>  static int ast_load_dp501_microcode(struct drm_device *dev)
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index 3811997e78c4..dd120e2d61e9 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -25,12 +25,17 @@
>  /*
>   * Authors: Dave Airlie <airlied@redhat.com>
>   */
> -#include <linux/module.h>
> +
>  #include <linux/console.h>
> +#include <linux/module.h>
> +#include <linux/pci.h>
>  
> -#include <drm/drmP.h>
>  #include <drm/drm_crtc_helper.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_gem_vram_helper.h>
> +#include <drm/drm_pci.h>
>  #include <drm/drm_probe_helper.h>
> +#include <drm/drm_vram_mm_helper.h>
>  
>  #include "ast_drv.h"
>  
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index ca794a3fcf8f..c0f76aef460b 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -28,17 +28,18 @@
>  #ifndef __AST_DRV_H__
>  #define __AST_DRV_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/types.h>
> +#include <linux/io.h>
>  #include <linux/i2c.h>
>  #include <linux/i2c-algo-bit.h>
>  
> +#include <drm/drm_connector.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_encoder.h>
> +#include <drm/drm_mode.h>
> +#include <drm/drm_framebuffer.h>
> +#include <drm/drm_fb_helper.h>
> +
>  #define DRIVER_AUTHOR		"Dave Airlie"
>  
>  #define DRIVER_NAME		"ast"
> diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> index a849e58b40bc..6343aa92f237 100644
> --- a/drivers/gpu/drm/ast/ast_fb.c
> +++ b/drivers/gpu/drm/ast/ast_fb.c
> @@ -25,22 +25,26 @@
>  /*
>   * Authors: Dave Airlie <airlied@redhat.com>
>   */
> -#include <linux/module.h>
> -#include <linux/kernel.h>
> +
> +#include <linux/delay.h>
>  #include <linux/errno.h>
> -#include <linux/string.h>
> +#include <linux/init.h>
> +#include <linux/kernel.h>
>  #include <linux/mm.h>
> -#include <linux/tty.h>
> +#include <linux/module.h>
> +#include <linux/pci.h>
> +#include <linux/string.h>
>  #include <linux/sysrq.h>
> -#include <linux/delay.h>
> -#include <linux/init.h>
> -
> +#include <linux/tty.h>
> +#include <linux/vmalloc.h>
>  
> -#include <drm/drmP.h>
>  #include <drm/drm_crtc.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_gem_vram_helper.h>
> +#include <drm/drm_print.h>
>  #include <drm/drm_util.h>
>  
>  #include "ast_drv.h"
> diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> index 1bd61696e509..b6f8dd040ae7 100644
> --- a/drivers/gpu/drm/ast/ast_main.c
> +++ b/drivers/gpu/drm/ast/ast_main.c
> @@ -25,12 +25,17 @@
>  /*
>   * Authors: Dave Airlie <airlied@redhat.com>
>   */
> -#include <drm/drmP.h>
> -#include "ast_drv.h"
> +
> +#include <linux/pci.h>
>  
>  #include <drm/drm_crtc_helper.h>
>  #include <drm/drm_fb_helper.h>
> +#include <drm/drm_gem.h>
>  #include <drm/drm_gem_framebuffer_helper.h>
> +#include <drm/drm_gem_vram_helper.h>
> +#include <drm/drm_vram_mm_helper.h>
> +
> +#include "ast_drv.h"
>  
>  void ast_set_index_reg_mask(struct ast_private *ast,
>  			    uint32_t base, uint8_t index,
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index c48249df758e..9d2789040edb 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -27,14 +27,18 @@
>  /*
>   * Authors: Dave Airlie <airlied@redhat.com>
>   */
> +
>  #include <linux/export.h>
> -#include <drm/drmP.h>
> +#include <linux/pci.h>
> +
>  #include <drm/drm_crtc.h>
>  #include <drm/drm_crtc_helper.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_gem_vram_helper.h>
>  #include <drm/drm_plane_helper.h>
>  #include <drm/drm_probe_helper.h>
> -#include "ast_drv.h"
>  
> +#include "ast_drv.h"
>  #include "ast_tables.h"
>  
>  static struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index f7d421359d56..e1d9cdf6ec1d 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -26,10 +26,13 @@
>   * Authors: Dave Airlie <airlied@redhat.com>
>   */
>  
> -#include <drm/drmP.h>
> -#include "ast_drv.h"
> +#include <linux/delay.h>
> +#include <linux/pci.h>
> +
> +#include <drm/drm_print.h>
>  
>  #include "ast_dram_tables.h"
> +#include "ast_drv.h"
>  
>  static void ast_post_chip_2300(struct drm_device *dev);
>  static void ast_post_chip_2500(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
> index 779c53efee8e..c52d92294171 100644
> --- a/drivers/gpu/drm/ast/ast_ttm.c
> +++ b/drivers/gpu/drm/ast/ast_ttm.c
> @@ -25,7 +25,12 @@
>  /*
>   * Authors: Dave Airlie <airlied@redhat.com>
>   */
> -#include <drm/drmP.h>
> +
> +#include <linux/pci.h>
> +
> +#include <drm/drm_print.h>
> +#include <drm/drm_gem_vram_helper.h>
> +#include <drm/drm_vram_mm_helper.h>
>  
>  #include "ast_drv.h"
>  
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel