diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2019-06-09 18:07:53 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2019-06-10 17:00:08 -0400 |
commit | 831583c309105cfcfbbbb4b3875b09e5209d2b99 (patch) | |
tree | e3323ab50b388508ec9a6f786c4e2cb3b6297883 | |
parent | 841d0023338c902e91ffa5c5954fd58dd9912e87 (diff) |
drm/amd: drop use of drmP.h from all header files
Drop use of the deprecated drmP.h header file from
all amd header files.
This makes it a more smooth process to get rid of drmP.h
in the .c files.
Added include files and forwards as appropriate.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190609220757.10862-7-sam@ravnborg.org
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h index 2a1a0c734bdd..12299fd95691 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | |||
@@ -25,7 +25,10 @@ | |||
25 | #ifndef __AMDGPU_SCHED_H__ | 25 | #ifndef __AMDGPU_SCHED_H__ |
26 | #define __AMDGPU_SCHED_H__ | 26 | #define __AMDGPU_SCHED_H__ |
27 | 27 | ||
28 | #include <drm/drmP.h> | 28 | enum drm_sched_priority; |
29 | |||
30 | struct drm_device; | ||
31 | struct drm_file; | ||
29 | 32 | ||
30 | enum drm_sched_priority amdgpu_to_sched_priority(int amdgpu_priority); | 33 | enum drm_sched_priority amdgpu_to_sched_priority(int amdgpu_priority); |
31 | int amdgpu_sched_ioctl(struct drm_device *dev, void *data, | 34 | int amdgpu_sched_ioctl(struct drm_device *dev, void *data, |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index d3ca2424b5fe..77674a7b9616 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | |||
@@ -28,8 +28,6 @@ | |||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/tracepoint.h> | 29 | #include <linux/tracepoint.h> |
30 | 30 | ||
31 | #include <drm/drmP.h> | ||
32 | |||
33 | #undef TRACE_SYSTEM | 31 | #undef TRACE_SYSTEM |
34 | #define TRACE_SYSTEM amdgpu | 32 | #define TRACE_SYSTEM amdgpu |
35 | #define TRACE_INCLUDE_FILE amdgpu_trace | 33 | #define TRACE_INCLUDE_FILE amdgpu_trace |
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 978ff14a7d45..2485d8426e5e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | |||
@@ -26,8 +26,11 @@ | |||
26 | #ifndef __AMDGPU_DM_H__ | 26 | #ifndef __AMDGPU_DM_H__ |
27 | #define __AMDGPU_DM_H__ | 27 | #define __AMDGPU_DM_H__ |
28 | 28 | ||
29 | #include <drm/drmP.h> | ||
30 | #include <drm/drm_atomic.h> | 29 | #include <drm/drm_atomic.h> |
30 | #include <drm/drm_connector.h> | ||
31 | #include <drm/drm_crtc.h> | ||
32 | #include <drm/drm_dp_mst_helper.h> | ||
33 | #include <drm/drm_plane.h> | ||
31 | 34 | ||
32 | /* | 35 | /* |
33 | * This file contains the definition for amdgpu_display_manager | 36 | * This file contains the definition for amdgpu_display_manager |