Commit cbd9b9f2 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: remove extra new line on pipe_config mismatch 



The new line is already added by pipe_config_mismatch(), so the callers
shouldn't add it.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191011010907.103309-5-lucas.demarchi@intel.com
parent 10d987fd

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

+11 −11
Original line number Diff line number Diff line
@@ -12817,7 +12817,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_mismatch(fastset, __stringify(name), \

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

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

				     current_config->name, \

				     pipe_config->name); \

		ret = false; \
@@ -12827,7 +12827,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_mismatch(fastset, __stringify(name), \

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

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

				     current_config->name, \

				     pipe_config->name); \

		ret = false; \
@@ -12837,7 +12837,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_mismatch(fastset, __stringify(name), \

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

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

				     yesno(current_config->name), \

				     yesno(pipe_config->name)); \

		ret = false; \
@@ -12854,7 +12854,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		PIPE_CONF_CHECK_BOOL(name); \

	} else { \

		pipe_config_mismatch(fastset, __stringify(name), \

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

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

				     yesno(current_config->name), \

				     yesno(pipe_config->name)); \

		ret = false; \
@@ -12864,7 +12864,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_mismatch(fastset, __stringify(name), \

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

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

				     current_config->name, \

				     pipe_config->name); \

		ret = false; \
@@ -12877,7 +12877,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
				    !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", \

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

				     current_config->name.tu, \

				     current_config->name.gmch_m, \

				     current_config->name.gmch_n, \
@@ -12905,7 +12905,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
		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", \

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

				     current_config->name.tu, \

				     current_config->name.gmch_m, \

				     current_config->name.gmch_n, \
@@ -12928,7 +12928,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_mismatch(fastset, __stringify(name), \

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

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

				     (mask), \

				     current_config->name & (mask), \

				     pipe_config->name & (mask)); \
@@ -12939,7 +12939,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_mismatch(fastset, __stringify(name), \

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

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

				     current_config->name, \

				     pipe_config->name); \

		ret = false; \
@@ -12959,7 +12959,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
#define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \

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

		pipe_config_mismatch(fastset, __stringify(name1), \

				"(expected %i, found %i, won't compare lut values)\n", \

				"(expected %i, found %i, won't compare lut values)", \

				current_config->name1, \

				pipe_config->name1); \

		ret = false;\
@@ -12968,7 +12968,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, 
					pipe_config->name2, pipe_config->name1, \

					bit_precision)) { \

			pipe_config_mismatch(fastset, __stringify(name2), \

					"hw_state doesn't match sw_state\n"); \

					"hw_state doesn't match sw_state"); \

			ret = false; \

		} \

	} \

CRA Git | Maintained and supported by SUSTech CRA and CCSE