[71/76] drm/amd/dal: include dm_services.h in reg_helper.h

Submitted by Harry Wentland on Nov. 21, 2016, 11:01 p.m.

Details

Message ID 20161121230136.5208-72-harry.wentland@amd.com
State New
Headers show
Series "DAL Patches Nov 21, 2016" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Harry Wentland Nov. 21, 2016, 11:01 p.m.
From: Tony Cheng <tony.cheng@amd.com>

Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
 drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c          | 5 +----
 drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c   | 4 +---
 drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 2 --
 drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h         | 2 ++
 4 files changed, 4 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c b/drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c
index 6296d8fda690..dc44053e8575 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c
@@ -23,7 +23,7 @@ 
  *
  */
 
-#include "dm_services.h"
+#include "reg_helper.h"
 #include "dce_audio.h"
 #include "dce/dce_11_0_d.h"
 #include "dce/dce_11_0_sh_mask.h"
@@ -31,9 +31,6 @@ 
 #define DCE_AUD(audio)\
 	container_of(audio, struct dce_audio, base)
 
-
-#include "reg_helper.h"
-
 #define CTX \
 	aud->base.ctx
 #define REG(reg)\
diff --git a/drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c
index 3b3c01a647bc..968d4187273c 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c
@@ -23,9 +23,8 @@ 
  *
  */
 
+#include "reg_helper.h"
 
-
-#include "dm_services.h"
 #include "core_types.h"
 #include "link_encoder.h"
 #include "dce_link_encoder.h"
@@ -38,7 +37,6 @@ 
 #include "dce/dce_11_0_d.h"
 #include "dce/dce_11_0_sh_mask.h"
 #include "dce/dce_11_0_enum.h"
-#include "reg_helper.h"
 
 #ifndef ATOM_S2_CURRENT_BL_LEVEL_MASK
 #define ATOM_S2_CURRENT_BL_LEVEL_MASK   0x0000FF00L
diff --git a/drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c
index 89e09150234e..050fef92f545 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c
@@ -23,8 +23,6 @@ 
  *
  */
 
-
-#include "dm_services.h"
 #include "dc_bios_types.h"
 #include "dce_stream_encoder.h"
 #include "reg_helper.h"
diff --git a/drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h b/drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h
index f0cf64b1d54e..7a05141484c9 100644
--- a/drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h
+++ b/drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h
@@ -25,6 +25,8 @@ 
 #ifndef DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_REG_HELPER_H_
 #define DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_REG_HELPER_H_
 
+#include "dm_services.h"
+
 /* macro for register read/write
  * user of macro need to define
  *