[PATCH 49/76] drm/amd/dal: remove adapter_service from

Harry Wentland harry.wentland at amd.com
Mon Nov 21 23:01:09 UTC 2016


From: Tony Cheng <tony.cheng at amd.com>

- bios, clock source. compressor, mem_input, timing_generator, link_encoder

Signed-off-by: Tony Cheng <tony.cheng at amd.com>
Acked-by: Harry Wentland <harry.wentland at amd.com>
---
 .../gpu/drm/amd/dal/dc/adapter/adapter_service.c   |  2 +-
 drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c      | 22 +++++++++-------------
 drivers/gpu/drm/amd/dal/dc/core/dc.c               |  1 -
 drivers/gpu/drm/amd/dal/dc/core/dc_link.c          |  1 -
 drivers/gpu/drm/amd/dal/dc/dc_bios_types.h         |  3 +--
 drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c  |  4 ----
 .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c    |  9 ++++-----
 .../drm/amd/dal/dc/dce110/dce110_clock_source.c    |  1 -
 .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.c  |  8 +++-----
 .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.h  |  5 ++---
 .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c   |  2 --
 .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h   |  1 -
 .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c |  3 +--
 .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h |  3 +--
 .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c    | 13 ++++++-------
 .../amd/dal/dc/dce110/dce110_timing_generator.c    |  4 ----
 .../amd/dal/dc/dce110/dce110_timing_generator.h    |  1 -
 .../amd/dal/dc/dce110/dce110_timing_generator_v.c  |  4 ----
 .../amd/dal/dc/dce110/dce110_timing_generator_v.h  |  1 -
 .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c  |  7 +++----
 .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.h  |  5 ++---
 .../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c   |  3 +--
 .../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h   |  1 -
 .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c    |  6 +++---
 .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.c    |  9 +++------
 .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.h    |  5 ++---
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c |  1 -
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h |  1 -
 drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c  |  9 ++++-----
 .../drm/amd/dal/dc/dce80/dce80_timing_generator.c  |  5 -----
 .../drm/amd/dal/dc/dce80/dce80_timing_generator.h  |  1 -
 .../amd/dal/dc/gpu/dce110/display_clock_dce110.c   | 16 +++++-----------
 .../amd/dal/dc/gpu/dce112/display_clock_dce112.c   |  3 +--
 .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 21 +++++++--------------
 .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h |  3 +--
 drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c     |  2 --
 drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h     |  1 -
 drivers/gpu/drm/amd/dal/dc/inc/compressor.h        |  1 +
 drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h   |  1 -
 .../drm/amd/dal/dc/virtual/virtual_link_encoder.c  |  2 --
 .../drm/amd/dal/include/bios_parser_interface.h    |  1 -
 .../drm/amd/dal/include/display_clock_interface.h  |  9 +++------
 42 files changed, 64 insertions(+), 137 deletions(-)

