[PATCH v2 2/2] drm/amd/display: Don't call dm_log_to_buffer directly in dc_conn_log

[Michel Dänzer]

Ping on this series.

This patch is v2 of a previously single patch, which was reviewed by Harry.


On 2017-11-23 06:48 PM, Michel Dänzer wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
> 
> dm_log_to_buffer logs unconditionally, so calling it directly resulted
> in the main message being logged even when the event type isn't enabled
> in the event mask.
> 
> To fix this, use the new dm_logger_append_va API.
> 
> Fixes spurious messages like
> 
>  [drm] {1920x1200, 2080x1235 at 154000Khz}
> 
> in dmesg when a mode is set.
> 
> v2:
> * Use new dm_logger_append_va API, fixes incorrect va_list usage in v1
> * Just use and decrease entry.buf_offset to get rid of the trailing
>   newline
> 
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
>  drivers/gpu/drm/amd/display/dc/basics/log_helpers.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
> index 785b943b60ed..fe1648f81d71 100644
> --- a/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
> +++ b/drivers/gpu/drm/amd/display/dc/basics/log_helpers.c
> @@ -80,15 +80,11 @@ void dc_conn_log(struct dc_context *ctx,
>  			link->link_index);
>  
>  	va_start(args, msg);
> -	entry.buf_offset += dm_log_to_buffer(
> -		&entry.buf[entry.buf_offset],
> -		LOG_MAX_LINE_SIZE - entry.buf_offset,
> -		msg, args);
> +	dm_logger_append_va(&entry, msg, args);
>  
> -	if (entry.buf[strlen(entry.buf) - 1] == '\n') {
> -		entry.buf[strlen(entry.buf) - 1] = '\0';
> +	if (entry.buf_offset > 0 &&
> +	    entry.buf[entry.buf_offset - 1] == '\n')
>  		entry.buf_offset--;
> -	}
>  
>  	if (hex_data)
>  		for (i = 0; i < hex_data_count; i++)
> 


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer