[PATCH 2/2] drm/amdgpu: disable agp for sriov

[Christian König]

Am 21.08.19 um 12:00 schrieb Frank.Min:
> Since agp is not used for sriov, just disable it
>
> Change-Id: I3aa9753499e2e74d982bb611214f94bd57bd

Missing Signed-of-by line in the commit message.

With that fixed Reviewed-by: Christian König <christian.koenig at amd.com> 
for the series.

> cd9e
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 8 ++++++++
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   | 3 +--
>   2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> index 250d921..6094990 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> @@ -218,6 +218,14 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc)
>   	const uint64_t sixteen_gb_mask = ~(sixteen_gb - 1);
>   	u64 size_af, size_bf;
>   
> +	if (amdgpu_sriov_vf(adev)) {
> +		mc->agp_start = 0xffffffff;
> +		mc->agp_end = 0x0;
> +		mc->agp_size = 0;
> +
> +		return;
> +	}
> +
>   	if (mc->fb_start > mc->gart_start) {
>   		size_bf = (mc->fb_start & sixteen_gb_mask) -
>   			ALIGN(mc->gart_end + 1, sixteen_gb);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 683f47d..6ce2977 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -930,8 +930,7 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
>   	base += adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size;
>   	amdgpu_gmc_vram_location(adev, mc, base);
>   	amdgpu_gmc_gart_location(adev, mc);
> -	if (!amdgpu_sriov_vf(adev))
> -		amdgpu_gmc_agp_location(adev, mc);
> +	amdgpu_gmc_agp_location(adev, mc);
>   	/* base offset of vram pages */
>   	adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev);
>