Skip to content

L
linux
Commit bdc6114e authored by Wambui Karuga's avatar Wambui Karuga Committed by Jani Nikula
Browse files
Options

drm/i915/dp: conversion to struct drm_device logging macros. 

This converts various instances of printk based logging macros in
i915/display/intel_dp.c with the new struct drm_device based logging
macros using the following coccinelle script:
@rule1@
identifier fn, T;
@@

fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

@rule2@
identifier fn, T;
@@

fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

New checkpatch warnings were fixed manually.

v2: fix merge conflict with new changes in file.
Signed-off-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-5-wambui.karugax@gmail.com
parent 569caa65
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 152 deletions
drivers/gpu/drm/i915/display/intel_dp.c
View file @ bdc6114e
...@@ -514,12 +514,13 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915, ...@@ -514,12 +514,13 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,
*/ */
bits_per_pixel = (link_clock * lane_count * 8) / bits_per_pixel = (link_clock * lane_count * 8) /
intel_dp_mode_to_fec_clock(mode_clock); intel_dp_mode_to_fec_clock(mode_clock);
DRM_DEBUG_KMS("Max link bpp: %u\n", bits_per_pixel); drm_dbg_kms(&i915->drm, "Max link bpp: %u\n", bits_per_pixel);
/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ /* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */
max_bpp_small_joiner_ram = small_joiner_ram_size_bits(i915) / max_bpp_small_joiner_ram = small_joiner_ram_size_bits(i915) /
mode_hdisplay; mode_hdisplay;
DRM_DEBUG_KMS("Max small joiner bpp: %u\n", max_bpp_small_joiner_ram); drm_dbg_kms(&i915->drm, "Max small joiner bpp: %u\n",
max_bpp_small_joiner_ram);
/* /*
* Greatest allowed DSC BPP = MIN (output BPP from available Link BW * Greatest allowed DSC BPP = MIN (output BPP from available Link BW
...@@ -529,8 +530,8 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915, ...@@ -529,8 +530,8 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,
/* Error out if the max bpp is less than smallest allowed valid bpp */ /* Error out if the max bpp is less than smallest allowed valid bpp */
if (bits_per_pixel < valid_dsc_bpp[0]) { if (bits_per_pixel < valid_dsc_bpp[0]) {
DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n", drm_dbg_kms(&i915->drm, "Unsupported BPP %u, min %u\n",
bits_per_pixel, valid_dsc_bpp[0]); bits_per_pixel, valid_dsc_bpp[0]);
return 0; return 0;
} }
...@@ -761,9 +762,10 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp) ...@@ -761,9 +762,10 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)
intel_dig_port->base.base.name)) intel_dig_port->base.base.name))
return; return;
DRM_DEBUG_KMS("kicking pipe %c power sequencer for [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
pipe_name(pipe), intel_dig_port->base.base.base.id, "kicking pipe %c power sequencer for [ENCODER:%d:%s]\n",
intel_dig_port->base.base.name); pipe_name(pipe), intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name);
/* Preserve the BIOS-computed detected bit. This is /* Preserve the BIOS-computed detected bit. This is
* supposed to be read-only. * supposed to be read-only.
...@@ -790,8 +792,9 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp) ...@@ -790,8 +792,9 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)
if (vlv_force_pll_on(dev_priv, pipe, IS_CHERRYVIEW(dev_priv) ? if (vlv_force_pll_on(dev_priv, pipe, IS_CHERRYVIEW(dev_priv) ?
&chv_dpll[0].dpll : &vlv_dpll[0].dpll)) { &chv_dpll[0].dpll : &vlv_dpll[0].dpll)) {
DRM_ERROR("Failed to force on pll for pipe %c!\n", drm_err(&dev_priv->drm,
pipe_name(pipe)); "Failed to force on pll for pipe %c!\n",
pipe_name(pipe));
return; return;
} }
} }
...@@ -881,10 +884,11 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp) ...@@ -881,10 +884,11 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
vlv_steal_power_sequencer(dev_priv, pipe); vlv_steal_power_sequencer(dev_priv, pipe);
intel_dp->pps_pipe = pipe; intel_dp->pps_pipe = pipe;
DRM_DEBUG_KMS("picked pipe %c power sequencer for [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
pipe_name(intel_dp->pps_pipe), "picked pipe %c power sequencer for [ENCODER:%d:%s]\n",
intel_dig_port->base.base.base.id, pipe_name(intel_dp->pps_pipe),
intel_dig_port->base.base.name); intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name);
/* init power sequencer on this pipe and port */ /* init power sequencer on this pipe and port */
intel_dp_init_panel_power_sequencer(intel_dp); intel_dp_init_panel_power_sequencer(intel_dp);
...@@ -992,16 +996,18 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp) ...@@ -992,16 +996,18 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)
/* didn't find one? just let vlv_power_sequencer_pipe() pick one when needed */ /* didn't find one? just let vlv_power_sequencer_pipe() pick one when needed */
if (intel_dp->pps_pipe == INVALID_PIPE) { if (intel_dp->pps_pipe == INVALID_PIPE) {
DRM_DEBUG_KMS("no initial power sequencer for [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
intel_dig_port->base.base.base.id, "no initial power sequencer for [ENCODER:%d:%s]\n",
intel_dig_port->base.base.name); intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name);
return; return;
} }
DRM_DEBUG_KMS("initial power sequencer for [ENCODER:%d:%s]: pipe %c\n", drm_dbg_kms(&dev_priv->drm,
intel_dig_port->base.base.base.id, "initial power sequencer for [ENCODER:%d:%s]: pipe %c\n",
intel_dig_port->base.base.name, intel_dig_port->base.base.base.id,
pipe_name(intel_dp->pps_pipe)); intel_dig_port->base.base.name,
pipe_name(intel_dp->pps_pipe));
intel_dp_init_panel_power_sequencer(intel_dp); intel_dp_init_panel_power_sequencer(intel_dp);
intel_dp_init_panel_power_sequencer_registers(intel_dp, false); intel_dp_init_panel_power_sequencer_registers(intel_dp, false);
...@@ -1163,9 +1169,9 @@ intel_dp_check_edp(struct intel_dp *intel_dp) ...@@ -1163,9 +1169,9 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
if (!edp_have_panel_power(intel_dp) && !edp_have_panel_vdd(intel_dp)) { if (!edp_have_panel_power(intel_dp) && !edp_have_panel_vdd(intel_dp)) {
WARN(1, "eDP powered off while attempting aux channel communication.\n"); WARN(1, "eDP powered off while attempting aux channel communication.\n");
DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n", drm_dbg_kms(&dev_priv->drm, "Status 0x%08x Control 0x%08x\n",
I915_READ(_pp_stat_reg(intel_dp)), I915_READ(_pp_stat_reg(intel_dp)),
I915_READ(_pp_ctrl_reg(intel_dp))); I915_READ(_pp_ctrl_reg(intel_dp)));
} }
} }
...@@ -1186,8 +1192,9 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) ...@@ -1186,8 +1192,9 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp)
trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true); trace_i915_reg_rw(false, ch_ctl, status, sizeof(status), true);
if (!done) if (!done)
DRM_ERROR("%s did not complete or timeout within %ums (status 0x%08x)\n", drm_err(&i915->drm,
intel_dp->aux.name, timeout_ms, status); "%s did not complete or timeout within %ums (status 0x%08x)\n",
intel_dp->aux.name, timeout_ms, status);
#undef C #undef C
return status; return status;
...@@ -1435,7 +1442,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, ...@@ -1435,7 +1442,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
} }
if ((status & DP_AUX_CH_CTL_DONE) == 0) { if ((status & DP_AUX_CH_CTL_DONE) == 0) {
DRM_ERROR("dp_aux_ch not done status 0x%08x\n", status); drm_err(&i915->drm, "dp_aux_ch not done status 0x%08x\n",
status);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -1445,7 +1453,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, ...@@ -1445,7 +1453,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
* Timeouts occur when the sink is not connected * Timeouts occur when the sink is not connected
*/ */
if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) {
DRM_ERROR("dp_aux_ch receive error status 0x%08x\n", status); drm_err(&i915->drm, "dp_aux_ch receive error status 0x%08x\n",
status);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
...@@ -1453,7 +1462,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, ...@@ -1453,7 +1462,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
/* Timeouts occur when the device isn't connected, so they're /* Timeouts occur when the device isn't connected, so they're
* "normal" -- don't fill the kernel log with these */ * "normal" -- don't fill the kernel log with these */
if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) { if (status & DP_AUX_CH_CTL_TIME_OUT_ERROR) {
DRM_DEBUG_KMS("dp_aux_ch timeout status 0x%08x\n", status); drm_dbg_kms(&i915->drm, "dp_aux_ch timeout status 0x%08x\n",
status);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto out; goto out;
} }
...@@ -1468,8 +1478,9 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, ...@@ -1468,8 +1478,9 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
* drm layer takes care for the necessary retries. * drm layer takes care for the necessary retries.
*/ */
if (recv_bytes == 0 || recv_bytes > 20) { if (recv_bytes == 0 || recv_bytes > 20) {
DRM_DEBUG_KMS("Forbidden recv_bytes = %d on aux transaction\n", drm_dbg_kms(&i915->drm,
recv_bytes); "Forbidden recv_bytes = %d on aux transaction\n",
recv_bytes);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -1913,8 +1924,9 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, ...@@ -1913,8 +1924,9 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,
/* Get bpp from vbt only for panels that dont have bpp in edid */ /* Get bpp from vbt only for panels that dont have bpp in edid */
if (intel_connector->base.display_info.bpc == 0 && if (intel_connector->base.display_info.bpc == 0 &&
dev_priv->vbt.edp.bpp && dev_priv->vbt.edp.bpp < bpp) { dev_priv->vbt.edp.bpp && dev_priv->vbt.edp.bpp < bpp) {
DRM_DEBUG_KMS("clamping bpp for eDP panel to BIOS-provided %i\n", drm_dbg_kms(&dev_priv->drm,
dev_priv->vbt.edp.bpp); "clamping bpp for eDP panel to BIOS-provided %i\n",
dev_priv->vbt.edp.bpp);
bpp = dev_priv->vbt.edp.bpp; bpp = dev_priv->vbt.edp.bpp;
} }
} }
...@@ -2110,7 +2122,8 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, ...@@ -2110,7 +2122,8 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
/* Min Input BPC for ICL+ is 8 */ /* Min Input BPC for ICL+ is 8 */
if (pipe_bpp < 8 * 3) { if (pipe_bpp < 8 * 3) {
DRM_DEBUG_KMS("No DSC support for less than 8bpc\n"); drm_dbg_kms(&dev_priv->drm,
"No DSC support for less than 8bpc\n");
return -EINVAL; return -EINVAL;
} }
...@@ -2145,7 +2158,8 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, ...@@ -2145,7 +2158,8 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
adjusted_mode->crtc_clock, adjusted_mode->crtc_clock,
adjusted_mode->crtc_hdisplay); adjusted_mode->crtc_hdisplay);
if (!dsc_max_output_bpp || !dsc_dp_slice_count) { if (!dsc_max_output_bpp || !dsc_dp_slice_count) {
DRM_DEBUG_KMS("Compressed BPP/Slice Count not supported\n"); drm_dbg_kms(&dev_priv->drm,
"Compressed BPP/Slice Count not supported\n");
return -EINVAL; return -EINVAL;
} }
pipe_config->dsc.compressed_bpp = min_t(u16, pipe_config->dsc.compressed_bpp = min_t(u16,
...@@ -2162,26 +2176,28 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, ...@@ -2162,26 +2176,28 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
if (pipe_config->dsc.slice_count > 1) { if (pipe_config->dsc.slice_count > 1) {
pipe_config->dsc.dsc_split = true; pipe_config->dsc.dsc_split = true;
} else { } else {
DRM_DEBUG_KMS("Cannot split stream to use 2 VDSC instances\n"); drm_dbg_kms(&dev_priv->drm,
"Cannot split stream to use 2 VDSC instances\n");
return -EINVAL; return -EINVAL;
} }
} }
ret = intel_dp_dsc_compute_params(&dig_port->base, pipe_config); ret = intel_dp_dsc_compute_params(&dig_port->base, pipe_config);
if (ret < 0) { if (ret < 0) {
DRM_DEBUG_KMS("Cannot compute valid DSC parameters for Input Bpp = %d " drm_dbg_kms(&dev_priv->drm,
"Compressed BPP = %d\n", "Cannot compute valid DSC parameters for Input Bpp = %d "
pipe_config->pipe_bpp, "Compressed BPP = %d\n",
pipe_config->dsc.compressed_bpp); pipe_config->pipe_bpp,
pipe_config->dsc.compressed_bpp);
return ret; return ret;
} }
pipe_config->dsc.compression_enable = true; pipe_config->dsc.compression_enable = true;
DRM_DEBUG_KMS("DP DSC computed with Input Bpp = %d " drm_dbg_kms(&dev_priv->drm, "DP DSC computed with Input Bpp = %d "
"Compressed Bpp = %d Slice Count = %d\n", "Compressed Bpp = %d Slice Count = %d\n",
pipe_config->pipe_bpp, pipe_config->pipe_bpp,
pipe_config->dsc.compressed_bpp, pipe_config->dsc.compressed_bpp,
pipe_config->dsc.slice_count); pipe_config->dsc.slice_count);
return 0; return 0;
} }
...@@ -2585,18 +2601,20 @@ static void wait_panel_status(struct intel_dp *intel_dp, ...@@ -2585,18 +2601,20 @@ static void wait_panel_status(struct intel_dp *intel_dp,
pp_stat_reg = _pp_stat_reg(intel_dp); pp_stat_reg = _pp_stat_reg(intel_dp);
pp_ctrl_reg = _pp_ctrl_reg(intel_dp); pp_ctrl_reg = _pp_ctrl_reg(intel_dp);
DRM_DEBUG_KMS("mask %08x value %08x status %08x control %08x\n", drm_dbg_kms(&dev_priv->drm,
mask, value, "mask %08x value %08x status %08x control %08x\n",
I915_READ(pp_stat_reg), mask, value,
I915_READ(pp_ctrl_reg)); I915_READ(pp_stat_reg),
I915_READ(pp_ctrl_reg));
if (intel_de_wait_for_register(dev_priv, pp_stat_reg, if (intel_de_wait_for_register(dev_priv, pp_stat_reg,
mask, value, 5000)) mask, value, 5000))
DRM_ERROR("Panel status timeout: status %08x control %08x\n", drm_err(&dev_priv->drm,
I915_READ(pp_stat_reg), "Panel status timeout: status %08x control %08x\n",
I915_READ(pp_ctrl_reg)); I915_READ(pp_stat_reg),
I915_READ(pp_ctrl_reg));
DRM_DEBUG_KMS("Wait complete\n"); drm_dbg_kms(&dev_priv->drm, "Wait complete\n");
} }
static void wait_panel_on(struct intel_dp *intel_dp) static void wait_panel_on(struct intel_dp *intel_dp)
...@@ -2691,9 +2709,9 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp) ...@@ -2691,9 +2709,9 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
intel_display_power_get(dev_priv, intel_display_power_get(dev_priv,
intel_aux_power_domain(intel_dig_port)); intel_aux_power_domain(intel_dig_port));
DRM_DEBUG_KMS("Turning [ENCODER:%d:%s] VDD on\n", drm_dbg_kms(&dev_priv->drm, "Turning [ENCODER:%d:%s] VDD on\n",
intel_dig_port->base.base.base.id, intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name); intel_dig_port->base.base.name);
if (!edp_have_panel_power(intel_dp)) if (!edp_have_panel_power(intel_dp))
wait_panel_power_cycle(intel_dp); wait_panel_power_cycle(intel_dp);
...@@ -2706,15 +2724,16 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp) ...@@ -2706,15 +2724,16 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)
I915_WRITE(pp_ctrl_reg, pp); I915_WRITE(pp_ctrl_reg, pp);
POSTING_READ(pp_ctrl_reg); POSTING_READ(pp_ctrl_reg);
DRM_DEBUG_KMS("PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n", drm_dbg_kms(&dev_priv->drm, "PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg)); I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));
/* /*
* If the panel wasn't on, delay before accessing aux channel * If the panel wasn't on, delay before accessing aux channel
*/ */
if (!edp_have_panel_power(intel_dp)) { if (!edp_have_panel_power(intel_dp)) {
DRM_DEBUG_KMS("[ENCODER:%d:%s] panel power wasn't enabled\n", drm_dbg_kms(&dev_priv->drm,
intel_dig_port->base.base.base.id, "[ENCODER:%d:%s] panel power wasn't enabled\n",
intel_dig_port->base.base.name); intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name);
msleep(intel_dp->panel_power_up_delay); msleep(intel_dp->panel_power_up_delay);
} }
...@@ -2759,9 +2778,9 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) ...@@ -2759,9 +2778,9 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
if (!edp_have_panel_vdd(intel_dp)) if (!edp_have_panel_vdd(intel_dp))
return; return;
DRM_DEBUG_KMS("Turning [ENCODER:%d:%s] VDD off\n", drm_dbg_kms(&dev_priv->drm, "Turning [ENCODER:%d:%s] VDD off\n",
intel_dig_port->base.base.base.id, intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name); intel_dig_port->base.base.name);
pp = ilk_get_pp_control(intel_dp); pp = ilk_get_pp_control(intel_dp);
pp &= ~EDP_FORCE_VDD; pp &= ~EDP_FORCE_VDD;
...@@ -2773,8 +2792,8 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) ...@@ -2773,8 +2792,8 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)
POSTING_READ(pp_ctrl_reg); POSTING_READ(pp_ctrl_reg);
/* Make sure sequencer is idle before allowing subsequent activity */ /* Make sure sequencer is idle before allowing subsequent activity */
DRM_DEBUG_KMS("PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n", drm_dbg_kms(&dev_priv->drm, "PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg)); I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));
if ((pp & PANEL_POWER_ON) == 0) if ((pp & PANEL_POWER_ON) == 0)
intel_dp->panel_power_off_time = ktime_get_boottime(); intel_dp->panel_power_off_time = ktime_get_boottime();
...@@ -2846,9 +2865,9 @@ static void edp_panel_on(struct intel_dp *intel_dp) ...@@ -2846,9 +2865,9 @@ static void edp_panel_on(struct intel_dp *intel_dp)
if (!intel_dp_is_edp(intel_dp)) if (!intel_dp_is_edp(intel_dp))
return; return;
DRM_DEBUG_KMS("Turn [ENCODER:%d:%s] panel power on\n", drm_dbg_kms(&dev_priv->drm, "Turn [ENCODER:%d:%s] panel power on\n",
dp_to_dig_port(intel_dp)->base.base.base.id, 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);
if (WARN(edp_have_panel_power(intel_dp), if (WARN(edp_have_panel_power(intel_dp),
"[ENCODER:%d:%s] panel power already on\n", "[ENCODER:%d:%s] panel power already on\n",
...@@ -2908,8 +2927,8 @@ static void edp_panel_off(struct intel_dp *intel_dp) ...@@ -2908,8 +2927,8 @@ static void edp_panel_off(struct intel_dp *intel_dp)
if (!intel_dp_is_edp(intel_dp)) if (!intel_dp_is_edp(intel_dp))
return; return;
DRM_DEBUG_KMS("Turn [ENCODER:%d:%s] panel power off\n", 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); dig_port->base.base.base.id, dig_port->base.base.name);
WARN(!intel_dp->want_panel_vdd, "Need [ENCODER:%d:%s] VDD to turn off panel\n", WARN(!intel_dp->want_panel_vdd, "Need [ENCODER:%d:%s] VDD to turn off panel\n",
dig_port->base.base.base.id, dig_port->base.base.name); dig_port->base.base.base.id, dig_port->base.base.name);
...@@ -3084,8 +3103,8 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp, ...@@ -3084,8 +3103,8 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp,
assert_dp_port_disabled(intel_dp); assert_dp_port_disabled(intel_dp);
assert_edp_pll_disabled(dev_priv); assert_edp_pll_disabled(dev_priv);
DRM_DEBUG_KMS("enabling eDP PLL for clock %d\n", drm_dbg_kms(&dev_priv->drm, "enabling eDP PLL for clock %d\n",
pipe_config->port_clock); pipe_config->port_clock);
intel_dp->DP &= ~DP_PLL_FREQ_MASK; intel_dp->DP &= ~DP_PLL_FREQ_MASK;
...@@ -3124,7 +3143,7 @@ static void ilk_edp_pll_off(struct intel_dp *intel_dp, ...@@ -3124,7 +3143,7 @@ static void ilk_edp_pll_off(struct intel_dp *intel_dp,
assert_dp_port_disabled(intel_dp); assert_dp_port_disabled(intel_dp);
assert_edp_pll_enabled(dev_priv); assert_edp_pll_enabled(dev_priv);
DRM_DEBUG_KMS("disabling eDP PLL\n"); drm_dbg_kms(&dev_priv->drm, "disabling eDP PLL\n");
intel_dp->DP &= ~DP_PLL_ENABLE; intel_dp->DP &= ~DP_PLL_ENABLE;
...@@ -3217,7 +3236,8 @@ static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv, ...@@ -3217,7 +3236,8 @@ static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,
} }
} }
DRM_DEBUG_KMS("No pipe for DP port %c found\n", port_name(port)); drm_dbg_kms(&dev_priv->drm, "No pipe for DP port %c found\n",
port_name(port));
/* must initialize pipe to something for the asserts */ /* must initialize pipe to something for the asserts */
*pipe = PIPE_A; *pipe = PIPE_A;
...@@ -3348,8 +3368,9 @@ static void intel_dp_get_config(struct intel_encoder *encoder, ...@@ -3348,8 +3368,9 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
* up by the BIOS, and thus we can't get the mode at module * up by the BIOS, and thus we can't get the mode at module
* load. * load.
*/ */
DRM_DEBUG_KMS("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n", drm_dbg_kms(&dev_priv->drm,
pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp); "pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp);
dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp; dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp;
} }
} }
...@@ -3442,8 +3463,9 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, ...@@ -3442,8 +3463,9 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,
u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd); u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd);
if (dp_train_pat & train_pat_mask) if (dp_train_pat & train_pat_mask)
DRM_DEBUG_KMS("Using DP training pattern TPS%d\n", drm_dbg_kms(&dev_priv->drm,
dp_train_pat & train_pat_mask); "Using DP training pattern TPS%d\n",
dp_train_pat & train_pat_mask);
if (HAS_DDI(dev_priv)) { if (HAS_DDI(dev_priv)) {
u32 temp = I915_READ(intel_dp->regs.dp_tp_ctl); u32 temp = I915_READ(intel_dp->regs.dp_tp_ctl);
...@@ -3489,7 +3511,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, ...@@ -3489,7 +3511,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,
*DP |= DP_LINK_TRAIN_PAT_2_CPT; *DP |= DP_LINK_TRAIN_PAT_2_CPT;
break; break;
case DP_TRAINING_PATTERN_3: case DP_TRAINING_PATTERN_3:
DRM_DEBUG_KMS("TPS3 not supported, using TPS2 instead\n"); drm_dbg_kms(&dev_priv->drm,
"TPS3 not supported, using TPS2 instead\n");
*DP |= DP_LINK_TRAIN_PAT_2_CPT; *DP |= DP_LINK_TRAIN_PAT_2_CPT;
break; break;
} }
...@@ -3508,7 +3531,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, ...@@ -3508,7 +3531,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,
*DP |= DP_LINK_TRAIN_PAT_2; *DP |= DP_LINK_TRAIN_PAT_2;
break; break;
case DP_TRAINING_PATTERN_3: case DP_TRAINING_PATTERN_3:
DRM_DEBUG_KMS("TPS3 not supported, using TPS2 instead\n"); drm_dbg_kms(&dev_priv->drm,
"TPS3 not supported, using TPS2 instead\n");
*DP |= DP_LINK_TRAIN_PAT_2; *DP |= DP_LINK_TRAIN_PAT_2;
break; break;
} }
...@@ -3578,8 +3602,8 @@ static void intel_enable_dp(struct intel_encoder *encoder, ...@@ -3578,8 +3602,8 @@ static void intel_enable_dp(struct intel_encoder *encoder,
intel_dp_stop_link_train(intel_dp); intel_dp_stop_link_train(intel_dp);
if (pipe_config->has_audio) { if (pipe_config->has_audio) {
DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n", drm_dbg(&dev_priv->drm, "Enabling DP audio on pipe %c\n",
pipe_name(pipe)); pipe_name(pipe));
intel_audio_codec_enable(encoder, pipe_config, conn_state); intel_audio_codec_enable(encoder, pipe_config, conn_state);
} }
} }
...@@ -3636,9 +3660,10 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp) ...@@ -3636,9 +3660,10 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)
* port select always when logically disconnecting a power sequencer * port select always when logically disconnecting a power sequencer
* from a port. * from a port.
*/ */
DRM_DEBUG_KMS("detaching pipe %c power sequencer from [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
pipe_name(pipe), intel_dig_port->base.base.base.id, "detaching pipe %c power sequencer from [ENCODER:%d:%s]\n",
intel_dig_port->base.base.name); pipe_name(pipe), intel_dig_port->base.base.base.id,
intel_dig_port->base.base.name);
I915_WRITE(pp_on_reg, 0); I915_WRITE(pp_on_reg, 0);
POSTING_READ(pp_on_reg); POSTING_READ(pp_on_reg);
...@@ -3663,9 +3688,10 @@ static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv, ...@@ -3663,9 +3688,10 @@ static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv,
if (intel_dp->pps_pipe != pipe) if (intel_dp->pps_pipe != pipe)
continue; continue;
DRM_DEBUG_KMS("stealing pipe %c power sequencer from [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
pipe_name(pipe), encoder->base.base.id, "stealing pipe %c power sequencer from [ENCODER:%d:%s]\n",
encoder->base.name); pipe_name(pipe), encoder->base.base.id,
encoder->base.name);
/* make sure vdd is off before we steal it */ /* make sure vdd is off before we steal it */
vlv_detach_power_sequencer(intel_dp); vlv_detach_power_sequencer(intel_dp);
...@@ -3707,9 +3733,10 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder, ...@@ -3707,9 +3733,10 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder,
/* now it's all ours */ /* now it's all ours */
intel_dp->pps_pipe = crtc->pipe; intel_dp->pps_pipe = crtc->pipe;
DRM_DEBUG_KMS("initializing pipe %c power sequencer for [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
pipe_name(intel_dp->pps_pipe), encoder->base.base.id, "initializing pipe %c power sequencer for [ENCODER:%d:%s]\n",
encoder->base.name); pipe_name(intel_dp->pps_pipe), encoder->base.base.id,
encoder->base.name);
/* init power sequencer on this pipe and port */ /* init power sequencer on this pipe and port */
intel_dp_init_panel_power_sequencer(intel_dp); intel_dp_init_panel_power_sequencer(intel_dp);
...@@ -4135,16 +4162,17 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp) ...@@ -4135,16 +4162,17 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
} }
if (mask) if (mask)
DRM_DEBUG_KMS("Using signal levels %08x\n", signal_levels); drm_dbg_kms(&dev_priv->drm, "Using signal levels %08x\n",
signal_levels);
DRM_DEBUG_KMS("Using vswing level %d%s\n",
train_set & DP_TRAIN_VOLTAGE_SWING_MASK, drm_dbg_kms(&dev_priv->drm, "Using vswing level %d%s\n",
train_set & DP_TRAIN_MAX_SWING_REACHED ? " (max)" : ""); train_set & DP_TRAIN_VOLTAGE_SWING_MASK,
DRM_DEBUG_KMS("Using pre-emphasis level %d%s\n", train_set & DP_TRAIN_MAX_SWING_REACHED ? " (max)" : "");
(train_set & DP_TRAIN_PRE_EMPHASIS_MASK) >> drm_dbg_kms(&dev_priv->drm, "Using pre-emphasis level %d%s\n",
DP_TRAIN_PRE_EMPHASIS_SHIFT, (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) >>
train_set & DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ? DP_TRAIN_PRE_EMPHASIS_SHIFT,
" (max)" : ""); train_set & DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ?
" (max)" : "");
intel_dp->DP = (intel_dp->DP & ~mask) | signal_levels; intel_dp->DP = (intel_dp->DP & ~mask) | signal_levels;
...@@ -4193,7 +4221,8 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) ...@@ -4193,7 +4221,8 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)
if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status, if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status,
DP_TP_STATUS_IDLE_DONE, 1)) DP_TP_STATUS_IDLE_DONE, 1))
DRM_ERROR("Timed out waiting for DP idle patterns\n"); drm_err(&dev_priv->drm,
"Timed out waiting for DP idle patterns\n");
} }
static void static void
...@@ -4209,7 +4238,7 @@ intel_dp_link_down(struct intel_encoder *encoder, ...@@ -4209,7 +4238,7 @@ intel_dp_link_down(struct intel_encoder *encoder,
if (WARN_ON((I915_READ(intel_dp->output_reg) & DP_PORT_EN) == 0)) if (WARN_ON((I915_READ(intel_dp->output_reg) & DP_PORT_EN) == 0))
return; return;
DRM_DEBUG_KMS("\n"); drm_dbg_kms(&dev_priv->drm, "\n");
if ((IS_IVYBRIDGE(dev_priv) && port == PORT_A) || if ((IS_IVYBRIDGE(dev_priv) && port == PORT_A) ||
(HAS_PCH_CPT(dev_priv) && port != PORT_A)) { (HAS_PCH_CPT(dev_priv) && port != PORT_A)) {
...@@ -4388,8 +4417,9 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp) ...@@ -4388,8 +4417,9 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)
if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV, if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,
intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) == intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) ==
sizeof(intel_dp->edp_dpcd)) sizeof(intel_dp->edp_dpcd))
DRM_DEBUG_KMS("eDP DPCD: %*ph\n", (int) sizeof(intel_dp->edp_dpcd), drm_dbg_kms(&dev_priv->drm, "eDP DPCD: %*ph\n",
intel_dp->edp_dpcd); (int)sizeof(intel_dp->edp_dpcd),
intel_dp->edp_dpcd);
/* /*
* This has to be called after intel_dp->edp_dpcd is filled, PSR checks * This has to be called after intel_dp->edp_dpcd is filled, PSR checks
...@@ -5280,7 +5310,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp) ...@@ -5280,7 +5310,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
intel_psr_short_pulse(intel_dp); intel_psr_short_pulse(intel_dp);
if (intel_dp->compliance.test_type == DP_TEST_LINK_TRAINING) { if (intel_dp->compliance.test_type == DP_TEST_LINK_TRAINING) {
DRM_DEBUG_KMS("Link Training Compliance Test requested\n"); drm_dbg_kms(&dev_priv->drm,
"Link Training Compliance Test requested\n");
/* Send a Hotplug Uevent to userspace to start modeset */ /* Send a Hotplug Uevent to userspace to start modeset */
drm_kms_helper_hotplug_event(&dev_priv->drm); drm_kms_helper_hotplug_event(&dev_priv->drm);
} }
...@@ -5655,8 +5686,8 @@ intel_dp_detect(struct drm_connector *connector, ...@@ -5655,8 +5686,8 @@ intel_dp_detect(struct drm_connector *connector,
struct intel_encoder *encoder = &dig_port->base; struct intel_encoder *encoder = &dig_port->base;
enum drm_connector_status status; enum drm_connector_status status;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
connector->base.id, connector->name); connector->base.id, connector->name);
WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex)); WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex));
/* Can't disconnect eDP */ /* Can't disconnect eDP */
...@@ -5672,9 +5703,10 @@ intel_dp_detect(struct drm_connector *connector, ...@@ -5672,9 +5703,10 @@ intel_dp_detect(struct drm_connector *connector,
memset(intel_dp->dsc_dpcd, 0, sizeof(intel_dp->dsc_dpcd)); memset(intel_dp->dsc_dpcd, 0, sizeof(intel_dp->dsc_dpcd));
if (intel_dp->is_mst) { if (intel_dp->is_mst) {
DRM_DEBUG_KMS("MST device may have disappeared %d vs %d\n", drm_dbg_kms(&dev_priv->drm,
intel_dp->is_mst, "MST device may have disappeared %d vs %d\n",
intel_dp->mst_mgr.mst_state); intel_dp->is_mst,
intel_dp->mst_mgr.mst_state);
intel_dp->is_mst = false; intel_dp->is_mst = false;
drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,
intel_dp->is_mst); intel_dp->is_mst);
...@@ -5762,8 +5794,8 @@ intel_dp_force(struct drm_connector *connector) ...@@ -5762,8 +5794,8 @@ intel_dp_force(struct drm_connector *connector)
intel_aux_power_domain(dig_port); intel_aux_power_domain(dig_port);
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",
connector->base.id, connector->name); connector->base.id, connector->name);
intel_dp_unset_edid(intel_dp); intel_dp_unset_edid(intel_dp);
if (connector->status != connector_status_connected) if (connector->status != connector_status_connected)
...@@ -6491,7 +6523,8 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp) ...@@ -6491,7 +6523,8 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp)
* schedule a vdd off, so we don't hold on to the reference * schedule a vdd off, so we don't hold on to the reference
* indefinitely. * indefinitely.
*/ */
DRM_DEBUG_KMS("VDD left on by BIOS, adjusting state tracking\n"); drm_dbg_kms(&dev_priv->drm,
"VDD left on by BIOS, adjusting state tracking\n");
intel_display_power_get(dev_priv, intel_aux_power_domain(dig_port)); intel_display_power_get(dev_priv, intel_aux_power_domain(dig_port));
edp_panel_vdd_schedule_off(intel_dp); edp_panel_vdd_schedule_off(intel_dp);
...@@ -6767,8 +6800,9 @@ intel_dp_init_panel_power_sequencer(struct intel_dp *intel_dp) ...@@ -6767,8 +6800,9 @@ intel_dp_init_panel_power_sequencer(struct intel_dp *intel_dp)
*/ */
if (dev_priv->quirks & QUIRK_INCREASE_T12_DELAY) { if (dev_priv->quirks & QUIRK_INCREASE_T12_DELAY) {
vbt.t11_t12 = max_t(u16, vbt.t11_t12, 1300 * 10); vbt.t11_t12 = max_t(u16, vbt.t11_t12, 1300 * 10);
DRM_DEBUG_KMS("Increasing T12 panel delay as per the quirk to %d\n", drm_dbg_kms(&dev_priv->drm,
vbt.t11_t12); "Increasing T12 panel delay as per the quirk to %d\n",
vbt.t11_t12);
} }
/* T11_T12 delay is special and actually in units of 100ms, but zero /* T11_T12 delay is special and actually in units of 100ms, but zero
* based in the hw (so we need to add 100 ms). But the sw vbt * based in the hw (so we need to add 100 ms). But the sw vbt
...@@ -6810,12 +6844,15 @@ intel_dp_init_panel_power_sequencer(struct intel_dp *intel_dp) ...@@ -6810,12 +6844,15 @@ intel_dp_init_panel_power_sequencer(struct intel_dp *intel_dp)
intel_dp->panel_power_cycle_delay = get_delay(t11_t12); intel_dp->panel_power_cycle_delay = get_delay(t11_t12);
#undef get_delay #undef get_delay
DRM_DEBUG_KMS("panel power up delay %d, power down delay %d, power cycle delay %d\n", drm_dbg_kms(&dev_priv->drm,
intel_dp->panel_power_up_delay, intel_dp->panel_power_down_delay, "panel power up delay %d, power down delay %d, power cycle delay %d\n",
intel_dp->panel_power_cycle_delay); intel_dp->panel_power_up_delay,
intel_dp->panel_power_down_delay,
intel_dp->panel_power_cycle_delay);
DRM_DEBUG_KMS("backlight on delay %d, off delay %d\n", drm_dbg_kms(&dev_priv->drm, "backlight on delay %d, off delay %d\n",
intel_dp->backlight_on_delay, intel_dp->backlight_off_delay); intel_dp->backlight_on_delay,
intel_dp->backlight_off_delay);
/* /*
* We override the HW backlight delays to 1 because we do manual waits * We override the HW backlight delays to 1 because we do manual waits
...@@ -6867,7 +6904,8 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp, ...@@ -6867,7 +6904,8 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
WARN(pp & PANEL_POWER_ON, "Panel power already on\n"); WARN(pp & PANEL_POWER_ON, "Panel power already on\n");
if (pp & EDP_FORCE_VDD) if (pp & EDP_FORCE_VDD)
DRM_DEBUG_KMS("VDD already on, disabling first\n"); drm_dbg_kms(&dev_priv->drm,
"VDD already on, disabling first\n");
pp &= ~EDP_FORCE_VDD; pp &= ~EDP_FORCE_VDD;
...@@ -6921,12 +6959,13 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp, ...@@ -6921,12 +6959,13 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
I915_WRITE(regs.pp_ctrl, pp_ctl); I915_WRITE(regs.pp_ctrl, pp_ctl);
} }
DRM_DEBUG_KMS("panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n", drm_dbg_kms(&dev_priv->drm,
I915_READ(regs.pp_on), "panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n",
I915_READ(regs.pp_off), I915_READ(regs.pp_on),
i915_mmio_reg_valid(regs.pp_div) ? I915_READ(regs.pp_off),
I915_READ(regs.pp_div) : i915_mmio_reg_valid(regs.pp_div) ?
(I915_READ(regs.pp_ctrl) & BXT_POWER_CYCLE_DELAY_MASK)); I915_READ(regs.pp_div) :
(I915_READ(regs.pp_ctrl) & BXT_POWER_CYCLE_DELAY_MASK));
} }
static void intel_dp_pps_init(struct intel_dp *intel_dp) static void intel_dp_pps_init(struct intel_dp *intel_dp)
...@@ -6963,22 +7002,24 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, ...@@ -6963,22 +7002,24 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,
enum drrs_refresh_rate_type index = DRRS_HIGH_RR; enum drrs_refresh_rate_type index = DRRS_HIGH_RR;
if (refresh_rate <= 0) { if (refresh_rate <= 0) {
DRM_DEBUG_KMS("Refresh rate should be positive non-zero.\n"); drm_dbg_kms(&dev_priv->drm,
"Refresh rate should be positive non-zero.\n");
return; return;
} }
if (intel_dp == NULL) { if (intel_dp == NULL) {
DRM_DEBUG_KMS("DRRS not supported.\n"); drm_dbg_kms(&dev_priv->drm, "DRRS not supported.\n");
return; return;
} }
if (!intel_crtc) { if (!intel_crtc) {
DRM_DEBUG_KMS("DRRS: intel_crtc not initialized\n"); drm_dbg_kms(&dev_priv->drm,
"DRRS: intel_crtc not initialized\n");
return; return;
} }
if (dev_priv->drrs.type < SEAMLESS_DRRS_SUPPORT) { if (dev_priv->drrs.type < SEAMLESS_DRRS_SUPPORT) {
DRM_DEBUG_KMS("Only Seamless DRRS supported.\n"); drm_dbg_kms(&dev_priv->drm, "Only Seamless DRRS supported.\n");
return; return;
} }
...@@ -6987,13 +7028,14 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, ...@@ -6987,13 +7028,14 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,
index = DRRS_LOW_RR; index = DRRS_LOW_RR;
if (index == dev_priv->drrs.refresh_rate_type) { if (index == dev_priv->drrs.refresh_rate_type) {
DRM_DEBUG_KMS( drm_dbg_kms(&dev_priv->drm,
"DRRS requested for previously set RR...ignoring\n"); "DRRS requested for previously set RR...ignoring\n");
return; return;
} }
if (!crtc_state->hw.active) { if (!crtc_state->hw.active) {
DRM_DEBUG_KMS("eDP encoder disabled. CRTC not Active\n"); drm_dbg_kms(&dev_priv->drm,
"eDP encoder disabled. CRTC not Active\n");
return; return;
} }
...@@ -7007,7 +7049,8 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, ...@@ -7007,7 +7049,8 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,
break; break;
case DRRS_MAX_RR: case DRRS_MAX_RR:
default: default:
DRM_ERROR("Unsupported refreshrate type\n"); drm_err(&dev_priv->drm,
"Unsupported refreshrate type\n");
} }
} else if (INTEL_GEN(dev_priv) > 6) { } else if (INTEL_GEN(dev_priv) > 6) {
i915_reg_t reg = PIPECONF(crtc_state->cpu_transcoder); i915_reg_t reg = PIPECONF(crtc_state->cpu_transcoder);
...@@ -7030,7 +7073,8 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, ...@@ -7030,7 +7073,8 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,
dev_priv->drrs.refresh_rate_type = index; dev_priv->drrs.refresh_rate_type = index;
DRM_DEBUG_KMS("eDP Refresh Rate set to : %dHz\n", refresh_rate); drm_dbg_kms(&dev_priv->drm, "eDP Refresh Rate set to : %dHz\n",
refresh_rate);
} }
/** /**
...@@ -7046,18 +7090,19 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp, ...@@ -7046,18 +7090,19 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp,
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
if (!crtc_state->has_drrs) { if (!crtc_state->has_drrs) {
DRM_DEBUG_KMS("Panel doesn't support DRRS\n"); drm_dbg_kms(&dev_priv->drm, "Panel doesn't support DRRS\n");
return; return;
} }
if (dev_priv->psr.enabled) { if (dev_priv->psr.enabled) {
DRM_DEBUG_KMS("PSR enabled. Not enabling DRRS.\n"); drm_dbg_kms(&dev_priv->drm,
"PSR enabled. Not enabling DRRS.\n");
return; return;
} }
mutex_lock(&dev_priv->drrs.mutex); mutex_lock(&dev_priv->drrs.mutex);
if (dev_priv->drrs.dp) { if (dev_priv->drrs.dp) {
DRM_DEBUG_KMS("DRRS already enabled\n"); drm_dbg_kms(&dev_priv->drm, "DRRS already enabled\n");
goto unlock; goto unlock;
} }
...@@ -7283,25 +7328,28 @@ intel_dp_drrs_init(struct intel_connector *connector, ...@@ -7283,25 +7328,28 @@ intel_dp_drrs_init(struct intel_connector *connector,
mutex_init(&dev_priv->drrs.mutex); mutex_init(&dev_priv->drrs.mutex);
if (INTEL_GEN(dev_priv) <= 6) { if (INTEL_GEN(dev_priv) <= 6) {
DRM_DEBUG_KMS("DRRS supported for Gen7 and above\n"); drm_dbg_kms(&dev_priv->drm,
"DRRS supported for Gen7 and above\n");
return NULL; return NULL;
} }
if (dev_priv->vbt.drrs_type != SEAMLESS_DRRS_SUPPORT) { if (dev_priv->vbt.drrs_type != SEAMLESS_DRRS_SUPPORT) {
DRM_DEBUG_KMS("VBT doesn't support DRRS\n"); drm_dbg_kms(&dev_priv->drm, "VBT doesn't support DRRS\n");
return NULL; return NULL;
} }
downclock_mode = intel_panel_edid_downclock_mode(connector, fixed_mode); downclock_mode = intel_panel_edid_downclock_mode(connector, fixed_mode);
if (!downclock_mode) { if (!downclock_mode) {
DRM_DEBUG_KMS("Downclock mode is not found. DRRS not supported\n"); drm_dbg_kms(&dev_priv->drm,
"Downclock mode is not found. DRRS not supported\n");
return NULL; return NULL;
} }
dev_priv->drrs.type = dev_priv->vbt.drrs_type; dev_priv->drrs.type = dev_priv->vbt.drrs_type;
dev_priv->drrs.refresh_rate_type = DRRS_HIGH_RR; dev_priv->drrs.refresh_rate_type = DRRS_HIGH_RR;
DRM_DEBUG_KMS("seamless DRRS supported for eDP panel.\n"); drm_dbg_kms(&dev_priv->drm,
"seamless DRRS supported for eDP panel.\n");
return downclock_mode; return downclock_mode;
} }
...@@ -7331,7 +7379,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, ...@@ -7331,7 +7379,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
*/ */
if (intel_get_lvds_encoder(dev_priv)) { if (intel_get_lvds_encoder(dev_priv)) {
WARN_ON(!(HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv))); WARN_ON(!(HAS_PCH_IBX(dev_priv) || HAS_PCH_CPT(dev_priv)));
DRM_INFO("LVDS was detected, not registering eDP\n"); drm_info(&dev_priv->drm,
"LVDS was detected, not registering eDP\n");
return false; return false;
} }
...@@ -7347,7 +7396,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, ...@@ -7347,7 +7396,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
if (!has_dpcd) { if (!has_dpcd) {
/* if this fails, presume the device is a ghost */ /* if this fails, presume the device is a ghost */
DRM_INFO("failed to retrieve link info, disabling eDP\n"); drm_info(&dev_priv->drm,
"failed to retrieve link info, disabling eDP\n");
goto out_vdd_off; goto out_vdd_off;
} }
...@@ -7392,8 +7442,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, ...@@ -7392,8 +7442,9 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
if (pipe != PIPE_A && pipe != PIPE_B) if (pipe != PIPE_A && pipe != PIPE_B)
pipe = PIPE_A; pipe = PIPE_A;
DRM_DEBUG_KMS("using pipe %c for initial backlight setup\n", drm_dbg_kms(&dev_priv->drm,
pipe_name(pipe)); "using pipe %c for initial backlight setup\n",
pipe_name(pipe));
} }
intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode); intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
...@@ -7502,9 +7553,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, ...@@ -7502,9 +7553,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
port != PORT_B && port != PORT_C)) port != PORT_B && port != PORT_C))
return false; return false;
DRM_DEBUG_KMS("Adding %s connector on [ENCODER:%d:%s]\n", drm_dbg_kms(&dev_priv->drm,
type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP", "Adding %s connector on [ENCODER:%d:%s]\n",
intel_encoder->base.base.id, intel_encoder->base.name); type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",
intel_encoder->base.base.id, intel_encoder->base.name);
drm_connector_init(dev, connector, &intel_dp_connector_funcs, type); drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);
drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs); drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs);
...@@ -7542,7 +7594,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, ...@@ -7542,7 +7594,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) { if (is_hdcp_supported(dev_priv, port) && !intel_dp_is_edp(intel_dp)) {
int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim); int ret = intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim);
if (ret) if (ret)
DRM_DEBUG_KMS("HDCP init failed, skipping.\n"); drm_dbg_kms(&dev_priv->drm,
"HDCP init failed, skipping.\n");
} }
/* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written /* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7