[PATCH] drm/amdgpu:cleanup virt related define

[Christian König]

Am 19.09.2016 um 13:04 schrieb Monk Liu:
> move virtual machine related structure to amdgpu_virt.h
> easy for developer to maintain for virualization stuffs
>
> Change-Id: I8cd9904a8ec220345f96214ade7c8030cf6a39f3
> Signed-off-by: Monk Liu <Monk.Liu at amd.com>

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

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 32 +----------------
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |  9 -----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h   | 57 ++++++++++++++++++++++++++++++
>   3 files changed, 58 insertions(+), 40 deletions(-)
>   create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index f93c186..72f8cae 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -58,6 +58,7 @@
>   #include "amd_powerplay.h"
>   
>   #include "gpu_scheduler.h"
> +#include "amdgpu_virt.h"
>   
>   /*
>    * Modules parameters.
> @@ -1935,37 +1936,6 @@ struct amdgpu_atcs {
>   struct cgs_device *amdgpu_cgs_create_device(struct amdgpu_device *adev);
>   void amdgpu_cgs_destroy_device(struct cgs_device *cgs_device);
>   
> -
> -#define AMDGPU_SRIOV_CAPS_SRIOV_VBIOS  (1 << 0) /* vBIOS is sr-iov ready */
> -#define AMDGPU_SRIOV_CAPS_ENABLE_IOV   (1 << 1) /* sr-iov is enabled on this GPU */
> -#define AMDGPU_SRIOV_CAPS_IS_VF        (1 << 2) /* this GPU is a virtual function */
> -#define AMDGPU_PASSTHROUGH_MODE        (1 << 3) /* thw whole GPU is pass through for VM */
> -/* GPU virtualization */
> -struct amdgpu_virtualization {
> -	uint32_t virtual_caps;
> -};
> -
> -#define amdgpu_sriov_enabled(adev) \
> -((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_ENABLE_IOV)
> -
> -#define amdgpu_sriov_vf(adev) \
> -((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_IS_VF)
> -
> -#define amdgpu_sriov_bios(adev) \
> -((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS)
> -
> -#define amdgpu_passthrough(adev) \
> -((adev)->virtualization.virtual_caps & AMDGPU_PASSTHROUGH_MODE)
> -
> -static inline bool is_virtual_machine(void)
> -{
> -#ifdef CONFIG_X86
> -	return boot_cpu_has(X86_FEATURE_HYPERVISOR);
> -#else
> -	return false;
> -#endif
> -}
> -
>   /*
>    * Core structure, functions and helpers.
>    */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 035ff42..9c7e574 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1527,15 +1527,6 @@ static int amdgpu_resume(struct amdgpu_device *adev)
>   	return 0;
>   }
>   
> -static bool amdgpu_device_is_virtual(void)
> -{
> -#ifdef CONFIG_X86
> -	return boot_cpu_has(X86_FEATURE_HYPERVISOR);
> -#else
> -	return false;
> -#endif
> -}
> -
>   bool amdgpu_device_asic_has_dal_support(enum amd_asic_type asic_type)
>   {
>   	switch (asic_type) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> new file mode 100644
> index 0000000..2c37a37
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> @@ -0,0 +1,57 @@
> +/*
> + * Copyright 2016 Advanced Micro Devices, Inc.
> + *
> + * 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.
> + *
> + * Author: Monk.liu at amd.com
> + */
> +#ifndef AMDGPU_VIRT_H
> +#define AMDGPU_VIRT_H
> +
> +#define AMDGPU_SRIOV_CAPS_SRIOV_VBIOS  (1 << 0) /* vBIOS is sr-iov ready */
> +#define AMDGPU_SRIOV_CAPS_ENABLE_IOV   (1 << 1) /* sr-iov is enabled on this GPU */
> +#define AMDGPU_SRIOV_CAPS_IS_VF        (1 << 2) /* this GPU is a virtual function */
> +#define AMDGPU_PASSTHROUGH_MODE        (1 << 3) /* thw whole GPU is pass through for VM */
> +/* GPU virtualization */
> +struct amdgpu_virtualization {
> +	uint32_t virtual_caps;
> +};
> +
> +#define amdgpu_sriov_enabled(adev) \
> +((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_ENABLE_IOV)
> +
> +#define amdgpu_sriov_vf(adev) \
> +((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_IS_VF)
> +
> +#define amdgpu_sriov_bios(adev) \
> +((adev)->virtualization.virtual_caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS)
> +
> +#define amdgpu_passthrough(adev) \
> +((adev)->virtualization.virtual_caps & AMDGPU_PASSTHROUGH_MODE)
> +
> +static inline bool is_virtual_machine(void)
> +{
> +#ifdef CONFIG_X86
> +	return boot_cpu_has(X86_FEATURE_HYPERVISOR);
> +#else
> +	return false;
> +#endif
> +}
> +
> +#endif
> \ No newline at end of file