[Mesa-dev] [PATCH 6/6] radeonsi: don't print AMD twice in the renderer string with the marketing name

[Nicolai Hähnle]

I'm fine with this. Personally, I'd say let marketing sort out their mess.

Patches 5-6:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


On 01.08.2017 00:43, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> ---
>   src/gallium/drivers/radeon/r600_pipe_common.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index c58048f..e9402f8 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -1338,21 +1338,22 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
>   			     struct radeon_winsys *ws, unsigned flags)
>   {
>   	char family_name[32] = {}, llvm_string[32] = {}, kernel_version[128] = {};
>   	struct utsname uname_data;
>   	const char *chip_name;
>   
>   	ws->query_info(ws, &rscreen->info);
>   	rscreen->ws = ws;
>   
>   	if ((chip_name = r600_get_marketing_name(ws)))
> -		snprintf(family_name, sizeof(family_name), "%s / ", r600_get_family_name(rscreen));
> +		snprintf(family_name, sizeof(family_name), "%s / ",
> +			 r600_get_family_name(rscreen) + 4);
>   	else
>   		chip_name = r600_get_family_name(rscreen);
>   
>   	if (uname(&uname_data) == 0)
>   		snprintf(kernel_version, sizeof(kernel_version),
>   			 " / %s", uname_data.release);
>   
>   	if (HAVE_LLVM > 0) {
>   		snprintf(llvm_string, sizeof(llvm_string),
>   			 ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.