UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: split cdclk functions from display vtable. 

This moves all the cdclk related functions into their own vtable.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/591b7b6a79c4ab644a161ae00b7d630b3ef16434.1632869550.git.jani.nikula@intel.com
This commit is contained in:
Dave Airlie 2021-09-29 01:57:55 +03:00 committed by Jani Nikula
parent 7b75709ac8
commit 89ac34c14d
2 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
drivers/gpu/drm/i915/display/intel_cdclk.c
View File

@ -62,32 +62,32 @@
void intel_cdclk_get_cdclk(struct drm_i915_private *dev_priv, void intel_cdclk_get_cdclk(struct drm_i915_private *dev_priv,
struct intel_cdclk_config *cdclk_config) struct intel_cdclk_config *cdclk_config)
{ {
dev_priv->display.get_cdclk(dev_priv, cdclk_config); dev_priv->cdclk_funcs.get_cdclk(dev_priv, cdclk_config);
} }
int intel_cdclk_bw_calc_min_cdclk(struct intel_atomic_state *state) int intel_cdclk_bw_calc_min_cdclk(struct intel_atomic_state *state)
{ {
struct drm_i915_private *dev_priv = to_i915(state->base.dev); struct drm_i915_private *dev_priv = to_i915(state->base.dev);
return dev_priv->display.bw_calc_min_cdclk(state); return dev_priv->cdclk_funcs.bw_calc_min_cdclk(state);
} }
static void intel_cdclk_set_cdclk(struct drm_i915_private *dev_priv, static void intel_cdclk_set_cdclk(struct drm_i915_private *dev_priv,
const struct intel_cdclk_config *cdclk_config, const struct intel_cdclk_config *cdclk_config,
enum pipe pipe) enum pipe pipe)
{ {
dev_priv->display.set_cdclk(dev_priv, cdclk_config, pipe); dev_priv->cdclk_funcs.set_cdclk(dev_priv, cdclk_config, pipe);
} }
static int intel_cdclk_modeset_calc_cdclk(struct drm_i915_private *dev_priv, static int intel_cdclk_modeset_calc_cdclk(struct drm_i915_private *dev_priv,
struct intel_cdclk_state *cdclk_config) struct intel_cdclk_state *cdclk_config)
{ {
return dev_priv->display.modeset_calc_cdclk(cdclk_config); return dev_priv->cdclk_funcs.modeset_calc_cdclk(cdclk_config);
} }
static u8 intel_cdclk_calc_voltage_level(struct drm_i915_private *dev_priv, static u8 intel_cdclk_calc_voltage_level(struct drm_i915_private *dev_priv,
int cdclk) int cdclk)
{ {
return dev_priv->display.calc_voltage_level(cdclk); return dev_priv->cdclk_funcs.calc_voltage_level(cdclk);
} }
static void fixed_133mhz_get_cdclk(struct drm_i915_private *dev_priv, static void fixed_133mhz_get_cdclk(struct drm_i915_private *dev_priv,
@ -1963,7 +1963,7 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,
if (!intel_cdclk_changed(&dev_priv->cdclk.hw, cdclk_config)) if (!intel_cdclk_changed(&dev_priv->cdclk.hw, cdclk_config))
return; return;
if (drm_WARN_ON_ONCE(&dev_priv->drm, !dev_priv->display.set_cdclk)) if (drm_WARN_ON_ONCE(&dev_priv->drm, !dev_priv->cdclk_funcs.set_cdclk))
return; return;
intel_dump_cdclk_config(cdclk_config, "Changing CDCLK to"); intel_dump_cdclk_config(cdclk_config, "Changing CDCLK to");
@ -2891,119 +2891,119 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)
void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
{ {
if (IS_DG2(dev_priv)) { if (IS_DG2(dev_priv)) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
dev_priv->cdclk.table = dg2_cdclk_table; dev_priv->cdclk.table = dg2_cdclk_table;
} else if (IS_ALDERLAKE_P(dev_priv)) { } else if (IS_ALDERLAKE_P(dev_priv)) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
/* Wa_22011320316:adl-p[a0] */ /* Wa_22011320316:adl-p[a0] */
if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
dev_priv->cdclk.table = adlp_a_step_cdclk_table; dev_priv->cdclk.table = adlp_a_step_cdclk_table;
else else
dev_priv->cdclk.table = adlp_cdclk_table; dev_priv->cdclk.table = adlp_cdclk_table;
} else if (IS_ROCKETLAKE(dev_priv)) { } else if (IS_ROCKETLAKE(dev_priv)) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
dev_priv->cdclk.table = rkl_cdclk_table; dev_priv->cdclk.table = rkl_cdclk_table;
} else if (DISPLAY_VER(dev_priv) >= 12) { } else if (DISPLAY_VER(dev_priv) >= 12) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
dev_priv->cdclk.table = icl_cdclk_table; dev_priv->cdclk.table = icl_cdclk_table;
} else if (IS_JSL_EHL(dev_priv)) { } else if (IS_JSL_EHL(dev_priv)) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = ehl_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = ehl_calc_voltage_level;
dev_priv->cdclk.table = icl_cdclk_table; dev_priv->cdclk.table = icl_cdclk_table;
} else if (DISPLAY_VER(dev_priv) >= 11) { } else if (DISPLAY_VER(dev_priv) >= 11) {
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = icl_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = icl_calc_voltage_level;
dev_priv->cdclk.table = icl_cdclk_table; dev_priv->cdclk.table = icl_cdclk_table;
} else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
dev_priv->display.calc_voltage_level = bxt_calc_voltage_level; dev_priv->cdclk_funcs.calc_voltage_level = bxt_calc_voltage_level;
if (IS_GEMINILAKE(dev_priv)) if (IS_GEMINILAKE(dev_priv))
dev_priv->cdclk.table = glk_cdclk_table; dev_priv->cdclk.table = glk_cdclk_table;
else else
dev_priv->cdclk.table = bxt_cdclk_table; dev_priv->cdclk.table = bxt_cdclk_table;
} else if (DISPLAY_VER(dev_priv) == 9) { } else if (DISPLAY_VER(dev_priv) == 9) {
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
dev_priv->display.set_cdclk = skl_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = skl_set_cdclk;
dev_priv->display.modeset_calc_cdclk = skl_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = skl_modeset_calc_cdclk;
} else if (IS_BROADWELL(dev_priv)) { } else if (IS_BROADWELL(dev_priv)) {
dev_priv->display.bw_calc_min_cdclk = intel_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
dev_priv->display.set_cdclk = bdw_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = bdw_set_cdclk;
dev_priv->display.modeset_calc_cdclk = bdw_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = bdw_modeset_calc_cdclk;
} else if (IS_CHERRYVIEW(dev_priv)) { } else if (IS_CHERRYVIEW(dev_priv)) {
dev_priv->display.bw_calc_min_cdclk = intel_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
dev_priv->display.set_cdclk = chv_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = chv_set_cdclk;
dev_priv->display.modeset_calc_cdclk = vlv_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = vlv_modeset_calc_cdclk;
} else if (IS_VALLEYVIEW(dev_priv)) { } else if (IS_VALLEYVIEW(dev_priv)) {
dev_priv->display.bw_calc_min_cdclk = intel_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
dev_priv->display.set_cdclk = vlv_set_cdclk; dev_priv->cdclk_funcs.set_cdclk = vlv_set_cdclk;
dev_priv->display.modeset_calc_cdclk = vlv_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = vlv_modeset_calc_cdclk;
} else { } else {
dev_priv->display.bw_calc_min_cdclk = intel_bw_calc_min_cdclk; dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
dev_priv->display.modeset_calc_cdclk = fixed_modeset_calc_cdclk; dev_priv->cdclk_funcs.modeset_calc_cdclk = fixed_modeset_calc_cdclk;
} }
if (DISPLAY_VER(dev_priv) >= 10 || IS_BROXTON(dev_priv)) if (DISPLAY_VER(dev_priv) >= 10 || IS_BROXTON(dev_priv))
dev_priv->display.get_cdclk = bxt_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = bxt_get_cdclk;
else if (DISPLAY_VER(dev_priv) == 9) else if (DISPLAY_VER(dev_priv) == 9)
dev_priv->display.get_cdclk = skl_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = skl_get_cdclk;
else if (IS_BROADWELL(dev_priv)) else if (IS_BROADWELL(dev_priv))
dev_priv->display.get_cdclk = bdw_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = bdw_get_cdclk;
else if (IS_HASWELL(dev_priv)) else if (IS_HASWELL(dev_priv))
dev_priv->display.get_cdclk = hsw_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = hsw_get_cdclk;
else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
dev_priv->display.get_cdclk = vlv_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = vlv_get_cdclk;
else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv))
dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_400mhz_get_cdclk;
else if (IS_IRONLAKE(dev_priv)) else if (IS_IRONLAKE(dev_priv))
dev_priv->display.get_cdclk = fixed_450mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_450mhz_get_cdclk;
else if (IS_GM45(dev_priv)) else if (IS_GM45(dev_priv))
dev_priv->display.get_cdclk = gm45_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = gm45_get_cdclk;
else if (IS_G45(dev_priv)) else if (IS_G45(dev_priv))
dev_priv->display.get_cdclk = g33_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = g33_get_cdclk;
else if (IS_I965GM(dev_priv)) else if (IS_I965GM(dev_priv))
dev_priv->display.get_cdclk = i965gm_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = i965gm_get_cdclk;
else if (IS_I965G(dev_priv)) else if (IS_I965G(dev_priv))
dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_400mhz_get_cdclk;
else if (IS_PINEVIEW(dev_priv)) else if (IS_PINEVIEW(dev_priv))
dev_priv->display.get_cdclk = pnv_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = pnv_get_cdclk;
else if (IS_G33(dev_priv)) else if (IS_G33(dev_priv))
dev_priv->display.get_cdclk = g33_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = g33_get_cdclk;
else if (IS_I945GM(dev_priv)) else if (IS_I945GM(dev_priv))
dev_priv->display.get_cdclk = i945gm_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = i945gm_get_cdclk;
else if (IS_I945G(dev_priv)) else if (IS_I945G(dev_priv))
dev_priv->display.get_cdclk = fixed_400mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_400mhz_get_cdclk;
else if (IS_I915GM(dev_priv)) else if (IS_I915GM(dev_priv))
dev_priv->display.get_cdclk = i915gm_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = i915gm_get_cdclk;
else if (IS_I915G(dev_priv)) else if (IS_I915G(dev_priv))
dev_priv->display.get_cdclk = fixed_333mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_333mhz_get_cdclk;
else if (IS_I865G(dev_priv)) else if (IS_I865G(dev_priv))
dev_priv->display.get_cdclk = fixed_266mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_266mhz_get_cdclk;
else if (IS_I85X(dev_priv)) else if (IS_I85X(dev_priv))
dev_priv->display.get_cdclk = i85x_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = i85x_get_cdclk;
else if (IS_I845G(dev_priv)) else if (IS_I845G(dev_priv))
dev_priv->display.get_cdclk = fixed_200mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_200mhz_get_cdclk;
else if (IS_I830(dev_priv)) else if (IS_I830(dev_priv))
dev_priv->display.get_cdclk = fixed_133mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_133mhz_get_cdclk;
if (drm_WARN(&dev_priv->drm, !dev_priv->display.get_cdclk, if (drm_WARN(&dev_priv->drm, !dev_priv->cdclk_funcs.get_cdclk,
"Unknown platform. Assuming 133 MHz CDCLK\n")) "Unknown platform. Assuming 133 MHz CDCLK\n"))
dev_priv->display.get_cdclk = fixed_133mhz_get_cdclk; dev_priv->cdclk_funcs.get_cdclk = fixed_133mhz_get_cdclk;
} }

