leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/snps: convert to drm device based logging

Browse Source 
Prefer drm device based logging. Do some dev_priv->i915 conversions
while at it.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ca6908452a63bd74a9c9d75ecd295182c80c7205.1642769982.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula
2022-01-21 15:00:30 +02:00
parent 17dd7b896a
commit c5274e86da
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/i915/display/intel_snps_phy.c
View File

@@ -24,17 +24,17 @@
* since it is not handled by the shared DPLL framework as on other platforms. * since it is not handled by the shared DPLL framework as on other platforms.
*/ */
void intel_snps_phy_wait_for_calibration(struct drm_i915_private *dev_priv) void intel_snps_phy_wait_for_calibration(struct drm_i915_private *i915)
{ {
enum phy phy; enum phy phy;
for_each_phy_masked(phy, ~0) { for_each_phy_masked(phy, ~0) {
if (!intel_phy_is_snps(dev_priv, phy)) if (!intel_phy_is_snps(i915, phy))
continue; continue;
if (intel_de_wait_for_clear(dev_priv, ICL_PHY_MISC(phy), if (intel_de_wait_for_clear(i915, ICL_PHY_MISC(phy),
DG2_PHY_DP_TX_ACK_MASK, 25)) DG2_PHY_DP_TX_ACK_MASK, 25))
DRM_ERROR("SNPS PHY %c failed to calibrate after 25ms.\n", drm_err(&i915->drm, "SNPS PHY %c failed to calibrate after 25ms.\n",
phy); phy);
} }
} }
@@ -776,6 +776,7 @@ intel_mpllb_tables_get(struct intel_crtc_state *crtc_state,
int intel_mpllb_calc_state(struct intel_crtc_state *crtc_state, int intel_mpllb_calc_state(struct intel_crtc_state *crtc_state,
struct intel_encoder *encoder) struct intel_encoder *encoder)
{ {
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
const struct intel_mpllb_state * const *tables; const struct intel_mpllb_state * const *tables;
int i; int i;
@@ -787,7 +788,7 @@ int intel_mpllb_calc_state(struct intel_crtc_state *crtc_state,
* until we have a proper algorithm under a valid * until we have a proper algorithm under a valid
* license. * license.
*/ */
DRM_DEBUG_KMS("Can't support HDMI link rate %d\n", drm_dbg_kms(&i915->drm, "Can't support HDMI link rate %d\n",
crtc_state->port_clock); crtc_state->port_clock);
return -EINVAL; return -EINVAL;
} }
@@ -855,7 +856,7 @@ void intel_mpllb_enable(struct intel_encoder *encoder,
* dp_mpllb_state interface signal. * dp_mpllb_state interface signal.
*/ */
if (intel_de_wait_for_set(dev_priv, enable_reg, PLL_LOCK, 5)) if (intel_de_wait_for_set(dev_priv, enable_reg, PLL_LOCK, 5))
DRM_ERROR("Port %c PLL not locked\n", phy_name(phy)); drm_dbg_kms(&dev_priv->drm, "Port %c PLL not locked\n", phy_name(phy));
/* /*
* 11. If the frequency will result in a change to the voltage * 11. If the frequency will result in a change to the voltage
@@ -868,8 +869,8 @@ void intel_mpllb_enable(struct intel_encoder *encoder,
void intel_mpllb_disable(struct intel_encoder *encoder) void intel_mpllb_disable(struct intel_encoder *encoder)
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
enum phy phy = intel_port_to_phy(dev_priv, encoder->port); enum phy phy = intel_port_to_phy(i915, encoder->port);
i915_reg_t enable_reg = (phy <= PHY_D ? i915_reg_t enable_reg = (phy <= PHY_D ?
DG2_PLL_ENABLE(phy) : MG_PLL_ENABLE(0)); DG2_PLL_ENABLE(phy) : MG_PLL_ENABLE(0));
@@ -882,21 +883,21 @@ void intel_mpllb_disable(struct intel_encoder *encoder)
*/ */
/* 2. Software programs DPLL_ENABLE [PLL Enable] to "0" */ /* 2. Software programs DPLL_ENABLE [PLL Enable] to "0" */
intel_uncore_rmw(&dev_priv->uncore, enable_reg, PLL_ENABLE, 0); intel_uncore_rmw(&i915->uncore, enable_reg, PLL_ENABLE, 0);
/* /*
* 4. Software programs SNPS_PHY_MPLLB_DIV dp_mpllb_force_en to "0". * 4. Software programs SNPS_PHY_MPLLB_DIV dp_mpllb_force_en to "0".
* This will allow the PLL to stop running. * This will allow the PLL to stop running.
*/ */
intel_uncore_rmw(&dev_priv->uncore, SNPS_PHY_MPLLB_DIV(phy), intel_uncore_rmw(&i915->uncore, SNPS_PHY_MPLLB_DIV(phy),
SNPS_PHY_MPLLB_FORCE_EN, 0); SNPS_PHY_MPLLB_FORCE_EN, 0);
/* /*
* 5. Software polls DPLL_ENABLE [PLL Lock] for PHY acknowledgment * 5. Software polls DPLL_ENABLE [PLL Lock] for PHY acknowledgment
* (dp_txX_ack) that the new transmitter setting request is completed. * (dp_txX_ack) that the new transmitter setting request is completed.
*/ */
if (intel_de_wait_for_clear(dev_priv, enable_reg, PLL_LOCK, 5)) if (intel_de_wait_for_clear(i915, enable_reg, PLL_LOCK, 5))
DRM_ERROR("Port %c PLL not locked\n", phy_name(phy)); drm_err(&i915->drm, "Port %c PLL not locked\n", phy_name(phy));
/* /*
* 6. If the frequency will result in a change to the voltage * 6. If the frequency will result in a change to the voltage