[PATCH] /drm/amd/amdgpu: move get memory type function from early init to sw init

[PATCH] /drm/amd/amdgpu: move get memory type function from early init to sw init

[Jim Qu]

On PX system, it will get memory type before gpu post , and get unkown type.

Change-Id: I79e3760dd789c21a5f552bc4e5754f7a2defdaae
Signed-off-by: Jim Qu <Jim.Qu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 5cc3f39..5ed6788f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -765,14 +765,6 @@ static int gmc_v6_0_early_init(void *handle)
 	gmc_v6_0_set_gart_funcs(adev);
 	gmc_v6_0_set_irq_funcs(adev);
 
-	if (adev->flags & AMD_IS_APU) {
-		adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
-	} else {
-		u32 tmp = RREG32(mmMC_SEQ_MISC0);
-		tmp &= MC_SEQ_MISC0__MT__MASK;
-		adev->mc.vram_type = gmc_v6_0_convert_vram_type(tmp);
-	}
-
 	return 0;
 }
 
@@ -792,6 +784,14 @@ static int gmc_v6_0_sw_init(void *handle)
 	int dma_bits;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+	if (adev->flags & AMD_IS_APU) {
+		adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
+	} else {
+		u32 tmp = RREG32(mmMC_SEQ_MISC0);
+		tmp &= MC_SEQ_MISC0__MT__MASK;
+		adev->mc.vram_type = gmc_v6_0_convert_vram_type(tmp);
+	}
+
 	r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 146, &adev->mc.vm_fault);
 	if (r)
 		return r;
-- 
1.9.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] /drm/amd/amdgpu: move get memory type function from early init to sw init

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Jim Qu
> Sent: Friday, June 30, 2017 1:32 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Qu, Jim
> Subject: [PATCH] /drm/amd/amdgpu: move get memory type function from
> early init to sw init
> 
> On PX system, it will get memory type before gpu post , and get unkown
> type.
> 
> Change-Id: I79e3760dd789c21a5f552bc4e5754f7a2defdaae
> Signed-off-by: Jim Qu <Jim.Qu@amd.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 5cc3f39..5ed6788f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -765,14 +765,6 @@ static int gmc_v6_0_early_init(void *handle)
>  	gmc_v6_0_set_gart_funcs(adev);
>  	gmc_v6_0_set_irq_funcs(adev);
> 
> -	if (adev->flags & AMD_IS_APU) {
> -		adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
> -	} else {
> -		u32 tmp = RREG32(mmMC_SEQ_MISC0);
> -		tmp &= MC_SEQ_MISC0__MT__MASK;
> -		adev->mc.vram_type =
> gmc_v6_0_convert_vram_type(tmp);
> -	}
> -
>  	return 0;
>  }
> 
> @@ -792,6 +784,14 @@ static int gmc_v6_0_sw_init(void *handle)
>  	int dma_bits;
>  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> 
> +	if (adev->flags & AMD_IS_APU) {
> +		adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
> +	} else {
> +		u32 tmp = RREG32(mmMC_SEQ_MISC0);
> +		tmp &= MC_SEQ_MISC0__MT__MASK;
> +		adev->mc.vram_type =
> gmc_v6_0_convert_vram_type(tmp);
> +	}
> +
>  	r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_LEGACY, 146,
> &adev->mc.vm_fault);
>  	if (r)
>  		return r;
> --
> 1.9.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx