[PATCH 04/14] drm/amdgpu: move stolen vga bo from amdgpu to amdgpu.gmc

[Christian König]

Am 29.07.20 um 00:45 schrieb Alex Deucher:
> Since that is where we store the other data related to
> the stolen vga memory.

Mhm, how about putting everything into struct amdgpu_mman instead?

This stuff is not at all GMC related as far as I can see.

We just put it into the GMC code because we have all the other memory 
sizes there as well.

Christian.

>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h     | 1 -
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 3 ++-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---
>   drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c  | 2 +-
>   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c   | 2 +-
>   drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   | 2 +-
>   drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c   | 2 +-
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c   | 4 ++--
>   8 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 2a7fbe21619d..899664357015 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -767,7 +767,6 @@ struct amdgpu_device {
>   	bool				is_atom_fw;
>   	uint8_t				*bios;
>   	uint32_t			bios_size;
> -	struct amdgpu_bo		*stolen_vga_memory;
>   	uint32_t			bios_scratch_reg_offset;
>   	uint32_t			bios_scratch[AMDGPU_BIOS_NUM_SCRATCH];
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> index 9d58c56f6cfc..ddb64be670c2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> @@ -213,7 +213,8 @@ struct amdgpu_gmc {
>   	uint8_t			vram_vendor;
>   	uint32_t                srbm_soft_reset;
>   	bool			prt_warning;
> -	uint64_t		stolen_size;
> +	uint64_t		stolen_vga_size;
> +	struct amdgpu_bo	*stolen_vga_memory;
>   	uint32_t		sdpif_register;
>   	/* apertures */
>   	u64			shared_aperture_start;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index a188216bccc2..39781127d059 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1979,9 +1979,9 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
>   	 * This is used for VGA emulation and pre-OS scanout buffers to
>   	 * avoid display artifacts while transitioning between pre-OS
>   	 * and driver.  */
> -	r = amdgpu_bo_create_kernel_at(adev, 0, adev->gmc.stolen_size,
> +	r = amdgpu_bo_create_kernel_at(adev, 0, adev->gmc.stolen_vga_size,
>   				       AMDGPU_GEM_DOMAIN_VRAM,
> -				       &adev->stolen_vga_memory,
> +				       &adev->gmc.stolen_vga_memory,
>   				       &stolen_vga_buf);
>   	if (r)
>   		return r;
> @@ -2043,7 +2043,7 @@ void amdgpu_ttm_late_init(struct amdgpu_device *adev)
>   {
>   	void *stolen_vga_buf;
>   	/* return the VGA stolen memory (if any) back to VRAM */
> -	amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
> +	amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, &stolen_vga_buf);
>   }
>   
>   /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 040220e97cf3..337d70503970 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -812,7 +812,7 @@ static int gmc_v10_0_sw_init(void *handle)
>   	if (r)
>   		return r;
>   
> -	adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
> +	adev->gmc.stolen_vga_size = gmc_v10_0_get_vbios_fb_size(adev);
>   
>   	/* Memory manager */
>   	r = amdgpu_bo_init(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 4de996868d32..28ddb41a78c8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -862,7 +862,7 @@ static int gmc_v6_0_sw_init(void *handle)
>   	if (r)
>   		return r;
>   
> -	adev->gmc.stolen_size = gmc_v6_0_get_vbios_fb_size(adev);
> +	adev->gmc.stolen_vga_size = gmc_v6_0_get_vbios_fb_size(adev);
>   
>   	r = amdgpu_bo_init(adev);
>   	if (r)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index 4113f2d33b75..8b8ecbb99d84 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -1035,7 +1035,7 @@ static int gmc_v7_0_sw_init(void *handle)
>   	if (r)
>   		return r;
>   
> -	adev->gmc.stolen_size = gmc_v7_0_get_vbios_fb_size(adev);
> +	adev->gmc.stolen_vga_size = gmc_v7_0_get_vbios_fb_size(adev);
>   
>   	/* Memory manager */
>   	r = amdgpu_bo_init(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index f29ff9afcc10..8e3763ec268f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -1160,7 +1160,7 @@ static int gmc_v8_0_sw_init(void *handle)
>   	if (r)
>   		return r;
>   
> -	adev->gmc.stolen_size = gmc_v8_0_get_vbios_fb_size(adev);
> +	adev->gmc.stolen_vga_size = gmc_v8_0_get_vbios_fb_size(adev);
>   
>   	/* Memory manager */
>   	r = amdgpu_bo_init(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index ac15d7678d24..b66c60680dba 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -1243,7 +1243,7 @@ static int gmc_v9_0_sw_init(void *handle)
>   	if (r)
>   		return r;
>   
> -	adev->gmc.stolen_size = gmc_v9_0_get_vbios_fb_size(adev);
> +	adev->gmc.stolen_vga_size = gmc_v9_0_get_vbios_fb_size(adev);
>   
>   	/* Memory manager */
>   	r = amdgpu_bo_init(adev);
> @@ -1282,7 +1282,7 @@ static int gmc_v9_0_sw_fini(void *handle)
>   	amdgpu_vm_manager_fini(adev);
>   
>   	if (gmc_v9_0_keep_stolen_memory(adev))
> -		amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
> +		amdgpu_bo_free_kernel(&adev->gmc.stolen_vga_memory, NULL, &stolen_vga_buf);
>   
>   	amdgpu_gart_table_vram_free(adev);
>   	amdgpu_bo_fini(adev);