From: Dmytro Laktyushkin <Dmytro.Laktyushkin@xxxxxxx>
Change-Id: I186c3293c76b3233360a182c9ca902e1d5b63e10
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin at amd.com>
Reviewed-by: Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin at amd.com>
Reviewed-by: Reviewed-by: Jordan Lazare <Jordan.Lazare at amd.com>
Acked-by: Harry Wentland <harry.wentland at amd.com>
---
drivers/gpu/drm/amd/dal/dc/gpu/Makefile | 2 +-
.../gpu/drm/amd/dal/dc/gpu/dc_clock_generator.c | 71 ----------------------
.../gpu/drm/amd/dal/dc/gpu/dc_clock_generator.h | 54 ----------------
.../amd/dal/include/dc_clock_generator_interface.h | 68 ---------------------
4 files changed, 1 insertion(+), 194 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.h
delete mode 100644 drivers/gpu/drm/amd/dal/include/dc_clock_generator_interface.h
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/Makefile b/drivers/gpu/drm/amd/dal/dc/gpu/Makefile
index ec2ef4994ade..51805c36c5f5 100644
--- a/drivers/gpu/drm/amd/dal/dc/gpu/Makefile
+++ b/drivers/gpu/drm/amd/dal/dc/gpu/Makefile
@@ -3,7 +3,7 @@
# It provides the control and status of HW adapter resources,
# that are global for the ASIC and sharable between pipes.
-GPU = dc_clock_generator.o display_clock.o divider_range.o
+GPU = display_clock.o divider_range.o
AMD_DAL_GPU = $(addprefix $(AMDDALPATH)/dc/gpu/,$(GPU))
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.c b/drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.c
deleted file mode 100644
index 67cdc8fb647a..000000000000
--- a/drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#include "dm_services.h"
-
-#include "dc_clock_generator.h"
-
-void dal_dc_clock_generator_destroy(struct dc_clock_generator **dc)
-{
- if (dc == NULL || *dc == NULL) {
- BREAK_TO_DEBUGGER();
- return;
- }
-
- (*dc)->funcs->destroy(dc);
-
- *dc = NULL;
-}
-
-void dal_dc_clock_generator_set_display_pipe_mapping(
- struct dc_clock_generator *dc_clk_gen,
- struct dccg_mapping_params *params)
-{
- dc_clk_gen->funcs->set_display_pipe_mapping(dc_clk_gen, params);
-}
-
-bool dal_dc_clock_generator_get_dp_ref_clk_ds_params(
- struct dc_clock_generator *dc_clk_gen,
- struct dccg_dp_ref_clk_ds_params *params)
-{
- return dc_clk_gen->funcs->get_dp_ref_clk_ds_params(dc_clk_gen, params);
-}
-
-void dal_dc_clock_generator_base_set_display_pipe_mapping(
- struct dc_clock_generator *base,
- struct dccg_mapping_params *params)
-{
-
-}
-
-bool dal_dc_clock_generator_construct_base(
- struct dc_clock_generator *base,
- struct dc_context *ctx
-)
-{
- base->ctx = ctx;
- return true;
-}
-
diff --git a/drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.h b/drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.h
deleted file mode 100644
index bc0419cc0a10..000000000000
--- a/drivers/gpu/drm/amd/dal/dc/gpu/dc_clock_generator.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DAL_DC_CLOCK_GENERATOR_H__
-#define __DAL_DC_CLOCK_GENERATOR_H__
-
-#include "include/dc_clock_generator_interface.h"
-
-struct dc_clock_generator_funcs {
- void (*destroy)(struct dc_clock_generator **to_destroy);
-
- void (*set_display_pipe_mapping)(
- struct dc_clock_generator *dc_clk_gen,
- struct dccg_mapping_params *params);
-
- bool (*get_dp_ref_clk_ds_params)(
- struct dc_clock_generator *dc_clk_gen,
- struct dccg_dp_ref_clk_ds_params *params);
-};
-struct dc_clock_generator {
- const struct dc_clock_generator_funcs *funcs;
- struct dc_context *ctx;
-};
-bool dal_dc_clock_generator_construct_base(
- struct dc_clock_generator *base,
- struct dc_context *ctx
-);
-void dal_dc_clock_generator_base_set_display_pipe_mapping(
- struct dc_clock_generator *base,
- struct dccg_mapping_params *params);
-
-#endif
diff --git a/drivers/gpu/drm/amd/dal/include/dc_clock_generator_interface.h b/drivers/gpu/drm/amd/dal/include/dc_clock_generator_interface.h
deleted file mode 100644
index a5fbaf02eb34..000000000000
--- a/drivers/gpu/drm/amd/dal/include/dc_clock_generator_interface.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2012-15 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: AMD
- *
- */
-
-#ifndef __DC_CLOCK_GENERATOR_INTERFACE_H__
-#define __DC_CLOCK_GENERATOR_INTERFACE_H__
-
-#include "grph_object_ctrl_defs.h"
-#include "set_mode_types.h"
-
-/* Parameter for programming the DCCP_DISP_SLOW_SELECT*/
-struct dccg_mapping_params {
- uint32_t controllers_num;
- enum controller_id *controllers;
-};
-
-/* Parameters related to HW DeSpread of DP Reference Clock*/
-struct dccg_dp_ref_clk_ds_params {
- struct {
- /* Flag for Enabled SS on DP Reference Clock*/
- bool SS_ENABLED:1;
- /* Flag for HW De Spread enabled
- * (if enabled SS on DP Reference Clock)*/
- bool DS_ENABLED:1;
- /* Flag for HW De Spread Calculations enabled for DS_DTO_INCR
- * and DS_DTO_MODULO (if 0 SW programs DS_DTO_INCR and
- * DS_DTO_MODULO)*/
- bool DS_CALCULATIONS:1;
- } flags;
- /*DP Reference clock SS percentage
- * (if enabled downspread on DP Reference Clock)*/
- uint32_t ss_percentage;
- /*DP Reference clock SS percentage Divider (1000 or 100)*/
- uint32_t ss_percentage_divider;
-};
-
-struct dc_clock_generator;
-
-void dal_dc_clock_generator_destroy(struct dc_clock_generator **dc);
-void dal_dc_clock_generator_set_display_pipe_mapping(
- struct dc_clock_generator *dc_clk_gen,
- struct dccg_mapping_params *params);
-bool dal_dc_clock_generator_get_dp_ref_clk_ds_params(
- struct dc_clock_generator *dc_clk_gen,
- struct dccg_dp_ref_clk_ds_params *params);
-
-#endif /* __DC_CLOCK_GENERATOR_INTERFACE_H__ */
--
2.10.1
