Commit 7f1d39ef authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/r128: drop use of drmP.h 



Drop use of the deprecated drmP.h header file.
Replace it with relevant include files.
Sort include files in files touched.

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/20190605141321.17819-3-sam@ravnborg.org
parent 3c1aa3b3

drivers/gpu/drm/r128/r128_cce.c

+10 −2
Original line number Diff line number Diff line
@@ -29,13 +29,21 @@ 
 *    Gareth Hughes <gareth@valinux.com>

 */



#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/uaccess.h>



#include <drm/drmP.h>

#include <drm/drm_agpsupport.h>

#include <drm/drm_device.h>

#include <drm/drm_file.h>

#include <drm/drm_irq.h>

#include <drm/drm_print.h>

#include <drm/r128_drm.h>



#include "r128_drv.h"



#define R128_FIFO_DEBUG		0

drivers/gpu/drm/r128/r128_drv.c

+6 −3
Original line number Diff line number Diff line
@@ -31,11 +31,14 @@ 


#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/drm_vblank.h>

#include <drm/r128_drm.h>

#include "r128_drv.h"



#include <drm/drm_pciids.h>

#include "r128_drv.h"



static struct pci_device_id pciidlist[] = {

	r128_PCI_IDS

drivers/gpu/drm/r128/r128_drv.h

+6 −0
Original line number Diff line number Diff line
@@ -35,8 +35,14 @@ 
#ifndef __R128_DRV_H__

#define __R128_DRV_H__



#include <linux/delay.h>

#include <linux/io.h>

#include <linux/irqreturn.h>



#include <drm/ati_pcigart.h>

#include <drm/drm_ioctl.h>

#include <drm/drm_legacy.h>

#include <drm/r128_drm.h>



/* General customization:

 */

drivers/gpu/drm/r128/r128_state.c

+8 −1
Original line number Diff line number Diff line
@@ -28,8 +28,15 @@ 
 *    Gareth Hughes <gareth@valinux.com>

 */



#include <drm/drmP.h>

#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/uaccess.h>



#include <drm/drm_device.h>

#include <drm/drm_file.h>

#include <drm/drm_print.h>

#include <drm/r128_drm.h>



#include "r128_drv.h"



/* ================================================================

CRA Git | Maintained and supported by SUSTech CRA and CCSE