Commit 1b36d506 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/sis: drop drmP.h use 



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: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605135539.12940-2-sam@ravnborg.org
parent 4b013bb2

drivers/gpu/drm/sis/sis_drv.c

+5 −3
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/sis/sis_drv.h

+4 −6
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/sis/sis_mm.c

+5 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE