Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu:cleanup virt related define

move virtual machine related structure to amdgpu_virt.h
easy for developer to maintain for virualization stuffs

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Monk Liu and committed by
Alex Deucher
ceeb50ed 9487dd15

+58 -31
+1 -31
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 57 57 #include "amdgpu_acp.h" 58 58 59 59 #include "gpu_scheduler.h" 60 + #include "amdgpu_virt.h" 60 61 61 62 /* 62 63 * Modules parameters. ··· 1932 1931 */ 1933 1932 struct cgs_device *amdgpu_cgs_create_device(struct amdgpu_device *adev); 1934 1933 void amdgpu_cgs_destroy_device(struct cgs_device *cgs_device); 1935 - 1936 - 1937 - #define AMDGPU_SRIOV_CAPS_SRIOV_VBIOS (1 << 0) /* vBIOS is sr-iov ready */ 1938 - #define AMDGPU_SRIOV_CAPS_ENABLE_IOV (1 << 1) /* sr-iov is enabled on this GPU */ 1939 - #define AMDGPU_SRIOV_CAPS_IS_VF (1 << 2) /* this GPU is a virtual function */ 1940 - #define AMDGPU_PASSTHROUGH_MODE (1 << 3) /* thw whole GPU is pass through for VM */ 1941 - /* GPU virtualization */ 1942 - struct amdgpu_virtualization { 1943 - uint32_t virtual_caps; 1944 - }; 1945 - 1946 - #define amdgpu_sriov_enabled(adev) \ 1947 - ((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_ENABLE_IOV) 1948 - 1949 - #define amdgpu_sriov_vf(adev) \ 1950 - ((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_IS_VF) 1951 - 1952 - #define amdgpu_sriov_bios(adev) \ 1953 - ((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS) 1954 - 1955 - #define amdgpu_passthrough(adev) \ 1956 - ((adev)->virtualization.virtual_caps & AMDGPU_PASSTHROUGH_MODE) 1957 - 1958 - static inline bool is_virtual_machine(void) 1959 - { 1960 - #ifdef CONFIG_X86 1961 - return boot_cpu_has(X86_FEATURE_HYPERVISOR); 1962 - #else 1963 - return false; 1964 - #endif 1965 - } 1966 1934 1967 1935 /* 1968 1936 * Core structure, functions and helpers.
+57
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
··· 1 + /* 2 + * Copyright 2016 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 + * Author: Monk.liu@amd.com 23 + */ 24 + #ifndef AMDGPU_VIRT_H 25 + #define AMDGPU_VIRT_H 26 + 27 + #define AMDGPU_SRIOV_CAPS_SRIOV_VBIOS (1 << 0) /* vBIOS is sr-iov ready */ 28 + #define AMDGPU_SRIOV_CAPS_ENABLE_IOV (1 << 1) /* sr-iov is enabled on this GPU */ 29 + #define AMDGPU_SRIOV_CAPS_IS_VF (1 << 2) /* this GPU is a virtual function */ 30 + #define AMDGPU_PASSTHROUGH_MODE (1 << 3) /* thw whole GPU is pass through for VM */ 31 + /* GPU virtualization */ 32 + struct amdgpu_virtualization { 33 + uint32_t virtual_caps; 34 + }; 35 + 36 + #define amdgpu_sriov_enabled(adev) \ 37 + ((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_ENABLE_IOV) 38 + 39 + #define amdgpu_sriov_vf(adev) \ 40 + ((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_IS_VF) 41 + 42 + #define amdgpu_sriov_bios(adev) \ 43 + ((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS) 44 + 45 + #define amdgpu_passthrough(adev) \ 46 + ((adev)->virtualization.virtual_caps & AMDGPU_PASSTHROUGH_MODE) 47 + 48 + static inline bool is_virtual_machine(void) 49 + { 50 + #ifdef CONFIG_X86 51 + return boot_cpu_has(X86_FEATURE_HYPERVISOR); 52 + #else 53 + return false; 54 + #endif 55 + } 56 + 57 + #endif