Commit 8de358cb authored by Lucas De Marchi's avatar Lucas De Marchi

drm/i915/display: remove explicit CNL handling from intel_dpll_mgr.c

The only real platform with DISPLAY_VER == 10 is GLK. We don't need to
handle CNL explicitly in intel_ddi.c.

A lot of special code for CNL can be removed. There were some
__cnl.*() functions that were created to share the implementation
between ICL and CNL. Those are now embedded in the only caller, in ICL.

Remove code and rename functions/macros accordingly to use ICL prefix
for those that are still needed.

Verified with:

	make EXTRA_CFLAGS=-Wunused drivers/gpu/drm/i915/display/intel_dpll_mgr.o
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210729233934.2059489-1-lucas.demarchi@intel.com
parent 94a79070
...@@ -10631,7 +10631,7 @@ enum skl_power_gate { ...@@ -10631,7 +10631,7 @@ enum skl_power_gate {
ADLS_DPCLKA_DDIJ_SEL_MASK, \ ADLS_DPCLKA_DDIJ_SEL_MASK, \
ADLS_DPCLKA_DDIK_SEL_MASK) ADLS_DPCLKA_DDIK_SEL_MASK)
/* CNL PLL */ /* ICL PLL */
#define DPLL0_ENABLE 0x46010 #define DPLL0_ENABLE 0x46010
#define DPLL1_ENABLE 0x46014 #define DPLL1_ENABLE 0x46014
#define _ADLS_DPLL2_ENABLE 0x46018 #define _ADLS_DPLL2_ENABLE 0x46018
...@@ -10640,7 +10640,7 @@ enum skl_power_gate { ...@@ -10640,7 +10640,7 @@ enum skl_power_gate {
#define PLL_LOCK (1 << 30) #define PLL_LOCK (1 << 30)
#define PLL_POWER_ENABLE (1 << 27) #define PLL_POWER_ENABLE (1 << 27)
#define PLL_POWER_STATE (1 << 26) #define PLL_POWER_STATE (1 << 26)
#define CNL_DPLL_ENABLE(pll) _MMIO_PLL3(pll, DPLL0_ENABLE, DPLL1_ENABLE, \ #define ICL_DPLL_ENABLE(pll) _MMIO_PLL3(pll, DPLL0_ENABLE, DPLL1_ENABLE, \
_ADLS_DPLL2_ENABLE, _ADLS_DPLL3_ENABLE) _ADLS_DPLL2_ENABLE, _ADLS_DPLL3_ENABLE)
#define _DG2_PLL3_ENABLE 0x4601C #define _DG2_PLL3_ENABLE 0x4601C
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment