[PATCH 8/9] drm/amdgpu: init mc base address for zfb

[Christian König]

Am 07.02.2018 um 13:34 schrieb Feifei Xu:
> From: Hawking Zhang <Hawking.Zhang at amd.com>
>
> Change-Id: I89b9ff36b62eb685a9e2d87e2058d200b92f5034
> Signed-off-by: Hawking Zhang <Hawking.Zhang at amd.com>
> Acked-by: John Bridgman <john.bridgman at amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

NAK, please do that in gmc_v9_0_vram_gtt_location() instead. The 
function you modify here should only read the programmed FB location 
from the MM HUB.

Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
> index b539fd1..c56ab47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
> @@ -38,9 +38,12 @@
>   u64 mmhub_v1_0_get_fb_location(struct amdgpu_device *adev)
>   {
>   	u64 base = RREG32_SOC15(MMHUB, 0, mmMC_VM_FB_LOCATION_BASE);
> -
> -	base &= MC_VM_FB_LOCATION_BASE__FB_BASE_MASK;
> -	base <<= 24;
> +	if (adev->gmc.enable_zfb) {
> +		base = 0xF400000000ULL;
> +	} else {
> +		base &= MC_VM_FB_LOCATION_BASE__FB_BASE_MASK;
> +		base <<= 24;
> +	}
>   
>   	return base;
>   }