8
drivers/gpu/drm/i915/i915_drv.h
View File

@ -373,7 +373,7 @@ struct intel_audio_funcs {
const struct drm_connector_state *old_conn_state); const struct drm_connector_state *old_conn_state);
}; };
struct drm_i915_display_funcs { struct intel_cdclk_funcs {
void (*get_cdclk)(struct drm_i915_private *dev_priv, void (*get_cdclk)(struct drm_i915_private *dev_priv,
struct intel_cdclk_config *cdclk_config); struct intel_cdclk_config *cdclk_config);
void (*set_cdclk)(struct drm_i915_private *dev_priv, void (*set_cdclk)(struct drm_i915_private *dev_priv,
@ -382,6 +382,9 @@ struct drm_i915_display_funcs {
int (*bw_calc_min_cdclk)(struct intel_atomic_state *state); int (*bw_calc_min_cdclk)(struct intel_atomic_state *state);
int (*modeset_calc_cdclk)(struct intel_cdclk_state *state); int (*modeset_calc_cdclk)(struct intel_cdclk_state *state);
u8 (*calc_voltage_level)(int cdclk); u8 (*calc_voltage_level)(int cdclk);
};
struct drm_i915_display_funcs {
/* Returns the active state of the crtc, and if the crtc is active, /* Returns the active state of the crtc, and if the crtc is active,
* fills out the pipe-config with the hw state. */ * fills out the pipe-config with the hw state. */
bool (*get_pipe_config)(struct intel_crtc *, bool (*get_pipe_config)(struct intel_crtc *,
@ -984,6 +987,9 @@ struct drm_i915_private {
/* Display internal audio functions */ /* Display internal audio functions */
struct intel_audio_funcs audio_funcs; struct intel_audio_funcs audio_funcs;
/* Display CDCLK functions */
struct intel_cdclk_funcs cdclk_funcs;
/* PCH chipset type */ /* PCH chipset type */
enum intel_pch pch_type; enum intel_pch pch_type;
unsigned short pch_id; unsigned short pch_id;