diff options
author | Akshu Agrawal <akshu.agrawal@amd.com> | 2017-06-28 04:38:09 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-10-18 10:56:27 -0400 |
commit | f674bd281460451e8784f3bc917a650e8937a8ed (patch) | |
tree | 8c0cddaea87050ba51cc209a2332ac03e3e3fabc | |
parent | a1b16aaa55b6425418d6d7a87d3dbbe40bac8c37 (diff) |
drm/amdgpu Moving amdgpu asic types to a separate file
Amdgpu asic types will be required for other drivers too.
Hence, its better to keep it in a separate include file.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/include/amd_shared.h | 29 | ||||
-rw-r--r-- | include/drm/amd_asic_type.h | 52 |
2 files changed, 54 insertions, 27 deletions
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h index 70e8c20acb2f..3a49fbd8baf8 100644 --- a/drivers/gpu/drm/amd/include/amd_shared.h +++ b/drivers/gpu/drm/amd/include/amd_shared.h | |||
@@ -23,34 +23,9 @@ | |||
23 | #ifndef __AMD_SHARED_H__ | 23 | #ifndef __AMD_SHARED_H__ |
24 | #define __AMD_SHARED_H__ | 24 | #define __AMD_SHARED_H__ |
25 | 25 | ||
26 | #define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */ | 26 | #include <drm/amd_asic_type.h> |
27 | 27 | ||
28 | /* | 28 | #define AMD_MAX_USEC_TIMEOUT 200000 /* 200 ms */ |
29 | * Supported ASIC types | ||
30 | */ | ||
31 | enum amd_asic_type { | ||
32 | CHIP_TAHITI = 0, | ||
33 | CHIP_PITCAIRN, | ||
34 | CHIP_VERDE, | ||
35 | CHIP_OLAND, | ||
36 | CHIP_HAINAN, | ||
37 | CHIP_BONAIRE, | ||
38 | CHIP_KAVERI, | ||
39 | CHIP_KABINI, | ||
40 | CHIP_HAWAII, | ||
41 | CHIP_MULLINS, | ||
42 | CHIP_TOPAZ, | ||
43 | CHIP_TONGA, | ||
44 | CHIP_FIJI, | ||
45 | CHIP_CARRIZO, | ||
46 | CHIP_STONEY, | ||
47 | CHIP_POLARIS10, | ||
48 | CHIP_POLARIS11, | ||
49 | CHIP_POLARIS12, | ||
50 | CHIP_VEGA10, | ||
51 | CHIP_RAVEN, | ||
52 | CHIP_LAST, | ||
53 | }; | ||
54 | 29 | ||
55 | /* | 30 | /* |
56 | * Chip flags | 31 | * Chip flags |
diff --git a/include/drm/amd_asic_type.h b/include/drm/amd_asic_type.h new file mode 100644 index 000000000000..599028f66585 --- /dev/null +++ b/include/drm/amd_asic_type.h | |||
@@ -0,0 +1,52 @@ | |||
1 | /* | ||
2 | * Copyright 2017 Advanced Micro Devices, Inc. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
18 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
19 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
20 | * OTHER DEALINGS IN THE SOFTWARE. | ||
21 | */ | ||
22 | |||
23 | #ifndef __AMD_ASIC_TYPE_H__ | ||
24 | #define __AMD_ASIC_TYPE_H__ | ||
25 | /* | ||
26 | * Supported ASIC types | ||
27 | */ | ||
28 | enum amd_asic_type { | ||
29 | CHIP_TAHITI = 0, | ||
30 | CHIP_PITCAIRN, | ||
31 | CHIP_VERDE, | ||
32 | CHIP_OLAND, | ||
33 | CHIP_HAINAN, | ||
34 | CHIP_BONAIRE, | ||
35 | CHIP_KAVERI, | ||
36 | CHIP_KABINI, | ||
37 | CHIP_HAWAII, | ||
38 | CHIP_MULLINS, | ||
39 | CHIP_TOPAZ, | ||
40 | CHIP_TONGA, | ||
41 | CHIP_FIJI, | ||
42 | CHIP_CARRIZO, | ||
43 | CHIP_STONEY, | ||
44 | CHIP_POLARIS10, | ||
45 | CHIP_POLARIS11, | ||
46 | CHIP_POLARIS12, | ||
47 | CHIP_VEGA10, | ||
48 | CHIP_RAVEN, | ||
49 | CHIP_LAST, | ||
50 | }; | ||
51 | |||
52 | #endif /*__AMD_ASIC_TYPE_H__ */ | ||