drm/amd/display: drop display_pipe_clocks.c.

This code isn't used at all in the kernel tree, perhaps it can wait to
be imported when it is. It also does a lot of floating point calcs,
so probably good to drop it until it's needed and we can ensure
proper fpu accessors.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile
index c6d9d9530d755c133d8921be6a6d7eb916578ce4..87bab8e8139fbb05e960a88d989455ef48371ae3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
@@ -13,7 +13,7 @@ CFLAGS_soc_bounding_box.o := -mhard-float -msse -mpreferred-stack-boundary=4
 CFLAGS_dml_common_defs.o := -mhard-float -msse -mpreferred-stack-boundary=4
 
 
-DML = display_mode_lib.o display_pipe_clocks.o display_rq_dlg_calc.o \
+DML = display_mode_lib.o display_rq_dlg_calc.o \
          display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
          soc_bounding_box.o dml_common_defs.o display_mode_vba.o
 

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
index 57f49d29c6b9d27c2c8145ac218a79e5e5704aa8..ed77f96016ddd55fb55f215fdd81db60977320f9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
@@ -29,7 +29,6 @@
 #include "dml_common_defs.h"
 #include "soc_bounding_box.h"
 #include "display_mode_vba.h"
-#include "display_pipe_clocks.h"
 #include "display_rq_dlg_calc.h"
 #include "dml1_display_rq_dlg_calc.h"
 

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c b/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c
deleted file mode 100644 (file)
index 30c379d..0000000
--- a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2017 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 "display_pipe_clocks.h"
-#include "display_mode_lib.h"
-#include "soc_bounding_box.h"
-
-display_pipe_clock_st dml_clks_get_pipe_clocks(
-               struct display_mode_lib *mode_lib,
-               display_e2e_pipe_params_st *e2e,
-               unsigned int num_pipes)
-{
-       display_pipe_clock_st clocks;
-       bool visited[DC__NUM_PIPES__MAX];
-       double max_dispclk = 25.0; //the min dispclk is 25MHz, so keep the min dispclk caculated larger thant 25MHz
-       double dcfclk, socclk;
-       unsigned int i, j, k;
-       unsigned int dsc_inst = 0;
-
-       DTRACE("Calculating pipe clocks...");
-
-       dcfclk = dml_socbb_voltage_scaling(
-                       &mode_lib->soc,
-                       (enum voltage_state) e2e[0].clks_cfg.voltage).dcfclk_mhz;
-       socclk = dml_socbb_voltage_scaling(
-                       &mode_lib->soc,
-                       (enum voltage_state) e2e[0].clks_cfg.voltage).socclk_mhz;
-       clocks.dcfclk_mhz = dcfclk;
-       clocks.socclk_mhz = socclk;
-
-       max_dispclk = dml_max(max_dispclk, get_dispclk_calculated(mode_lib, e2e, num_pipes));
-       clocks.dispclk_mhz = max_dispclk;
-       DTRACE("  dispclk: %f Mhz", clocks.dispclk_mhz);
-       DTRACE("  dcfclk: %f Mhz", clocks.dcfclk_mhz);
-       DTRACE("  socclk: %f Mhz", clocks.socclk_mhz);
-
-       for (k = 0; k < num_pipes; ++k)
-               visited[k] = false;
-
-       for (i = 0; i < num_pipes; i++) {
-               clocks.dppclk_mhz[i] = get_dppclk_calculated(mode_lib, e2e, num_pipes, i);
-               DTRACE("  dppclk%d: %f Mhz", i, clocks.dppclk_mhz[i]);
-
-               if (e2e[i].pipe.src.is_hsplit && !visited[i]) {
-                       unsigned int grp = e2e[i].pipe.src.hsplit_grp;
-
-                       for (j = i; j < num_pipes; j++) {
-                               if (e2e[j].pipe.src.hsplit_grp == grp && e2e[j].pipe.src.is_hsplit
-                                               && !visited[j]) {
-                                       clocks.dscclk_mhz[j] = get_dscclk_calculated(
-                                                       mode_lib,
-                                                       e2e,
-                                                       num_pipes,
-                                                       dsc_inst);
-                                       DTRACE("  dscclk%d: %f Mhz", j, clocks.dscclk_mhz[j]);
-                                       visited[j] = true;
-                               }
-                       }
-                       dsc_inst++;
-               }
-
-               if (!visited[i]) {
-                       unsigned int otg_inst = e2e[i].pipe.dest.otg_inst;
-
-                       for (j = i; j < num_pipes; j++) {
-                               // assign dscclk to all planes with this otg, except if they're doing odm combine, or mpc combine
-                               // which is handled by the conditions above, the odm_combine is not required, but it helps make sense of this code
-                               if (e2e[j].pipe.dest.otg_inst == otg_inst
-                                               && !e2e[j].pipe.dest.odm_combine && !visited[j]) {
-                                       clocks.dscclk_mhz[j] = get_dscclk_calculated(
-                                                       mode_lib,
-                                                       e2e,
-                                                       num_pipes,
-                                                       dsc_inst);
-                                       DTRACE("  dscclk%d: %f Mhz", j, clocks.dscclk_mhz[j]);
-                                       visited[j] = true;
-                               }
-                       }
-                       dsc_inst++;
-               }
-       }
-
-       return clocks;
-}

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h b/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h
deleted file mode 100644 (file)
index a712dc3..0000000
--- a/drivers/gpu/drm/amd/display/dc/dml/display_pipe_clocks.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2017 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 __DISPLAY_PIPE_CLOCKS_H__
-#define __DISPLAY_PIPE_CLOCKS_H__
-
-#include "dml_common_defs.h"
-
-struct display_mode_lib;
-
-display_pipe_clock_st dml_clks_get_pipe_clocks(
-               struct display_mode_lib *mode_lib,
-               display_e2e_pipe_params_st *e2e,
-               unsigned int num_pipes);
-
-#endif