Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd519418 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dp: move link_bw and rate_select debugging where used 



We call intel_dp_compute_rate() in intel_dp_compute_config() only to be
able to debug log the link_bw and rate_select parameters; we don't use
the parameters here for anything else. We call intel_dp_compute_rate()
again during link training where we actually need and use the
parameters.

Move the debug logging of link_bw and rate_select to
intel_dp_link_training_clock_recovery(), and clean up the extra
intel_dp_compute_rate() call and extra clutter from the already
overcrowded intel_dp_compute_config().

v2: Rewrote commit message (Rodrigo, Manasi)

Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c5cf6a179e2d244eceb6bb80a792765d9efbee4f.1524730974.git.jani.nikula@intel.com
parent 87251120

drivers/gpu/drm/i915/intel_dp.c

+2 −7
Original line number Diff line number Diff line
@@ -1706,7 +1706,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
	int bpp, mode_rate;

	int link_avail, link_clock;

	int common_len;

	uint8_t link_bw, rate_select;

	bool reduce_m_n = drm_dp_has_quirk(&intel_dp->desc,

					   DP_DPCD_QUIRK_LIMITED_M_N);
@@ -1852,12 +1851,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
	pipe_config->pipe_bpp = bpp;

	pipe_config->port_clock = intel_dp->common_rates[clock];



	intel_dp_compute_rate(intel_dp, pipe_config->port_clock,

			      &link_bw, &rate_select);



	DRM_DEBUG_KMS("DP link bw %02x rate select %02x lane count %d clock %d bpp %d\n",

		      link_bw, rate_select, pipe_config->lane_count,

		      pipe_config->port_clock, bpp);

	DRM_DEBUG_KMS("DP lane count %d clock %d bpp %d\n",

		      pipe_config->lane_count, pipe_config->port_clock, bpp);

	DRM_DEBUG_KMS("DP link bw required %i available %i\n",

		      mode_rate, link_avail);

drivers/gpu/drm/i915/intel_dp_link_training.c

+5 −0
Original line number Diff line number Diff line
@@ -139,6 +139,11 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) 
	intel_dp_compute_rate(intel_dp, intel_dp->link_rate,

			      &link_bw, &rate_select);



	if (link_bw)

		DRM_DEBUG_KMS("Using LINK_BW_SET value %02x\n", link_bw);

	else

		DRM_DEBUG_KMS("Using LINK_RATE_SET value %02x\n", rate_select);



	/* Write the link configuration data */

	link_config[0] = link_bw;

	link_config[1] = intel_dp->lane_count;