[PATCH libdrm] amdgpu: add the function to get the marketing name (v3)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Am 07.11.2016 um 10:09 schrieb Michel Dänzer:
> From: Junwei Zhang <Jerry.Zhang at amd.com>
>
> This function is used to look up the marking name
> for a specific board.
>
> v2: agd: Squash in subsequent updates to the table.
> v3: [Michel Dänzer]
> * Make amdgpu_asic_id_table static, so it's not exported from
>    libdrm_amdgpu.so.1
> * Add amdgpu_get_marketing_name to amdgpu-symbols-check
> * Fix indentation of second line of if statement
> * Squash in another change removing redundant entries
> * Change spelling of "RADEON" -> "Radeon"
> * Remove "(TM)" from a minority of entries
>
> Signed-off-by: Junwei Zhang <Jerry.Zhang at amd.com>
> Reviewed-by: Flora Cui <Flora.Cui at amd.com>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>.

> ---
>
> This will be used by https://patchwork.freedesktop.org/patch/119501/ .
>
>   amdgpu/amdgpu-symbol-check |   1 +
>   amdgpu/amdgpu.h            |  10 +++
>   amdgpu/amdgpu_asic_id.h    | 165 +++++++++++++++++++++++++++++++++++++++++++++
>   amdgpu/amdgpu_device.c     |  15 +++++
>   4 files changed, 191 insertions(+)
>   create mode 100644 amdgpu/amdgpu_asic_id.h
>
> diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
> index 648db9b..87f4fd2 100755
> --- a/amdgpu/amdgpu-symbol-check
> +++ b/amdgpu/amdgpu-symbol-check
> @@ -35,6 +35,7 @@ amdgpu_cs_submit
>   amdgpu_cs_wait_semaphore
>   amdgpu_device_deinitialize
>   amdgpu_device_initialize
> +amdgpu_get_marketing_name
>   amdgpu_query_buffer_size_alignment
>   amdgpu_query_crtc_from_id
>   amdgpu_query_firmware_version
> diff --git a/amdgpu/amdgpu.h b/amdgpu/amdgpu.h
> index 5d5a2c6..7b26a04 100644
> --- a/amdgpu/amdgpu.h
> +++ b/amdgpu/amdgpu.h
> @@ -1245,4 +1245,14 @@ int amdgpu_cs_wait_semaphore(amdgpu_context_handle ctx,
>   */
>   int amdgpu_cs_destroy_semaphore(amdgpu_semaphore_handle sem);
>   
> +/**
> + *  Get the ASIC marketing name
> + *
> + * \param   dev         - \c [in] Device handle. See #amdgpu_device_initialize()
> + *
> + * \return  the constant string of the marketing name
> + *          "NULL" means the ASIC is not found
> +*/
> +const char *amdgpu_get_marketing_name(amdgpu_device_handle dev);
> +
>   #endif /* #ifdef _AMDGPU_H_ */
> diff --git a/amdgpu/amdgpu_asic_id.h b/amdgpu/amdgpu_asic_id.h
> new file mode 100644
> index 0000000..f477875
> --- /dev/null
> +++ b/amdgpu/amdgpu_asic_id.h
> @@ -0,0 +1,165 @@
> +/*
> + * Copyright © 2016 Advanced Micro Devices, Inc.
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#ifndef __AMDGPU_ASIC_ID_H__
> +#define __AMDGPU_ASIC_ID_H__
> +
> +static struct amdgpu_asic_id_table_t {
> +	uint32_t did;
> +	uint32_t rid;
> +	char marketing_name[64];
> +} const amdgpu_asic_id_table [] = {
> +	{0x6600,	0x0,	"AMD Radeon HD 8600/8700M"},
> +	{0x6600,	0x81,	"AMD Radeon R7 M370"},
> +	{0x6601,	0x0,	"AMD Radeon HD 8500M/8700M"},
> +	{0x6604,	0x0,	"AMD Radeon R7 M265 Series"},
> +	{0x6604,	0x81,	"AMD Radeon R7 M350"},
> +	{0x6605,	0x0,	"AMD Radeon R7 M260 Series"},
> +	{0x6605,	0x81,	"AMD Radeon R7 M340"},
> +	{0x6606,	0x0,	"AMD Radeon HD 8790M"},
> +	{0x6607,	0x0,	"AMD Radeon HD8530M"},
> +	{0x6608,	0x0,	"AMD FirePro W2100"},
> +	{0x6610,	0x0,	"AMD Radeon HD 8600 Series"},
> +	{0x6610,	0x81,	"AMD Radeon R7 350"},
> +	{0x6610,	0x83,	"AMD Radeon R5 340"},
> +	{0x6611,	0x0,	"AMD Radeon HD 8500 Series"},
> +	{0x6613,	0x0,	"AMD Radeon HD 8500 series"},
> +	{0x6617,	0xC7,	"AMD Radeon R7 240 Series"},
> +	{0x6640,	0x0,	"AMD Radeon HD 8950"},
> +	{0x6640,	0x80,	"AMD Radeon R9 M380"},
> +	{0x6646,	0x0,	"AMD Radeon R9 M280X"},
> +	{0x6646,	0x80,	"AMD Radeon R9 M470X"},
> +	{0x6647,	0x0,	"AMD Radeon R9 M270X"},
> +	{0x6647,	0x80,	"AMD Radeon R9 M380"},
> +	{0x6649,	0x0,	"AMD FirePro W5100"},
> +	{0x6658,	0x0,	"AMD Radeon R7 200 Series"},
> +	{0x665C,	0x0,	"AMD Radeon HD 7700 Series"},
> +	{0x665D,	0x0,	"AMD Radeon R7 200 Series"},
> +	{0x665F,	0x81,	"AMD Radeon R7 300 Series"},
> +	{0x6660,	0x0,	"AMD Radeon HD 8600M Series"},
> +	{0x6660,	0x81,	"AMD Radeon R5 M335"},
> +	{0x6660,	0x83,	"AMD Radeon R5 M330"},
> +	{0x6663,	0x0,	"AMD Radeon HD 8500M Series"},
> +	{0x6663,	0x83,	"AMD Radeon R5 M320"},
> +	{0x6664,	0x0,	"AMD Radeon R5 M200 Series"},
> +	{0x6665,	0x0,	"AMD Radeon R5 M200 Series"},
> +	{0x6665,	0x83,	"AMD Radeon R5 M320"},
> +	{0x6667,	0x0,	"AMD Radeon R5 M200 Series"},
> +	{0x666F,	0x0,	"AMD Radeon HD 8500M"},
> +	{0x6780,	0x0,	"ATI FirePro V (FireGL V) Graphics Adapter"},
> +	{0x678A,	0x0,	"ATI FirePro V (FireGL V) Graphics Adapter"},
> +	{0x6798,	0x0,	"AMD Radeon HD 7900 Series"},
> +	{0x679A,	0x0,	"AMD Radeon HD 7900 Series"},
> +	{0x679B,	0x0,	"AMD Radeon HD 7900 Series"},
> +	{0x679E,	0x0,	"AMD Radeon HD 7800 Series"},
> +	{0x67A0,	0x0,	"HAWAII XTGL (67A0)"},
> +	{0x67A1,	0x0,	"HAWAII GL40 (67A1)"},
> +	{0x67B0,	0x0,	"AMD Radeon R9 200 Series"},
> +	{0x67B0,	0x80,	"AMD Radeon R9 390 Series"},
> +	{0x67B1,	0x0,	"AMD Radeon R9 200 Series"},
> +	{0x67B1,	0x80,	"AMD Radeon R9 390 Series"},
> +	{0x67B9,	0x0,	"AMD Radeon R9 200 Series"},
> +	{0x67DF,	0xC4,	"AMD Radeon RX 480 Graphics"},
> +	{0x67DF,	0xC5,	"AMD Radeon RX 470 Graphics"},
> +	{0x67DF,	0xC7,	"AMD Radeon RX 480 Graphics"},
> +	{0x67DF,	0xCF,	"AMD Radeon RX 470 Graphics"},
> +	{0x67C4,	0x00,	"AMD Radeon Pro WX 7100 Graphics"},
> +	{0x67C7,	0x00,	"AMD Radeon Pro WX 5100 Graphics"},
> +	{0x67C0,	0x00,	"AMD Radeon Pro WX 7100 Graphics"},
> +	{0x67E0,	0x00,	"AMD Radeon Pro WX Series Graphics"},
> +	{0x67E3,	0x00,	"AMD Radeon Pro WX 4100 Graphics"},
> +	{0x67E8,	0x00,	"AMD Radeon Pro WX Series Graphics"},
> +	{0x67E8,	0x01,	"AMD Radeon Pro WX Series Graphics"},
> +	{0x67E8,	0x80,	"AMD Radeon E9260 Graphics"},
> +	{0x67EB,	0x00,	"AMD Radeon Pro WX Series Graphics"},
> +	{0x67EF,	0xC0,	"AMD Radeon RX Graphics"},
> +	{0x67EF,	0xC1,	"AMD Radeon RX 460 Graphics"},
> +	{0x67EF,	0xC5,	"AMD Radeon RX 460 Graphics"},
> +	{0x67EF,	0xC7,	"AMD Radeon RX Graphics"},
> +	{0x67EF,	0xCF,	"AMD Radeon RX 460 Graphics"},
> +	{0x67EF,	0xEF,	"AMD Radeon RX Graphics"},
> +	{0x67FF,	0xC0,	"AMD Radeon RX Graphics"},
> +	{0x67FF,	0xC1,	"AMD Radeon RX Graphics"},
> +	{0x6800,	0x0,	"AMD Radeon HD 7970M"},
> +	{0x6801,	0x0,	"AMD Radeon(TM) HD8970M"},
> +	{0x6808,	0x0,	"ATI FirePro V(FireGL V) Graphics Adapter"},
> +	{0x6809,	0x0,	"ATI FirePro V(FireGL V) Graphics Adapter"},
> +	{0x6810,	0x0,	"AMD Radeon(TM) HD 8800 Series"},
> +	{0x6810,	0x81,	"AMD Radeon R7 370 Series"},
> +	{0x6811,	0x0,	"AMD Radeon(TM) HD8800 Series"},
> +	{0x6811,	0x81,	"AMD Radeon R7 300 Series"},
> +	{0x6818,	0x0,	"AMD Radeon HD 7800 Series"},
> +	{0x6819,	0x0,	"AMD Radeon HD 7800 Series"},
> +	{0x6820,	0x0,	"AMD Radeon HD 8800M Series"},
> +	{0x6820,	0x81,	"AMD Radeon R9 M375"},
> +	{0x6820,	0x83,	"AMD Radeon R9 M375X"},
> +	{0x6821,	0x0,	"AMD Radeon HD 8800M Series"},
> +	{0x6821,	0x87,	"AMD Radeon R7 M380"},
> +	{0x6821,	0x83,	"AMD Radeon R9 M370X"},
> +	{0x6822,	0x0,	"AMD Radeon E8860"},
> +	{0x6823,	0x0,	"AMD Radeon HD 8800M Series"},
> +	{0x6825,	0x0,	"AMD Radeon HD 7800M Series"},
> +	{0x6827,	0x0,	"AMD Radeon HD 7800M Series"},
> +	{0x6828,	0x0,	"ATI FirePro V(FireGL V) Graphics Adapter"},
> +	{0x682B,	0x0,	"AMD Radeon HD 8800M Series"},
> +	{0x682B,	0x87,	"AMD Radeon R9 M360"},
> +	{0x682C,	0x0,	"AMD FirePro W4100"},
> +	{0x682D,	0x0,	"AMD Radeon HD 7700M Series"},
> +	{0x682F,	0x0,	"AMD Radeon HD 7700M Series"},
> +	{0x6835,	0x0,	"AMD Radeon R7 Series / HD 9000 Series"},
> +	{0x6837,	0x0,	"AMD Radeon HD7700 Series"},
> +	{0x683D,	0x0,	"AMD Radeon HD 7700 Series"},
> +	{0x683F,	0x0,	"AMD Radeon HD 7700 Series"},
> +	{0x6900,	0x0,	"AMD Radeon R7 M260"},
> +	{0x6900,	0x81,	"AMD Radeon R7 M360"},
> +	{0x6900,	0x83,	"AMD Radeon R7 M340"},
> +	{0x6901,	0x0,	"AMD Radeon R5 M255"},
> +	{0x6907,	0x0,	"AMD Radeon R5 M255"},
> +	{0x6907,	0x87,	"AMD Radeon R5 M315"},
> +	{0x6920,	0x0,	"AMD Radeon R9 M395X"},
> +	{0x6920,	0x1,	"AMD Radeon R9 M390X"},
> +	{0x6921,	0x0,	"AMD Radeon R9 M295X"},
> +	{0x6929,	0x0,	"AMD FirePro S7150"},
> +	{0x692B,	0x0,	"AMD FirePro W7100"},
> +	{0x6938,	0x0,	"AMD Radeon R9 200 Series"},
> +	{0x6938,	0xF0,	"AMD Radeon R9 200 Series"},
> +	{0x6938,	0xF1,	"AMD Radeon R9 380 Series"},
> +	{0x6939,	0xF0,	"AMD Radeon R9 200 Series"},
> +	{0x6939,	0x0,	"AMD Radeon R9 200 Series"},
> +	{0x6939,	0xF1,	"AMD Radeon R9 380 Series"},
> +	{0x7300,	0xC8,	"AMD Radeon R9 Fury Series"},
> +	{0x7300,	0xCB,	"AMD Radeon R9 Fury Series"},
> +	{0x7300,	0xCA,	"AMD Radeon R9 Fury Series"},
> +	{0x9874,	0xC4,	"AMD Radeon R7 Graphics"},
> +	{0x9874,	0xC5,	"AMD Radeon R6 Graphics"},
> +	{0x9874,	0xC6,	"AMD Radeon R6 Graphics"},
> +	{0x9874,	0xC7,	"AMD Radeon R5 Graphics"},
> +	{0x9874,	0x81,	"AMD Radeon R6 Graphics"},
> +	{0x9874,	0x87,	"AMD Radeon R5 Graphics"},
> +	{0x9874,	0x85,	"AMD Radeon R6 Graphics"},
> +	{0x9874,	0x84,	"AMD Radeon R7 Graphics"},
> +
> +	{0x0000,	0x0,	"\0"},
> +};
> +#endif
> diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
> index e5a923e..f4ede03 100644
> --- a/amdgpu/amdgpu_device.c
> +++ b/amdgpu/amdgpu_device.c
> @@ -44,6 +44,7 @@
>   #include "amdgpu_internal.h"
>   #include "util_hash_table.h"
>   #include "util_math.h"
> +#include "amdgpu_asic_id.h"
>   
>   #define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))
>   #define UINT_TO_PTR(x) ((void *)((intptr_t)(x)))
> @@ -303,3 +304,17 @@ int amdgpu_device_deinitialize(amdgpu_device_handle dev)
>   	amdgpu_device_reference(&dev, NULL);
>   	return 0;
>   }
> +
> +const char *amdgpu_get_marketing_name(amdgpu_device_handle dev)
> +{
> +	const struct amdgpu_asic_id_table_t *t = amdgpu_asic_id_table;
> +
> +	while (t->did) {
> +		if ((t->did == dev->info.asic_id) &&
> +		    (t->rid == dev->info.pci_rev_id))
> +			return t->marketing_name;
> +		t++;
> +	}
> +
> +	return NULL;
> +}




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux