mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

drm/sis: drop drmP.h use

Browse source 
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@ravnborg.org>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605135539.12940-2-sam@ravnborg.org
This commit is contained in:
Sam Ravnborg 2019-06-05 15:55:39 +02:00
parent 4b013bb2d3
commit 1b36d506fc
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/drm/sis/sis_drv.c
View file

@ -27,11 +27,13 @@
#include <linux/module.h> #include <linux/module.h>
#include <drm/drmP.h> #include <drm/drm_drv.h>
#include <drm/sis_drm.h> #include <drm/drm_file.h>
#include "sis_drv.h" #include <drm/drm_pci.h>
#include <drm/drm_pciids.h> #include <drm/drm_pciids.h>
#include <drm/sis_drm.h>
#include "sis_drv.h"
static struct pci_device_id pciidlist[] = { static struct pci_device_id pciidlist[] = {
sisdrv_PCI_IDS sisdrv_PCI_IDS

10
drivers/gpu/drm/sis/sis_drv.h
View file

@ -28,7 +28,9 @@
#ifndef _SIS_DRV_H_ #ifndef _SIS_DRV_H_
#define _SIS_DRV_H_ #define _SIS_DRV_H_
#include <drm/drm_ioctl.h>
#include <drm/drm_legacy.h> #include <drm/drm_legacy.h>
#include <drm/drm_mm.h>
/* General customization: /* General customization:
*/ */
@ -46,12 +48,8 @@ enum sis_family {
SIS_CHIP_315 = 1, SIS_CHIP_315 = 1,
}; };
#include <drm/drm_mm.h> #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))
#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)
typedef struct drm_sis_private { typedef struct drm_sis_private {
drm_local_map_t *mmio; drm_local_map_t *mmio;

7
drivers/gpu/drm/sis/sis_mm.c
View file

@ -31,11 +31,14 @@
* Thomas Hellström <thomas-at-tungstengraphics-dot-com> * 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 <drm/sis_drm.h>
#include "sis_drv.h" #include "sis_drv.h"
#include <video/sisfb.h>
#define VIDEO_TYPE 0 #define VIDEO_TYPE 0
#define AGP_TYPE 1 #define AGP_TYPE 1