drm/v3d: drop use of drmP.h

Drop use of the deprecated drmP.h header file.
Made v3d_drv.h self-contained with only sufficient
include files.
Fixed fallout in remaining files.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190716064220.18157-3-sam@ravnborg.org
This commit is contained in:
Sam Ravnborg 2019-07-16 08:42:03 +02:00
parent 66620f48cb
commit 220989e709
5 changed files with 26 additions and 9 deletions

View File

@ -6,7 +6,8 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <drm/drmP.h>
#include <drm/drm_debugfs.h>
#include "v3d_drv.h" #include "v3d_drv.h"
#include "v3d_regs.h" #include "v3d_regs.h"

View File

@ -14,16 +14,19 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <drm/drm_drv.h>
#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_cma_helper.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <uapi/drm/v3d_drm.h>
#include "uapi/drm/v3d_drm.h"
#include "v3d_drv.h" #include "v3d_drv.h"
#include "v3d_regs.h" #include "v3d_regs.h"

View File

@ -1,14 +1,23 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* Copyright (C) 2015-2018 Broadcom */ /* Copyright (C) 2015-2018 Broadcom */
#include <linux/mm_types.h> #include <linux/delay.h>
#include <drm/drmP.h> #include <linux/mutex.h>
#include <linux/spinlock_types.h>
#include <linux/workqueue.h>
#include <drm/drm_encoder.h> #include <drm/drm_encoder.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_gem_shmem_helper.h>
#include <drm/gpu_scheduler.h> #include <drm/gpu_scheduler.h>
#include "uapi/drm/v3d_drm.h" #include "uapi/drm/v3d_drm.h"
struct clk;
struct device;
struct platform_device;
struct reset_control;
#define GMP_GRANULARITY (128 * 1024) #define GMP_GRANULARITY (128 * 1024)
/* Enum for each of the V3D queues. */ /* Enum for each of the V3D queues. */

View File

@ -1,17 +1,19 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* Copyright (C) 2014-2018 Broadcom */ /* Copyright (C) 2014-2018 Broadcom */
#include <drm/drmP.h> #include <linux/device.h>
#include <drm/drm_syncobj.h> #include <linux/dma-mapping.h>
#include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/device.h>
#include <linux/io.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
#include <linux/uaccess.h>
#include <drm/drm_syncobj.h>
#include <uapi/drm/v3d_drm.h>
#include "uapi/drm/v3d_drm.h"
#include "v3d_drv.h" #include "v3d_drv.h"
#include "v3d_regs.h" #include "v3d_regs.h"
#include "v3d_trace.h" #include "v3d_trace.h"

View File

@ -13,6 +13,8 @@
* current job can make progress. * current job can make progress.
*/ */
#include <linux/platform_device.h>
#include "v3d_drv.h" #include "v3d_drv.h"
#include "v3d_regs.h" #include "v3d_regs.h"
#include "v3d_trace.h" #include "v3d_trace.h"