diff --git a/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c b/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
index 41d9a6125e14..b91301561b7f 100644
--- a/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
+++ b/drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
@@ -548,7 +548,7 @@ static bool adapter_service_construct(
 
 	dcb = as->ctx->dc_bios;
 
-	dcb->funcs->post_init(dcb, as);
+	dcb->funcs->post_init(dcb);
 
 	/* Generate backlight translation table and initializes
 			  other brightness properties */
diff --git a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c
index 586df420f87b..1d3ee3f10f3e 100644
--- a/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c
@@ -2923,7 +2923,7 @@ static uint32_t get_support_mask_for_device_id(struct device_id device_id)
  */
 
 static bool i2c_read(
-	struct adapter_service *as,
+	struct bios_parser *bp,
 	struct graphics_object_i2c_info *i2c_info,
 	uint8_t *buffer,
 	uint32_t length)
@@ -2936,7 +2936,7 @@ static bool i2c_read(
 		i2c_info->i2c_hw_assist,
 		i2c_info->i2c_line };
 
-	ddc = dal_gpio_create_ddc(as->ctx->gpio_service,
+	ddc = dal_gpio_create_ddc(bp->base.ctx->gpio_service,
 		i2c_info->gpio_info.clk_a_register_index,
 		(1 << i2c_info->gpio_info.clk_a_shift), &hw_info);
 
@@ -2986,7 +2986,6 @@ static bool i2c_read(
  */
 static enum bp_result get_ext_display_connection_info(
 	struct bios_parser *bp,
-	struct adapter_service *as,
 	ATOM_OBJECT *opm_object,
 	ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO *ext_display_connection_info_tbl)
 {
@@ -3013,7 +3012,7 @@ static enum bp_result get_ext_display_connection_info(
 				BP_RESULT_OK)
 			return BP_RESULT_BADBIOSTABLE;
 
-		if (i2c_read(as,
+		if (i2c_read(bp,
 			     &i2c_info,
 			     (uint8_t *)ext_display_connection_info_tbl,
 			     sizeof(ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO))) {
@@ -3333,8 +3332,7 @@ static ATOM_CONNECTOR_HPDPIN_LUT_RECORD *get_ext_connector_hpd_pin_lut_record(
  *
  */
 static enum bp_result patch_bios_image_from_ext_display_connection_info(
-	struct bios_parser *bp,
-	struct adapter_service *as)
+	struct bios_parser *bp)
 {
 	ATOM_OBJECT_TABLE *connector_tbl;
 	uint32_t connector_tbl_offset;
@@ -3374,7 +3372,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info(
 	connector_tbl = GET_IMAGE(ATOM_OBJECT_TABLE, connector_tbl_offset);
 
 	/* Read Connector info table from EEPROM through i2c */
-	if (get_ext_display_connection_info(bp, as,
+	if (get_ext_display_connection_info(bp,
 					    opm_object,
 					    &ext_display_connection_info_tbl) != BP_RESULT_OK) {
 
@@ -3570,8 +3568,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info(
  *
  */
 
-static void process_ext_display_connection_info(struct bios_parser *bp,
-						struct adapter_service *as)
+static void process_ext_display_connection_info(struct bios_parser *bp)
 {
 	ATOM_OBJECT_TABLE *connector_tbl;
 	uint32_t connector_tbl_offset;
@@ -3626,7 +3623,7 @@ static void process_ext_display_connection_info(struct bios_parser *bp,
 		/* Step 2: (only if MXM connector found) Patch BIOS image with
 		 * info from external module */
 		if (mxm_connector_found &&
-		    patch_bios_image_from_ext_display_connection_info(bp, as) !=
+		    patch_bios_image_from_ext_display_connection_info(bp) !=
 						BP_RESULT_OK) {
 			/* Patching the bios image has failed. We will copy
 			 * again original image provided and afterwards
@@ -3660,12 +3657,11 @@ static void process_ext_display_connection_info(struct bios_parser *bp,
 	}
 }
 
-static void bios_parser_post_init(struct dc_bios *dcb,
-		       struct adapter_service *as)
+static void bios_parser_post_init(struct dc_bios *dcb)
 {
 	struct bios_parser *bp = BP_FROM_DCB(dcb);
 
-	process_ext_display_connection_info(bp, as);
+	process_ext_display_connection_info(bp);
 }
 
 static bool bios_parser_is_accelerated_mode(
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc.c b/drivers/gpu/drm/amd/dal/dc/core/dc.c
index 4e1a9383ebcb..c5f98525a630 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc.c
@@ -139,7 +139,6 @@ static bool create_links(
 		link->link_id.enum_id = ENUM_ID_1;
 		link->link_enc = dm_alloc(sizeof(*link->link_enc));
 
-		enc_init.adapter_service = as;
 		enc_init.ctx = dc->ctx;
 		enc_init.channel = CHANNEL_ID_UNKNOWN;
 		enc_init.hpd_source = HPD_SOURCEID_UNKNOWN;
diff --git a/drivers/gpu/drm/amd/dal/dc/core/dc_link.c b/drivers/gpu/drm/amd/dal/dc/core/dc_link.c
index 1eb1089a8288..e59e439a35e7 100644
--- a/drivers/gpu/drm/amd/dal/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/dal/dc/core/dc_link.c
@@ -1032,7 +1032,6 @@ static bool construct(
 		dal_ddc_get_line(
 			dal_ddc_service_get_ddc_pin(link->ddc));
 
-	enc_init_data.adapter_service = as;
 	enc_init_data.ctx = dc_ctx;
 	bp_funcs->get_src_obj(dc_ctx->dc_bios, link->link_id, 0, &enc_init_data.encoder);
 	enc_init_data.connector = link->link_id;
diff --git a/drivers/gpu/drm/amd/dal/dc/dc_bios_types.h b/drivers/gpu/drm/amd/dal/dc/dc_bios_types.h
index 4771e415e33e..790c5bd51cb9 100644
--- a/drivers/gpu/drm/amd/dal/dc/dc_bios_types.h
+++ b/drivers/gpu/drm/amd/dal/dc/dc_bios_types.h
@@ -199,8 +199,7 @@ struct dc_vbios_funcs {
 		enum controller_id controller_id,
 		enum bp_pipe_control_action action);
 
-	void (*post_init)(struct dc_bios *bios,
-			  struct adapter_service *as);
+	void (*post_init)(struct dc_bios *bios);
 
 	void (*bios_parser_destroy)(struct dc_bios **dcb);
 };
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 88a775b7c1fb..b924b3d5bc22 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
@@ -596,7 +596,6 @@ static void link_encoder_edp_wait_for_hpd_ready(
 	bool power_up)
 {
 	struct dc_context *ctx = enc110->base.ctx;
-	struct adapter_service *as = enc110->base.adapter_service;
 	struct graphics_object_id connector = enc110->base.connector;
 	struct gpio *hpd;
 	bool edp_hpd_high = false;
@@ -971,7 +970,6 @@ bool dce110_link_encoder_construct(
 	const struct dce110_link_enc_hpd_registers *hpd_regs)
 {
 	struct graphics_object_encoder_cap_info enc_cap_info = {0};
-	struct adapter_service *as = init_data->adapter_service;
 
 	enc110->base.funcs = &dce110_lnk_enc_funcs;
 	enc110->base.ctx = init_data->ctx;
@@ -981,8 +979,6 @@ bool dce110_link_encoder_construct(
 	enc110->base.connector = init_data->connector;
 	enc110->base.input_signals = SIGNAL_TYPE_ALL;
 
-	enc110->base.adapter_service = as;
-
 	enc110->base.preferred_engine = ENGINE_ID_UNKNOWN;
 
 	enc110->base.features.flags.raw = 0;
diff --git a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c
index 908bb297bd0f..feb922836e82 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c
@@ -418,7 +418,7 @@ static struct timing_generator *dce100_timing_generator_create(
 	if (!tg110)
 		return NULL;
 
-	if (dce110_timing_generator_construct(tg110, as, ctx, instance,
+	if (dce110_timing_generator_construct(tg110, ctx, instance,
 			offsets))
 		return &tg110->base;
 
@@ -455,7 +455,6 @@ static const struct resource_create_funcs res_create_funcs = {
 
 static struct mem_input *dce100_mem_input_create(
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offset)
 {
@@ -466,7 +465,7 @@ static struct mem_input *dce100_mem_input_create(
 		return NULL;
 
 	if (dce110_mem_input_construct(mem_input110,
-				       ctx, as, inst, offset))
+				       ctx, inst, offset))
 		return &mem_input110->base;
 
 	BREAK_TO_DEBUGGER();
@@ -918,7 +917,7 @@ static bool construct(
 		}
 	}
 
-	pool->base.display_clock = dal_display_clock_dce110_create(ctx, as);
+	pool->base.display_clock = dal_display_clock_dce110_create(ctx);
 	if (pool->base.display_clock == NULL) {
 		dm_error("DC: failed to create display clock!\n");
 		BREAK_TO_DEBUGGER();
@@ -973,7 +972,7 @@ static bool construct(
 			goto res_create_fail;
 		}
 
-		pool->base.mis[i] = dce100_mem_input_create(ctx, as, i,
+		pool->base.mis[i] = dce100_mem_input_create(ctx, i,
 				&dce100_mi_reg_offsets[i]);
 		if (pool->base.mis[i] == NULL) {
 			BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_clock_source.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_clock_source.c
index 0e81aec6ef78..08d3bdacacc3 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_clock_source.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_clock_source.c
@@ -36,7 +36,6 @@
 #include "include/logger_interface.h"
 
 #include "dce110_clock_source.h"
-#include "adapter_service_interface.h"
 
 #define FRACT_FB_DIVIDER_DEC_POINTS_MAX_NUM 6
 #define CALC_PLL_CLK_SRC_ERR_TOLERANCE 1
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c
index 186ce3a9fe94..518150a414e2 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c
@@ -31,7 +31,6 @@
 #include "gmc/gmc_8_2_d.h"
 
 #include "include/logger_interface.h"
-#include "include/adapter_service_interface.h"
 
 #include "dce110_compressor.h"
 
@@ -793,7 +792,7 @@ void dce110_compressor_set_fbc_invalidation_triggers(
 }
 
 bool dce110_compressor_construct(struct dce110_compressor *compressor,
-	struct dc_context *ctx, struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct dc_bios *bp = ctx->dc_bios;
 	struct embedded_panel_info panel_info;
@@ -837,8 +836,7 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor,
 	return true;
 }
 
-struct compressor *dce110_compressor_create(struct dc_context *ctx,
-	struct adapter_service *as)
+struct compressor *dce110_compressor_create(struct dc_context *ctx)
 {
 	struct dce110_compressor *cp110 =
 		dm_alloc(sizeof(struct dce110_compressor));
@@ -846,7 +844,7 @@ struct compressor *dce110_compressor_create(struct dc_context *ctx,
 	if (!cp110)
 		return NULL;
 
-	if (dce110_compressor_construct(cp110, ctx, as))
+	if (dce110_compressor_construct(cp110, ctx))
 		return &cp110->base;
 
 	BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.h
index 86c30d43e9fb..22af5be51581 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.h
@@ -40,11 +40,10 @@ struct dce110_compressor {
 	struct dce110_compressor_reg_offsets offsets;
 };
 
-struct compressor *dce110_compressor_create(struct dc_context *ctx,
-	struct adapter_service *as);
+struct compressor *dce110_compressor_create(struct dc_context *ctx);
 
 bool dce110_compressor_construct(struct dce110_compressor *cp110,
-	struct dc_context *ctx, struct adapter_service *as);
+	struct dc_context *ctx);
 
 void dce110_compressor_destroy(struct compressor **cp);
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c
index a78ad8ddcaf8..0b778c984e9a 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c
@@ -31,7 +31,6 @@
 #include "gmc/gmc_8_2_sh_mask.h"
 
 #include "include/logger_interface.h"
-#include "adapter_service_interface.h"
 
 #include "dce110_mem_input.h"
 
@@ -993,7 +992,6 @@ static struct mem_input_funcs dce110_mem_input_funcs = {
 bool dce110_mem_input_construct(
 	struct dce110_mem_input *mem_input110,
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets)
 {
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h
index 8edd25ab19a6..83b2df93ce49 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h
@@ -44,7 +44,6 @@ struct dce110_mem_input {
 bool dce110_mem_input_construct(
 	struct dce110_mem_input *mem_input110,
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets);
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c
index 78c63680cc0b..acf200ba16b1 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c
@@ -1061,8 +1061,7 @@ static struct mem_input_funcs dce110_mem_input_v_funcs = {
 
 bool dce110_mem_input_v_construct(
 	struct dce110_mem_input *mem_input110,
-	struct dc_context *ctx,
-	struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	mem_input110->base.funcs = &dce110_mem_input_v_funcs;
 	mem_input110->base.ctx = ctx;
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h
index 07b663624d91..5b1796ccefc0 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h
@@ -30,8 +30,7 @@
 
 bool dce110_mem_input_v_construct(
 	struct dce110_mem_input *mem_input110,
-	struct dc_context *ctx,
-	struct adapter_service *as);
+	struct dc_context *ctx);
 
 /*
  * This function will program nbp stutter and urgency watermarks to minimum
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c
index a924ed0faea6..28d389c0ead5 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c
@@ -395,7 +395,7 @@ static struct timing_generator *dce110_timing_generator_create(
 	if (!tg110)
 		return NULL;
 
-	if (dce110_timing_generator_construct(tg110, as, ctx, instance, offsets))
+	if (dce110_timing_generator_construct(tg110, ctx, instance, offsets))
 		return &tg110->base;
 
 	BREAK_TO_DEBUGGER();
@@ -432,7 +432,6 @@ static const struct resource_create_funcs res_create_funcs = {
 
 static struct mem_input *dce110_mem_input_create(
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offset)
 {
@@ -443,7 +442,7 @@ static struct mem_input *dce110_mem_input_create(
 		return NULL;
 
 	if (dce110_mem_input_construct(mem_input110,
-				       ctx, as, inst, offset))
+				       ctx, inst, offset))
 		return &mem_input110->base;
 
 	BREAK_TO_DEBUGGER();
@@ -1049,8 +1048,8 @@ static void underlay_create(struct dc_context *ctx, struct resource_pool *pool)
 	struct dce110_opp *dce110_oppv = dm_alloc(sizeof (*dce110_oppv));
 
 	dce110_opp_v_construct(dce110_oppv, ctx);
-	dce110_timing_generator_v_construct(dce110_tgv, pool->adapter_srv, ctx);
-	dce110_mem_input_v_construct(dce110_miv, ctx, pool->adapter_srv);
+	dce110_timing_generator_v_construct(dce110_tgv, ctx);
+	dce110_mem_input_v_construct(dce110_miv, ctx);
 	dce110_transform_v_construct(dce110_xfmv, ctx);
 
 	pool->opps[pool->pipe_count] = &dce110_oppv->base;
@@ -1239,7 +1238,7 @@ static bool construct(
 		}
 	}
 
-	pool->base.display_clock = dal_display_clock_dce110_create(ctx, as);
+	pool->base.display_clock = dal_display_clock_dce110_create(ctx);
 	if (pool->base.display_clock == NULL) {
 		dm_error("DC: failed to create display clock!\n");
 		BREAK_TO_DEBUGGER();
@@ -1282,7 +1281,7 @@ static bool construct(
 			goto res_create_fail;
 		}
 
-		pool->base.mis[i] = dce110_mem_input_create(ctx, as, i,
+		pool->base.mis[i] = dce110_mem_input_create(ctx, i,
 				&dce110_mi_reg_offsets[i]);
 		if (pool->base.mis[i] == NULL) {
 			BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c
index 120f4bd619b5..3d736c15ca25 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c
@@ -1926,7 +1926,6 @@ static const struct timing_generator_funcs dce110_tg_funcs = {
 
 bool dce110_timing_generator_construct(
 	struct dce110_timing_generator *tg110,
-	struct adapter_service *as,
 	struct dc_context *ctx,
 	uint32_t instance,
 	const struct dce110_timing_generator_offsets *offsets)
@@ -1934,9 +1933,6 @@ bool dce110_timing_generator_construct(
 	if (!tg110)
 		return false;
 
-	if (!as)
-		return false;
-
 	tg110->controller_id = CONTROLLER_ID_D0 + instance;
 	tg110->base.inst = instance;
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.h
index 86ba37308a39..39906502ad5c 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.h
@@ -119,7 +119,6 @@ struct dce110_timing_generator {
 
 bool dce110_timing_generator_construct(
 	struct dce110_timing_generator *tg,
-	struct adapter_service *as,
 	struct dc_context *ctx,
 	uint32_t instance,
 	const struct dce110_timing_generator_offsets *offsets);
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c
index aadeeb33c53f..56cf3fe3ad28 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c
@@ -721,15 +721,11 @@ static const struct timing_generator_funcs dce110_tg_v_funcs = {
 
 bool dce110_timing_generator_v_construct(
 	struct dce110_timing_generator *tg110,
-	struct adapter_service *as,
 	struct dc_context *ctx)
 {
 	if (!tg110)
 		return false;
 
-	if (!as)
-		return false;
-
 	tg110->controller_id = CONTROLLER_ID_UNDERLAY0;
 
 	tg110->base.funcs = &dce110_tg_v_funcs;
diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.h
index fe3fb811d80b..7e49ca8e26ad 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.h
@@ -28,7 +28,6 @@
 
 bool dce110_timing_generator_v_construct(
 	struct dce110_timing_generator *tg110,
-	struct adapter_service *as,
 	struct dc_context *ctx);
 
 #endif /* __DC_TIMING_GENERATOR_V_DCE110_H__ */
diff --git a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c
index e34779b4b1de..70c4ea2ad294 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c
@@ -793,7 +793,7 @@ void dce112_compressor_set_fbc_invalidation_triggers(
 }
 
 bool dce112_compressor_construct(struct dce112_compressor *compressor,
-	struct dc_context *ctx, struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct dc_bios *bp = ctx->dc_bios;
 	struct embedded_panel_info panel_info;
@@ -837,8 +837,7 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor,
 	return true;
 }
 
-struct compressor *dce112_compressor_create(struct dc_context *ctx,
-	struct adapter_service *as)
+struct compressor *dce112_compressor_create(struct dc_context *ctx)
 {
 	struct dce112_compressor *cp110 =
 		dm_alloc(sizeof(struct dce112_compressor));
@@ -846,7 +845,7 @@ struct compressor *dce112_compressor_create(struct dc_context *ctx,
 	if (!cp110)
 		return NULL;
 
-	if (dce112_compressor_construct(cp110, ctx, as))
+	if (dce112_compressor_construct(cp110, ctx))
 		return &cp110->base;
 
 	BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.h b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.h
index 6a0efe80e3c6..106506387270 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.h
@@ -40,11 +40,10 @@ struct dce112_compressor {
 	struct dce112_compressor_reg_offsets offsets;
 };
 
-struct compressor *dce112_compressor_create(struct dc_context *ctx,
-	struct adapter_service *as);
+struct compressor *dce112_compressor_create(struct dc_context *ctx);
 
 bool dce112_compressor_construct(struct dce112_compressor *cp110,
-	struct dc_context *ctx, struct adapter_service *as);
+	struct dc_context *ctx);
 
 void dce112_compressor_destroy(struct compressor **cp);
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c
index dcbe9b4c8f0d..24b1b91abd71 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c
@@ -423,11 +423,10 @@ static void dce112_mem_input_program_display_marks(
 bool dce112_mem_input_construct(
 	struct dce110_mem_input *mem_input110,
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets)
 {
-  if (!dce110_mem_input_construct(mem_input110, ctx, as, inst, offsets))
+  if (!dce110_mem_input_construct(mem_input110, ctx, inst, offsets))
 		return false;
 
 	mem_input110->base.funcs->mem_input_program_display_marks =
diff --git a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h
index 00b127ac18a7..de2aaf0f9a8e 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h
@@ -31,7 +31,6 @@
 bool dce112_mem_input_construct(
 	struct dce110_mem_input *mem_input110,
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets);
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c
index 0ab589f1c1a7..92fcd4eeb5bf 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c
@@ -444,7 +444,7 @@ static struct timing_generator *dce112_timing_generator_create(
 	if (!tg110)
 		return NULL;
 
-	if (dce110_timing_generator_construct(tg110, as, ctx, instance, offsets))
+	if (dce110_timing_generator_construct(tg110, ctx, instance, offsets))
 		return &tg110->base;
 
 	BREAK_TO_DEBUGGER();
@@ -491,7 +491,7 @@ static struct mem_input *dce112_mem_input_create(
 		return NULL;
 
 	if (dce112_mem_input_construct(mem_input110,
-				       ctx, as, inst, offset))
+				       ctx, inst, offset))
 		return &mem_input110->base;
 
 	BREAK_TO_DEBUGGER();
@@ -1263,7 +1263,7 @@ static bool construct(
 	}
 
 	pool->base.display_clock = dal_display_clock_dce112_create(
-			ctx, adapter_serv);
+			ctx);
 
 	if (pool->base.display_clock == NULL) {
 		dm_error("DC: failed to create display clock!\n");
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c
index bcd44ebafc36..eeedb7c4fe53 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c
@@ -31,8 +31,6 @@
 #include "gmc/gmc_7_1_d.h"
 
 #include "include/logger_interface.h"
-#include "include/adapter_service_interface.h"
-
 #include "dce80_compressor.h"
 
 #define DCP_REG(reg)\
@@ -774,7 +772,7 @@ void dce80_compressor_set_fbc_invalidation_triggers(
 }
 
 bool dce80_compressor_construct(struct dce80_compressor *compressor,
-	struct dc_context *ctx, struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct dc_bios *bp = ctx->dc_bios;
 	struct embedded_panel_info panel_info;
@@ -818,8 +816,7 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor,
 	return true;
 }
 
-struct compressor *dce80_compressor_create(struct dc_context *ctx,
-	struct adapter_service *as)
+struct compressor *dce80_compressor_create(struct dc_context *ctx)
 {
 	struct dce80_compressor *cp80 =
 		dm_alloc(sizeof(struct dce80_compressor));
@@ -827,7 +824,7 @@ struct compressor *dce80_compressor_create(struct dc_context *ctx,
 	if (!cp80)
 		return NULL;
 
-	if (dce80_compressor_construct(cp80, ctx, as))
+	if (dce80_compressor_construct(cp80, ctx))
 		return &cp80->base;
 
 	BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.h b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.h
index f5f357c43fda..01290969ff92 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.h
@@ -40,11 +40,10 @@ struct dce80_compressor {
 	struct dce80_compressor_reg_offsets offsets;
 };
 
-struct compressor *dce80_compressor_create(struct dc_context *ctx,
-	struct adapter_service *as);
+struct compressor *dce80_compressor_create(struct dc_context *ctx);
 
 bool dce80_compressor_construct(struct dce80_compressor *cp80,
-	struct dc_context *ctx, struct adapter_service *as);
+		struct dc_context *ctx);
 
 void dce80_compressor_destroy(struct compressor **cp);
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c
index be822d1b5989..5d84a9bc5f9f 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c
@@ -186,7 +186,6 @@ static struct mem_input_funcs dce80_mem_input_funcs = {
 bool dce80_mem_input_construct(
 	struct dce110_mem_input *mem_input80,
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets)
 {
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h
index 6d589f52d473..357b9e2e9f1e 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h
@@ -30,7 +30,6 @@
 bool dce80_mem_input_construct(
 	struct dce110_mem_input *mem_input80,
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets);
 
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c
index d10d3a80ae3a..42b5ccdb3508 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c
@@ -410,7 +410,7 @@ static struct timing_generator *dce80_timing_generator_create(
 	if (!tg110)
 		return NULL;
 
-	if (dce80_timing_generator_construct(tg110, as, ctx, instance, offsets))
+	if (dce80_timing_generator_construct(tg110, ctx, instance, offsets))
 		return &tg110->base;
 
 	BREAK_TO_DEBUGGER();
@@ -446,7 +446,6 @@ static const struct resource_create_funcs res_create_funcs = {
 
 static struct mem_input *dce80_mem_input_create(
 	struct dc_context *ctx,
-	struct adapter_service *as,
 	uint32_t inst,
 	const struct dce110_mem_input_reg_offsets *offsets)
 {
@@ -457,7 +456,7 @@ static struct mem_input *dce80_mem_input_create(
 		return NULL;
 
 	if (dce80_mem_input_construct(mem_input80,
-				      ctx, as, inst, offsets))
+				      ctx, inst, offsets))
 		return &mem_input80->base;
 
 	BREAK_TO_DEBUGGER();
@@ -922,7 +921,7 @@ static bool construct(
 		}
 	}
 
-	pool->base.display_clock = dal_display_clock_dce80_create(ctx, as);
+	pool->base.display_clock = dal_display_clock_dce80_create(ctx);
 	if (pool->base.display_clock == NULL) {
 		dm_error("DC: failed to create display clock!\n");
 		BREAK_TO_DEBUGGER();
@@ -963,7 +962,7 @@ static bool construct(
 			goto res_create_fail;
 		}
 
-		pool->base.mis[i] = dce80_mem_input_create(ctx, as, i,
+		pool->base.mis[i] = dce80_mem_input_create(ctx, i,
 				&dce80_mi_reg_offsets[i]);
 		if (pool->base.mis[i] == NULL) {
 			BREAK_TO_DEBUGGER();
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.c b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.c
index 206c4ec584b8..e8fae0a7eeb4 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.c
@@ -32,7 +32,6 @@
 #include "dc_types.h"
 
 #include "include/grph_object_id.h"
-#include "include/adapter_service_interface.h"
 #include "include/logger_interface.h"
 #include "../dce110/dce110_timing_generator.h"
 #include "dce80_timing_generator.h"
@@ -152,7 +151,6 @@ static const struct timing_generator_funcs dce80_tg_funcs = {
 
 bool dce80_timing_generator_construct(
 	struct dce110_timing_generator *tg110,
-	struct adapter_service *as,
 	struct dc_context *ctx,
 	uint32_t instance,
 	const struct dce110_timing_generator_offsets *offsets)
@@ -160,9 +158,6 @@ bool dce80_timing_generator_construct(
 	if (!tg110)
 		return false;
 
-	if (!as)
-		return false;
-
 	tg110->controller_id = CONTROLLER_ID_D0 + instance;
 	tg110->base.inst = instance;
 	tg110->offsets = *offsets;
diff --git a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.h b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.h
index 86de41a3b31d..6e4722a970d7 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.h
+++ b/drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.h
@@ -32,7 +32,6 @@
 /* DCE8.0 implementation inherits from DCE11.0 */
 bool dce80_timing_generator_construct(
 	struct dce110_timing_generator *tg,
-	struct adapter_service *as,
 	struct dc_context *ctx,
 	uint32_t instance,
 	const struct dce110_timing_generator_offsets *offsets);
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c b/drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c
index c993c541dc7e..5ea7ea1e7814 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c
@@ -668,8 +668,7 @@ static uint32_t calculate_min_clock(
 }
 
 static bool display_clock_integrated_info_construct(
-	struct display_clock_dce110 *disp_clk,
-	struct adapter_service *as)
+	struct display_clock_dce110 *disp_clk)
 {
 	struct dc_debug *debug = &disp_clk->disp_clk_base.ctx->dc->debug;
 	struct dc_bios *bp = disp_clk->disp_clk_base.ctx->dc_bios;
@@ -926,15 +925,11 @@ static const struct display_clock_funcs funcs = {
 
 static bool dal_display_clock_dce110_construct(
 	struct display_clock_dce110 *dc110,
-	struct dc_context *ctx,
-	struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct display_clock *dc_base = &dc110->disp_clk_base;
 	struct dc_bios *bp = ctx->dc_bios;
 
-	if (NULL == as)
-		return false;
-
 	if (!dal_display_clock_construct_base(dc_base, ctx))
 		return false;
 
@@ -942,7 +937,7 @@ static bool dal_display_clock_dce110_construct(
 
 	dc110->dfs_bypass_disp_clk = 0;
 
-	if (!display_clock_integrated_info_construct(dc110, as))
+	if (!display_clock_integrated_info_construct(dc110))
 		dm_logger_write(dc_base->ctx->logger, LOG_WARNING,
 			"Cannot obtain VBIOS integrated info\n");
 
@@ -1023,8 +1018,7 @@ static bool dal_display_clock_dce110_construct(
  *****************************************************************************/
 
 struct display_clock *dal_display_clock_dce110_create(
-	struct dc_context *ctx,
-	struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct display_clock_dce110 *dc110;
 
@@ -1033,7 +1027,7 @@ struct display_clock *dal_display_clock_dce110_create(
 	if (dc110 == NULL)
 		return NULL;
 
-	if (dal_display_clock_dce110_construct(dc110, ctx, as))
+	if (dal_display_clock_dce110_construct(dc110, ctx))
 		return &dc110->disp_clk_base;
 
 	dm_free(dc110);
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c b/drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c
index f94da476c9a5..600a09cd6021 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c
@@ -948,8 +948,7 @@ bool dal_display_clock_dce112_construct(
  *****************************************************************************/
 
 struct display_clock *dal_display_clock_dce112_create(
-	struct dc_context *ctx,
-	struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct display_clock_dce112 *dc112;
 
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c b/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c
index 8fd78b8c93ae..fbac724a2407 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c
@@ -717,8 +717,7 @@ static void store_max_clocks_state(
 }
 
 static void display_clock_ss_construct(
-	struct display_clock_dce80 *disp_clk,
-	struct adapter_service *as)
+	struct display_clock_dce80 *disp_clk)
 {
 	struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios;
 	uint32_t ss_entry_num = bp->funcs->get_ss_entry_number(bp,
@@ -752,8 +751,7 @@ static void display_clock_ss_construct(
 }
 
 static bool display_clock_integrated_info_construct(
-	struct display_clock_dce80 *disp_clk,
-	struct adapter_service *as)
+	struct display_clock_dce80 *disp_clk)
 {
 	struct dc_debug *debug = &disp_clk->disp_clk.ctx->dc->debug;
 	struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios;
@@ -856,14 +854,10 @@ static const struct display_clock_funcs funcs = {
 
 static bool display_clock_construct(
 	struct dc_context *ctx,
-	struct display_clock_dce80 *disp_clk,
-	struct adapter_service *as)
+	struct display_clock_dce80 *disp_clk)
 {
 	struct display_clock *dc_base = &disp_clk->disp_clk;
 
-	if (NULL == as)
-		return false;
-
 	if (!dal_display_clock_construct_base(dc_base, ctx))
 		return false;
 
@@ -894,9 +888,9 @@ static bool display_clock_construct(
  * state dependent clocks.*/
 	disp_clk->cur_min_clks_state = CLOCKS_STATE_INVALID;
 
-	display_clock_ss_construct(disp_clk, as);
+	display_clock_ss_construct(disp_clk);
 
-	if (!display_clock_integrated_info_construct(disp_clk, as)) {
+	if (!display_clock_integrated_info_construct(disp_clk)) {
 		dm_logger_write(dc_base->ctx->logger, LOG_WARNING,
 			"Cannot obtain VBIOS integrated info");
 	}
@@ -923,8 +917,7 @@ static bool display_clock_construct(
 }
 
 struct display_clock *dal_display_clock_dce80_create(
-	struct dc_context *ctx,
-	struct adapter_service *as)
+	struct dc_context *ctx)
 {
 	struct display_clock_dce80 *disp_clk;
 
@@ -933,7 +926,7 @@ struct display_clock *dal_display_clock_dce80_create(
 	if (disp_clk == NULL)
 		return NULL;
 
-	if (display_clock_construct(ctx, disp_clk, as))
+	if (display_clock_construct(ctx, disp_clk))
 		return &disp_clk->disp_clk;
 
 	dm_free(disp_clk);
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h b/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h
index 2d687049e456..944dd0380413 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h
@@ -52,7 +52,6 @@ struct display_clock_dce80 {
 };
 
 struct display_clock *dal_display_clock_dce80_create(
-	struct dc_context *ctx,
-	struct adapter_service *as);
+	struct dc_context *ctx);
 
 #endif /* __DAL_DISPLAY_CLOCK_DCE80_H__ */
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c b/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c
index 08586fb3d18a..4929cd2aa3da 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c
@@ -26,8 +26,6 @@
 #include "dm_services.h"
 #include "display_clock.h"
 
-#include "adapter_service_interface.h"
-
 void dal_display_clock_base_set_dp_ref_clock_source(
 	struct display_clock *disp_clk,
 	enum clock_source_id clk_src)
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h b/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h
index 18b79fd3fcb8..663580d18a09 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h
@@ -63,7 +63,6 @@ struct display_clock {
 	const struct display_clock_funcs *funcs;
 	uint32_t min_display_clk_threshold_khz;
 	enum clock_source_id id;
-	struct adapter_service *as;
 
 	enum clocks_state cur_min_clks_state;
 };
diff --git a/drivers/gpu/drm/amd/dal/dc/inc/compressor.h b/drivers/gpu/drm/amd/dal/dc/inc/compressor.h
index a2e44b55c637..af292596b101 100644
--- a/drivers/gpu/drm/amd/dal/dc/inc/compressor.h
+++ b/drivers/gpu/drm/amd/dal/dc/inc/compressor.h
@@ -27,6 +27,7 @@
 #define __DAL_COMPRESSOR_H__
 
 #include "include/grph_object_id.h"
+#include "bios_parser_interface.h"
 
 enum fbc_compress_ratio {
 	FBC_COMPRESS_RATIO_INVALID = 0,
diff --git a/drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h b/drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h
index 9667f00e9447..edef4a41fe4f 100644
--- a/drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h
+++ b/drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h
@@ -22,7 +22,6 @@ struct core_stream;
 struct pipe_ctx;
 
 struct encoder_init_data {
-	struct adapter_service *adapter_service;
 	enum channel_id channel;
 	struct graphics_object_id connector;
 	enum hpd_source_id hpd_source;
diff --git a/drivers/gpu/drm/amd/dal/dc/virtual/virtual_link_encoder.c b/drivers/gpu/drm/amd/dal/dc/virtual/virtual_link_encoder.c
index 164f9eac1fd2..bb4433ff3b6e 100644
--- a/drivers/gpu/drm/amd/dal/dc/virtual/virtual_link_encoder.c
+++ b/drivers/gpu/drm/amd/dal/dc/virtual/virtual_link_encoder.c
@@ -136,8 +136,6 @@ bool virtual_link_encoder_construct(
 	enc->hpd_source = init_data->hpd_source;
 	enc->connector = init_data->connector;
 
-	enc->adapter_service = init_data->adapter_service;
-
 	enc->transmitter = init_data->transmitter;
 
 	enc->features.max_pixel_clock = VIRTUAL_MAX_PIXEL_CLK_IN_KHZ;
diff --git a/drivers/gpu/drm/amd/dal/include/bios_parser_interface.h b/drivers/gpu/drm/amd/dal/include/bios_parser_interface.h
index 7c0e1bf26485..d51101c5c6b0 100644
--- a/drivers/gpu/drm/amd/dal/include/bios_parser_interface.h
+++ b/drivers/gpu/drm/amd/dal/include/bios_parser_interface.h
@@ -28,7 +28,6 @@
 
 #include "dc_bios_types.h"
 
-struct adapter_service;
 struct bios_parser;
 
 struct bp_init_data {
diff --git a/drivers/gpu/drm/amd/dal/include/display_clock_interface.h b/drivers/gpu/drm/amd/dal/include/display_clock_interface.h
index 3d394bea324b..4556f4c8e388 100644
--- a/drivers/gpu/drm/amd/dal/include/display_clock_interface.h
+++ b/drivers/gpu/drm/amd/dal/include/display_clock_interface.h
@@ -118,16 +118,13 @@ struct display_clock_state {
 struct display_clock;
 
 struct display_clock *dal_display_clock_dce112_create(
-	struct dc_context *ctx,
-	struct adapter_service *as);
+	struct dc_context *ctx);
 
 struct display_clock *dal_display_clock_dce110_create(
-	struct dc_context *ctx,
-	struct adapter_service *as);
+	struct dc_context *ctx);
 
 struct display_clock *dal_display_clock_dce80_create(
-	struct dc_context *ctx,
-	struct adapter_service *as);
+	struct dc_context *ctx);
 
 void dal_display_clock_destroy(struct display_clock **to_destroy);
 bool dal_display_clock_validate(
-- 
2.10.1



More information about the amd-gfx mailing list