Commit 40b4db43 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/hisilicon: drop use of drmP.h 



Drop the deprecated drmP.h header file.

Made the header file selfcontained, and dropped unused header files.
Fixed fallout in remaining files.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Allison Randal <allison@lohutok.net>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Souptick Joarder <jrdr.linux@gmail.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Junwei Zhang <Jerry.Zhang@amd.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190630061922.7254-34-sam@ravnborg.org
parent fbbbd160

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c

+6 −0
Original line number Diff line number Diff line
@@ -11,10 +11,16 @@ 
 *	Jianhua Li <lijianhua@huawei.com>

 */



#include <linux/delay.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "hibmc_drm_drv.h"

#include "hibmc_drm_regs.h"

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+7 −0
Original line number Diff line number Diff line
@@ -13,9 +13,16 @@ 


#include <linux/console.h>

#include <linux/module.h>

#include <linux/pci.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_drv.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_irq.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>

#include <drm/drm_vram_mm_helper.h>



#include "hibmc_drm_drv.h"

#include "hibmc_drm_regs.h"

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h

+4 −5
Original line number Diff line number Diff line
@@ -14,12 +14,11 @@ 
#ifndef HIBMC_DRM_DRV_H

#define HIBMC_DRM_DRV_H



#include <drm/drmP.h>

#include <drm/drm_atomic.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 <drm/drm_framebuffer.h>



struct drm_device;

struct drm_gem_object;



struct hibmc_framebuffer {

	struct drm_framebuffer fb;

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_probe_helper.h>



#include "hibmc_drm_drv.h"

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_print.h>



#include "hibmc_drm_drv.h"

#include "hibmc_drm_regs.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE