[PATCH v1 1/1] drm/sis: drop drmP.h use

[Daniel Vetter]

On Wed, Jun 05, 2019 at 03:55:39PM +0200, Sam Ravnborg wrote:
> Drop use of the deprecated drmP.h header.
> Repalced with relevant header files and sorted header files in all files
> touched.
> 
> Replaced DRM_{READ,WRITE} to avoid the drm_os_linux header.
> 
> Build tested with allyesconfig, allmodconfig on various architectures.
> 
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/sis/sis_drv.c |  8 +++++---
>  drivers/gpu/drm/sis/sis_drv.h | 10 ++++------
>  drivers/gpu/drm/sis/sis_mm.c  |  7 +++++--
>  3 files changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
> index e04a92658cd7..ee3801201ecc 100644
> --- a/drivers/gpu/drm/sis/sis_drv.c
> +++ b/drivers/gpu/drm/sis/sis_drv.c
> @@ -27,11 +27,13 @@
>  
>  #include <linux/module.h>
>  
> -#include <drm/drmP.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_pci.h>
> +#include <drm/drm_pciids.h>
>  #include <drm/sis_drm.h>
> -#include "sis_drv.h"
>  
> -#include <drm/drm_pciids.h>
> +#include "sis_drv.h"
>  
>  static struct pci_device_id pciidlist[] = {
>  	sisdrv_PCI_IDS
> diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
> index 328f8a750976..81339443b3b1 100644
> --- a/drivers/gpu/drm/sis/sis_drv.h
> +++ b/drivers/gpu/drm/sis/sis_drv.h
> @@ -28,7 +28,9 @@
>  #ifndef _SIS_DRV_H_
>  #define _SIS_DRV_H_
>  
> +#include <drm/drm_ioctl.h>
>  #include <drm/drm_legacy.h>
> +#include <drm/drm_mm.h>
>  
>  /* General customization:
>   */
> @@ -46,12 +48,8 @@ enum sis_family {
>  	SIS_CHIP_315 = 1,
>  };
>  
> -#include <drm/drm_mm.h>
> -
> -
> -#define SIS_BASE (dev_priv->mmio)
> -#define SIS_READ(reg)         DRM_READ32(SIS_BASE, reg)
> -#define SIS_WRITE(reg, val)   DRM_WRITE32(SIS_BASE, reg, val)
> +#define SIS_READ(reg)         readl(((void __iomem *)dev_priv->mmio->handle) + (reg))
> +#define SIS_WRITE(reg, val)   writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))
>  
>  typedef struct drm_sis_private {
>  	drm_local_map_t *mmio;
> diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
> index 1622db24cd39..e51d4289a3d0 100644
> --- a/drivers/gpu/drm/sis/sis_mm.c
> +++ b/drivers/gpu/drm/sis/sis_mm.c
> @@ -31,11 +31,14 @@
>   *    Thomas Hellström <thomas-at-tungstengraphics-dot-com>
>   */
>  
> -#include <drm/drmP.h>
> +#include <video/sisfb.h>
> +
> +#include <drm/drm_device.h>
> +#include <drm/drm_file.h>
>  #include <drm/sis_drm.h>
> +
>  #include "sis_drv.h"
>  
> -#include <video/sisfb.h>
>  
>  #define VIDEO_TYPE 0
>  #define AGP_TYPE 1
> -- 
> 2.20.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch