[Intel-gfx] [PATCH 4/7] drm/i915: remove extra new line on pipe_config mismatch

[Ville Syrjälä]

On Thu, Oct 10, 2019 at 06:09:04PM -0700, Lucas De Marchi wrote:
> The new line is already added by pipe_config_mismatch(), so the callers
> shouldn't add it.

I guess fallout from commit 48c38154d539 ("drm/i915: use DRM_DEBUG_KMS()
instead of drm_dbg(DRM_UT_KMS, ...)") ?

Looks correct to me.
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index a146ec02a0c1..c5985f0b5bbf 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -12581,7 +12581,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; \
> @@ -12591,7 +12591,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; \
> @@ -12601,7 +12601,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; \
> @@ -12618,7 +12618,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; \
> @@ -12628,7 +12628,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; \
> @@ -12641,7 +12641,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, \
> @@ -12669,7 +12669,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, \
> @@ -12692,7 +12692,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)); \
> @@ -12703,7 +12703,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; \
> @@ -12723,7 +12723,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;\
> @@ -12732,7 +12732,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; \
>  		} \
>  	} \
> -- 
> 2.23.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel