diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0300-drm-amdgpu-move-reserving-GDS-GWS-OA-into-common-cod.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0300-drm-amdgpu-move-reserving-GDS-GWS-OA-into-common-cod.patch | 156 |
1 files changed, 156 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0300-drm-amdgpu-move-reserving-GDS-GWS-OA-into-common-cod.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0300-drm-amdgpu-move-reserving-GDS-GWS-OA-into-common-cod.patch new file mode 100644 index 00000000..9befbe11 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0300-drm-amdgpu-move-reserving-GDS-GWS-OA-into-common-cod.patch @@ -0,0 +1,156 @@ +From af7c9f4ffae381bb6220310d76ae75d1d6c499e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Fri, 14 Sep 2018 21:08:57 +0200 +Subject: [PATCH 0300/2940] drm/amdgpu: move reserving GDS/GWS/OA into common + code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We don't need that in the per ASIC code. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@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 3752d070c405..29207ff8c065 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -2060,6 +2060,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) { +@@ -2067,6 +2073,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) { +@@ -2074,6 +2086,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 96df23c99cfb..470dc80f4fe7 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 c34a0aad21ea..ae86238c3f0c 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.17.1 + |