[PATCH 7/7] drm/amdgpu: move reserving GDS/GWS/OA into common code

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Sep 14, 2018 at 3:13 PM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> We don't need that in the per ASIC code.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>

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

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 ++++++++++++++++++
>  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 19 -------------------
>  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c   | 19 -------------------
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c   | 19 -------------------
>  4 files changed, 18 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 438390fce714..cf93a9831318 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1848,6 +1848,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
>                 return r;
>         }
>
> +       r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,
> +                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,
> +                                   &adev->gds.gds_gfx_bo, NULL, NULL);
> +       if (r)
> +               return r;
> +
>         r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_GWS,
>                            adev->gds.gws.total_size);
>         if (r) {
> @@ -1855,6 +1861,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
>                 return r;
>         }
>
> +       r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,
> +                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,
> +                                   &adev->gds.gws_gfx_bo, NULL, NULL);
> +       if (r)
> +               return r;
> +
>         r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_OA,
>                            adev->gds.oa.total_size);
>         if (r) {
> @@ -1862,6 +1874,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
>                 return r;
>         }
>
> +       r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,
> +                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,
> +                                   &adev->gds.oa_gfx_bo, NULL, NULL);
> +       if (r)
> +               return r;
> +
>         /* Register debugfs entries for amdgpu_ttm */
>         r = amdgpu_ttm_debugfs_init(adev);
>         if (r) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index c0f9732cbaf7..fc39ebbc9d9f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -4582,25 +4582,6 @@ static int gfx_v7_0_sw_init(void *handle)
>                 }
>         }
>
> -       /* reserve GDS, GWS and OA resource for gfx */
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,
> -                                   &adev->gds.gds_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,
> -                                   &adev->gds.gws_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,
> -                                   &adev->gds.oa_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
>         adev->gfx.ce_ram_size = 0x8000;
>
>         gfx_v7_0_gpu_early_init(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 57e4b14e3bd1..5d9fd2c2c244 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -2161,25 +2161,6 @@ static int gfx_v8_0_sw_init(void *handle)
>         if (r)
>                 return r;
>
> -       /* reserve GDS, GWS and OA resource for gfx */
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,
> -                                   &adev->gds.gds_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,
> -                                   &adev->gds.gws_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,
> -                                   &adev->gds.oa_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
>         adev->gfx.ce_ram_size = 0x8000;
>
>         r = gfx_v8_0_gpu_early_init(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index d31a2bc00d61..c075c0b6bb2b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1700,25 +1700,6 @@ static int gfx_v9_0_sw_init(void *handle)
>         if (r)
>                 return r;
>
> -       /* reserve GDS, GWS and OA resource for gfx */
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,
> -                                   &adev->gds.gds_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,
> -                                   &adev->gds.gws_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
> -       r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,
> -                                   PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,
> -                                   &adev->gds.oa_gfx_bo, NULL, NULL);
> -       if (r)
> -               return r;
> -
>         adev->gfx.ce_ram_size = 0x8000;
>
>         r = gfx_v9_0_gpu_early_init(adev);
> --
> 2.14.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux