Commit dde84833 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Make pipe_config_err() vs. fastset less confusing 



Rename pipe_config_err() to pipe_config_mismatch(), and also print
whether we're doing the fastset check or the sw vs. hw state readout
check. Should make the logs a bit less confusing when they're not
filled with what looks like a real error.

Also rename the 'adjust' variable to 'fastset' to make it clear what
it means.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190612130801.2085-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent b124ea43

drivers/gpu/drm/i915/display/intel_display.c

+79 −79
Original line number Diff line number Diff line
@@ -12310,16 +12310,16 @@ intel_compare_infoframe(const union hdmi_infoframe *a, 
}



static void

pipe_config_infoframe_err(struct drm_i915_private *dev_priv,

			  bool adjust, const char *name,

pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv,

			       bool fastset, const char *name,

			       const union hdmi_infoframe *a,

			       const union hdmi_infoframe *b)

{

	if (adjust) {

	if (fastset) {

		if ((drm_debug & DRM_UT_KMS) == 0)

			return;



		drm_dbg(DRM_UT_KMS, "mismatch in %s infoframe", name);

		drm_dbg(DRM_UT_KMS, "fastset mismatch in %s infoframe", name);

		drm_dbg(DRM_UT_KMS, "expected:");

		hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, a);

		drm_dbg(DRM_UT_KMS, "found");
@@ -12334,7 +12334,7 @@ pipe_config_infoframe_err(struct drm_i915_private *dev_priv, 
}



static void __printf(3, 4)

pipe_config_err(bool adjust, const char *name, const char *format, ...)

pipe_config_mismatch(bool fastset, const char *name, const char *format, ...)

{

	struct va_format vaf;

	va_list args;
@@ -12343,8 +12343,8 @@ pipe_config_err(bool adjust, const char *name, const char *format, ...) 
	vaf.fmt = format;

	vaf.va = &args;



	if (adjust)

		drm_dbg(DRM_UT_KMS, "mismatch in %s %pV", name, &vaf);

	if (fastset)

		drm_dbg(DRM_UT_KMS, "fastset mismatch in %s %pV", name, &vaf);

	else

		drm_err("mismatch in %s %pV", name, &vaf);
@@ -12371,11 +12371,11 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv) 
static bool

intel_pipe_config_compare(const struct intel_crtc_state *current_config,

			  const struct intel_crtc_state *pipe_config,

			  bool adjust)

			  bool fastset)

{

	struct drm_i915_private *dev_priv = to_i915(current_config->base.crtc->dev);

	bool ret = true;

	bool fixup_inherited = adjust &&

	bool fixup_inherited = fastset &&

		(current_config->base.mode.private_flags & I915_MODE_FLAG_INHERITED) &&

		!(pipe_config->base.mode.private_flags & I915_MODE_FLAG_INHERITED);
@@ -12386,7 +12386,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


#define PIPE_CONF_CHECK_X(name) do { \

	if (current_config->name != pipe_config->name) { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected 0x%08x, found 0x%08x)\n", \

				     current_config->name, \

				     pipe_config->name); \
@@ -12396,7 +12396,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


#define PIPE_CONF_CHECK_I(name) do { \

	if (current_config->name != pipe_config->name) { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected %i, found %i)\n", \

				     current_config->name, \

				     pipe_config->name); \
@@ -12406,7 +12406,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


#define PIPE_CONF_CHECK_BOOL(name) do { \

	if (current_config->name != pipe_config->name) { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected %s, found %s)\n", \

				     yesno(current_config->name), \

				     yesno(pipe_config->name)); \
@@ -12423,7 +12423,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	if (!fixup_inherited || (!current_config->name && !pipe_config->name)) { \

		PIPE_CONF_CHECK_BOOL(name); \

	} else { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)\n", \

				     yesno(current_config->name), \

				     yesno(pipe_config->name)); \
@@ -12433,7 +12433,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


#define PIPE_CONF_CHECK_P(name) do { \

	if (current_config->name != pipe_config->name) { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected %p, found %p)\n", \

				     current_config->name, \

				     pipe_config->name); \
@@ -12444,8 +12444,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
#define PIPE_CONF_CHECK_M_N(name) do { \

	if (!intel_compare_link_m_n(&current_config->name, \

				    &pipe_config->name,\

				    !adjust)) { \

		pipe_config_err(adjust, __stringify(name), \

				    !fastset)) { \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected tu %i gmch %i/%i link %i/%i, " \

				     "found tu %i, gmch %i/%i link %i/%i)\n", \

				     current_config->name.tu, \
@@ -12469,10 +12469,10 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
 */

#define PIPE_CONF_CHECK_M_N_ALT(name, alt_name) do { \

	if (!intel_compare_link_m_n(&current_config->name, \

				    &pipe_config->name, !adjust) && \

				    &pipe_config->name, !fastset) && \

	    !intel_compare_link_m_n(&current_config->alt_name, \

				    &pipe_config->name, !adjust)) { \

		pipe_config_err(adjust, __stringify(name), \

				    &pipe_config->name, !fastset)) { \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected tu %i gmch %i/%i link %i/%i, " \

				     "or tu %i gmch %i/%i link %i/%i, " \

				     "found tu %i, gmch %i/%i link %i/%i)\n", \
@@ -12497,7 +12497,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


#define PIPE_CONF_CHECK_FLAGS(name, mask) do { \

	if ((current_config->name ^ pipe_config->name) & (mask)) { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(%x) (expected %i, found %i)\n", \

				     (mask), \

				     current_config->name & (mask), \
@@ -12508,7 +12508,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 


#define PIPE_CONF_CHECK_CLOCK_FUZZY(name) do { \

	if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \

		pipe_config_err(adjust, __stringify(name), \

		pipe_config_mismatch(fastset, __stringify(name), \

				     "(expected %i, found %i)\n", \

				     current_config->name, \

				     pipe_config->name); \
@@ -12519,7 +12519,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
#define PIPE_CONF_CHECK_INFOFRAME(name) do { \

	if (!intel_compare_infoframe(&current_config->infoframes.name, \

				     &pipe_config->infoframes.name)) { \

		pipe_config_infoframe_err(dev_priv, adjust, __stringify(name), \

		pipe_config_infoframe_mismatch(dev_priv, fastset, __stringify(name), \

					       &current_config->infoframes.name, \

					       &pipe_config->infoframes.name); \

		ret = false; \
@@ -12601,7 +12601,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
	 */

	PIPE_CONF_CHECK_BOOL(pch_pfit.force_thru);



	if (!adjust) {

	if (!fastset) {

		PIPE_CONF_CHECK_I(pipe_src_w);

		PIPE_CONF_CHECK_I(pipe_src_h);

CRA Git | Maintained and supported by SUSTech CRA and CCSE