mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 18:43:33 +02:00
drm/i915: Improve PPS debugs
Always include both the encoder and PPS instance information
in the debug prints so that we know what piece of hardware
we're actually dealing with.
v2: Make sure pps is selected before debug prints/etc. in
intel_pps_vdd_on_unlocked() on vlv/chv
There is no pps on pipe C on chv
v3: Allow PPS=INVALID_PIPE for vlv/chv
Cc: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221127155239.26973-1-ville.syrjala@linux.intel.com
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
This commit is contained in:
Ville Syrjälä
parent
ed5509d1d4
commit
4c0eb35fc1
|
|
@ -22,6 +22,40 @@ static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv,
|
|||
static void pps_init_delays(struct intel_dp *intel_dp);
|
||||
static void pps_init_registers(struct intel_dp *intel_dp, bool force_disable_vdd);
|
||||
|
||||
static const char *pps_name(struct drm_i915_private *i915,
|
||||
struct intel_pps *pps)
|
||||
{
|
||||
if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) {
|
||||
switch (pps->pps_pipe) {
|
||||
case INVALID_PIPE:
|
||||
/*
|
||||
* FIXME would be nice if we can guarantee
|
||||
* to always have a valid PPS when calling this.
|
||||
*/
|
||||
return "PPS <none>";
|
||||
case PIPE_A:
|
||||
return "PPS A";
|
||||
case PIPE_B:
|
||||
return "PPS B";
|
||||
default:
|
||||
MISSING_CASE(pps->pps_pipe);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
switch (pps->pps_idx) {
|
||||
case 0:
|
||||
return "PPS 0";
|
||||
case 1:
|
||||
return "PPS 1";
|
||||
default:
|
||||
MISSING_CASE(pps->pps_idx);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return "PPS <invalid>";
|
||||
}
|
||||
|
||||
intel_wakeref_t intel_pps_lock(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
|
|
@ -60,15 +94,15 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)
|
|||
|
||||
if (drm_WARN(&dev_priv->drm,
|
||||
intel_de_read(dev_priv, intel_dp->output_reg) & DP_PORT_EN,
|
||||
"skipping pipe %c power sequencer kick due to [ENCODER:%d:%s] being active\n",
|
||||
pipe_name(pipe), dig_port->base.base.base.id,
|
||||
dig_port->base.base.name))
|
||||
"skipping %s kick due to [ENCODER:%d:%s] being active\n",
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
dig_port->base.base.base.id, dig_port->base.base.name))
|
||||
return;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"kicking pipe %c power sequencer for [ENCODER:%d:%s]\n",
|
||||
pipe_name(pipe), dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
"kicking %s for [ENCODER:%d:%s]\n",
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
dig_port->base.base.base.id, dig_port->base.base.name);
|
||||
|
||||
/* Preserve the BIOS-computed detected bit. This is
|
||||
* supposed to be read-only.
|
||||
|
|
@ -95,7 +129,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)
|
|||
|
||||
if (vlv_force_pll_on(dev_priv, pipe, vlv_get_dpll(dev_priv))) {
|
||||
drm_err(&dev_priv->drm,
|
||||
"Failed to force on pll for pipe %c!\n",
|
||||
"Failed to force on PLL for pipe %c!\n",
|
||||
pipe_name(pipe));
|
||||
return;
|
||||
}
|
||||
|
|
@ -190,10 +224,9 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
|
|||
intel_dp->pps.pps_pipe = pipe;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"picked pipe %c power sequencer for [ENCODER:%d:%s]\n",
|
||||
pipe_name(intel_dp->pps.pps_pipe),
|
||||
dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
"picked %s for [ENCODER:%d:%s]\n",
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
dig_port->base.base.base.id, dig_port->base.base.name);
|
||||
|
||||
/* init power sequencer on this pipe and port */
|
||||
pps_init_delays(intel_dp);
|
||||
|
|
@ -297,17 +330,15 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
|
|||
/* didn't find one? just let vlv_power_sequencer_pipe() pick one when needed */
|
||||
if (intel_dp->pps.pps_pipe == INVALID_PIPE) {
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"no initial power sequencer for [ENCODER:%d:%s]\n",
|
||||
dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
"[ENCODER:%d:%s] no initial power sequencer\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name);
|
||||
return;
|
||||
}
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"initial power sequencer for [ENCODER:%d:%s]: pipe %c\n",
|
||||
dig_port->base.base.base.id,
|
||||
dig_port->base.base.name,
|
||||
pipe_name(intel_dp->pps.pps_pipe));
|
||||
"[ENCODER:%d:%s] initial power sequencer: %s\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
}
|
||||
|
||||
static int intel_num_pps(struct drm_i915_private *i915)
|
||||
|
|
@ -386,14 +417,14 @@ pps_initial_setup(struct intel_dp *intel_dp)
|
|||
intel_dp->pps.pps_idx = bxt_initial_pps_idx(i915, pps_any);
|
||||
|
||||
drm_dbg_kms(&i915->drm,
|
||||
"[ENCODER:%d:%s] no initial power sequencer, assuming %d\n",
|
||||
"[ENCODER:%d:%s] no initial power sequencer, assuming %s\n",
|
||||
encoder->base.base.id, encoder->base.name,
|
||||
intel_dp->pps.pps_idx);
|
||||
pps_name(i915, &intel_dp->pps));
|
||||
} else {
|
||||
drm_dbg_kms(&i915->drm,
|
||||
"[ENCODER:%d:%s] initial power sequencer: %d\n",
|
||||
"[ENCODER:%d:%s] initial power sequencer: %s\n",
|
||||
encoder->base.base.id, encoder->base.name,
|
||||
intel_dp->pps.pps_idx);
|
||||
pps_name(i915, &intel_dp->pps));
|
||||
}
|
||||
|
||||
return intel_pps_is_valid(intel_dp);
|
||||
|
|
@ -520,15 +551,20 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp)
|
|||
void intel_pps_check_power_unlocked(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
|
||||
if (!intel_dp_is_edp(intel_dp))
|
||||
return;
|
||||
|
||||
if (!edp_have_panel_power(intel_dp) && !edp_have_panel_vdd(intel_dp)) {
|
||||
drm_WARN(&dev_priv->drm, 1,
|
||||
"eDP powered off while attempting aux channel communication.\n");
|
||||
"[ENCODER:%d:%s] %s powered off while attempting AUX CH communication.\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
"[ENCODER:%d:%s] %s PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
intel_de_read(dev_priv, _pp_stat_reg(intel_dp)),
|
||||
intel_de_read(dev_priv, _pp_ctrl_reg(intel_dp)));
|
||||
}
|
||||
|
|
@ -546,10 +582,10 @@ void intel_pps_check_power_unlocked(struct intel_dp *intel_dp)
|
|||
static void intel_pps_verify_state(struct intel_dp *intel_dp);
|
||||
|
||||
static void wait_panel_status(struct intel_dp *intel_dp,
|
||||
u32 mask,
|
||||
u32 value)
|
||||
u32 mask, u32 value)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
i915_reg_t pp_stat_reg, pp_ctrl_reg;
|
||||
|
||||
lockdep_assert_held(&dev_priv->display.pps.mutex);
|
||||
|
|
@ -560,7 +596,9 @@ static void wait_panel_status(struct intel_dp *intel_dp,
|
|||
pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"mask: 0x%08x value: 0x%08x PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
"[ENCODER:%d:%s] %s mask: 0x%08x value: 0x%08x PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
mask, value,
|
||||
intel_de_read(dev_priv, pp_stat_reg),
|
||||
intel_de_read(dev_priv, pp_ctrl_reg));
|
||||
|
|
@ -568,7 +606,9 @@ static void wait_panel_status(struct intel_dp *intel_dp,
|
|||
if (intel_de_wait_for_register(dev_priv, pp_stat_reg,
|
||||
mask, value, 5000))
|
||||
drm_err(&dev_priv->drm,
|
||||
"Panel status timeout: PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
"[ENCODER:%d:%s] %s panel status timeout: PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
intel_de_read(dev_priv, pp_stat_reg),
|
||||
intel_de_read(dev_priv, pp_ctrl_reg));
|
||||
|
||||
|
|
@ -578,26 +618,35 @@ static void wait_panel_status(struct intel_dp *intel_dp,
|
|||
static void wait_panel_on(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
|
||||
drm_dbg_kms(&i915->drm, "Wait for panel power on\n");
|
||||
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] %s wait for panel power on\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(i915, &intel_dp->pps));
|
||||
wait_panel_status(intel_dp, IDLE_ON_MASK, IDLE_ON_VALUE);
|
||||
}
|
||||
|
||||
static void wait_panel_off(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
|
||||
drm_dbg_kms(&i915->drm, "Wait for panel power off time\n");
|
||||
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] %s wait for panel power off time\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(i915, &intel_dp->pps));
|
||||
wait_panel_status(intel_dp, IDLE_OFF_MASK, IDLE_OFF_VALUE);
|
||||
}
|
||||
|
||||
static void wait_panel_power_cycle(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
ktime_t panel_power_on_time;
|
||||
s64 panel_power_off_duration;
|
||||
|
||||
drm_dbg_kms(&i915->drm, "Wait for panel power cycle\n");
|
||||
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] %s wait for panel power cycle\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(i915, &intel_dp->pps));
|
||||
|
||||
/* take the difference of current time and panel power off time
|
||||
* and then make panel wait for t11_t12 if needed. */
|
||||
|
|
@ -684,9 +733,12 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
|
|||
intel_dp->pps.vdd_wakeref = intel_display_power_get(dev_priv,
|
||||
intel_aux_power_domain(dig_port));
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm, "Turning [ENCODER:%d:%s] VDD on\n",
|
||||
dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
pp_stat_reg = _pp_stat_reg(intel_dp);
|
||||
pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] %s turning VDD on\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
|
||||
if (!edp_have_panel_power(intel_dp))
|
||||
wait_panel_power_cycle(intel_dp);
|
||||
|
|
@ -694,12 +746,11 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
|
|||
pp = ilk_get_pp_control(intel_dp);
|
||||
pp |= EDP_FORCE_VDD;
|
||||
|
||||
pp_stat_reg = _pp_stat_reg(intel_dp);
|
||||
pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
|
||||
|
||||
intel_de_write(dev_priv, pp_ctrl_reg, pp);
|
||||
intel_de_posting_read(dev_priv, pp_ctrl_reg);
|
||||
drm_dbg_kms(&dev_priv->drm, "PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] %s PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
intel_de_read(dev_priv, pp_stat_reg),
|
||||
intel_de_read(dev_priv, pp_ctrl_reg));
|
||||
/*
|
||||
|
|
@ -707,9 +758,9 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
|
|||
*/
|
||||
if (!edp_have_panel_power(intel_dp)) {
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"[ENCODER:%d:%s] panel power wasn't enabled\n",
|
||||
dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
"[ENCODER:%d:%s] %s panel power wasn't enabled\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
msleep(intel_dp->pps.panel_power_up_delay);
|
||||
}
|
||||
|
||||
|
|
@ -724,6 +775,7 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp)
|
|||
*/
|
||||
void intel_pps_vdd_on(struct intel_dp *intel_dp)
|
||||
{
|
||||
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
|
||||
intel_wakeref_t wakeref;
|
||||
bool vdd;
|
||||
|
||||
|
|
@ -733,9 +785,10 @@ void intel_pps_vdd_on(struct intel_dp *intel_dp)
|
|||
vdd = false;
|
||||
with_intel_pps_lock(intel_dp, wakeref)
|
||||
vdd = intel_pps_vdd_on_unlocked(intel_dp);
|
||||
I915_STATE_WARN(!vdd, "[ENCODER:%d:%s] VDD already requested on\n",
|
||||
I915_STATE_WARN(!vdd, "[ENCODER:%d:%s] %s VDD already requested on\n",
|
||||
dp_to_dig_port(intel_dp)->base.base.base.id,
|
||||
dp_to_dig_port(intel_dp)->base.base.name);
|
||||
dp_to_dig_port(intel_dp)->base.base.name,
|
||||
pps_name(i915, &intel_dp->pps));
|
||||
}
|
||||
|
||||
static void intel_pps_vdd_off_sync_unlocked(struct intel_dp *intel_dp)
|
||||
|
|
@ -753,9 +806,9 @@ static void intel_pps_vdd_off_sync_unlocked(struct intel_dp *intel_dp)
|
|||
if (!edp_have_panel_vdd(intel_dp))
|
||||
return;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm, "Turning [ENCODER:%d:%s] VDD off\n",
|
||||
dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] %s turning VDD off\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
|
||||
pp = ilk_get_pp_control(intel_dp);
|
||||
pp &= ~EDP_FORCE_VDD;
|
||||
|
|
@ -767,7 +820,9 @@ static void intel_pps_vdd_off_sync_unlocked(struct intel_dp *intel_dp)
|
|||
intel_de_posting_read(dev_priv, pp_ctrl_reg);
|
||||
|
||||
/* Make sure sequencer is idle before allowing subsequent activity */
|
||||
drm_dbg_kms(&dev_priv->drm, "PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] %s PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
intel_de_read(dev_priv, pp_stat_reg),
|
||||
intel_de_read(dev_priv, pp_ctrl_reg));
|
||||
|
||||
|
|
@ -842,9 +897,10 @@ void intel_pps_vdd_off_unlocked(struct intel_dp *intel_dp, bool sync)
|
|||
if (!intel_dp_is_edp(intel_dp))
|
||||
return;
|
||||
|
||||
I915_STATE_WARN(!intel_dp->pps.want_panel_vdd, "[ENCODER:%d:%s] VDD not forced on",
|
||||
I915_STATE_WARN(!intel_dp->pps.want_panel_vdd, "[ENCODER:%d:%s] %s VDD not forced on",
|
||||
dp_to_dig_port(intel_dp)->base.base.base.id,
|
||||
dp_to_dig_port(intel_dp)->base.base.name);
|
||||
dp_to_dig_port(intel_dp)->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
|
||||
intel_dp->pps.want_panel_vdd = false;
|
||||
|
||||
|
|
@ -865,14 +921,16 @@ void intel_pps_on_unlocked(struct intel_dp *intel_dp)
|
|||
if (!intel_dp_is_edp(intel_dp))
|
||||
return;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm, "Turn [ENCODER:%d:%s] panel power on\n",
|
||||
drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] %s turn panel power on\n",
|
||||
dp_to_dig_port(intel_dp)->base.base.base.id,
|
||||
dp_to_dig_port(intel_dp)->base.base.name);
|
||||
dp_to_dig_port(intel_dp)->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
|
||||
if (drm_WARN(&dev_priv->drm, edp_have_panel_power(intel_dp),
|
||||
"[ENCODER:%d:%s] panel power already on\n",
|
||||
"[ENCODER:%d:%s] %s panel power already on\n",
|
||||
dp_to_dig_port(intel_dp)->base.base.base.id,
|
||||
dp_to_dig_port(intel_dp)->base.base.name))
|
||||
dp_to_dig_port(intel_dp)->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps)))
|
||||
return;
|
||||
|
||||
wait_panel_power_cycle(intel_dp);
|
||||
|
|
@ -926,12 +984,14 @@ void intel_pps_off_unlocked(struct intel_dp *intel_dp)
|
|||
if (!intel_dp_is_edp(intel_dp))
|
||||
return;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm, "Turn [ENCODER:%d:%s] panel power off\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name);
|
||||
drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] %s turn panel power off\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
|
||||
drm_WARN(&dev_priv->drm, !intel_dp->pps.want_panel_vdd,
|
||||
"Need [ENCODER:%d:%s] VDD to turn off panel\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name);
|
||||
"[ENCODER:%d:%s] %s need VDD to turn off panel\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
|
||||
pp = ilk_get_pp_control(intel_dp);
|
||||
/* We need to switch off panel power _and_ force vdd, for otherwise some
|
||||
|
|
@ -1066,9 +1126,9 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
|
|||
* from a port.
|
||||
*/
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"detaching pipe %c power sequencer from [ENCODER:%d:%s]\n",
|
||||
pipe_name(pipe), dig_port->base.base.base.id,
|
||||
dig_port->base.base.name);
|
||||
"detaching %s from [ENCODER:%d:%s]\n",
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
dig_port->base.base.base.id, dig_port->base.base.name);
|
||||
intel_de_write(dev_priv, pp_on_reg, 0);
|
||||
intel_de_posting_read(dev_priv, pp_on_reg);
|
||||
|
||||
|
|
@ -1086,7 +1146,7 @@ static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv,
|
|||
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
||||
|
||||
drm_WARN(&dev_priv->drm, intel_dp->pps.active_pipe == pipe,
|
||||
"stealing pipe %c power sequencer from active [ENCODER:%d:%s]\n",
|
||||
"stealing PPS %c from active [ENCODER:%d:%s]\n",
|
||||
pipe_name(pipe), encoder->base.base.id,
|
||||
encoder->base.name);
|
||||
|
||||
|
|
@ -1094,7 +1154,7 @@ static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv,
|
|||
continue;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"stealing pipe %c power sequencer from [ENCODER:%d:%s]\n",
|
||||
"stealing PPS %c from [ENCODER:%d:%s]\n",
|
||||
pipe_name(pipe), encoder->base.base.id,
|
||||
encoder->base.name);
|
||||
|
||||
|
|
@ -1139,9 +1199,9 @@ void vlv_pps_init(struct intel_encoder *encoder,
|
|||
intel_dp->pps.pps_pipe = crtc->pipe;
|
||||
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"initializing pipe %c power sequencer for [ENCODER:%d:%s]\n",
|
||||
pipe_name(intel_dp->pps.pps_pipe), encoder->base.base.id,
|
||||
encoder->base.name);
|
||||
"initializing %s for [ENCODER:%d:%s]\n",
|
||||
pps_name(dev_priv, &intel_dp->pps),
|
||||
encoder->base.base.id, encoder->base.name);
|
||||
|
||||
/* init power sequencer on this pipe and port */
|
||||
pps_init_delays(intel_dp);
|
||||
|
|
@ -1165,7 +1225,9 @@ static void pps_vdd_init(struct intel_dp *intel_dp)
|
|||
* indefinitely.
|
||||
*/
|
||||
drm_dbg_kms(&dev_priv->drm,
|
||||
"VDD left on by BIOS, adjusting state tracking\n");
|
||||
"[ENCODER:%d:%s] %s VDD left on by BIOS, adjusting state tracking\n",
|
||||
dig_port->base.base.base.id, dig_port->base.base.name,
|
||||
pps_name(dev_priv, &intel_dp->pps));
|
||||
drm_WARN_ON(&dev_priv->drm, intel_dp->pps.vdd_wakeref);
|
||||
intel_dp->pps.vdd_wakeref = intel_display_power_get(dev_priv,
|
||||
intel_aux_power_domain(dig_port));
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user