aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0952-drm-amd-remove-min-max-addr-handling-from-cgs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0952-drm-amd-remove-min-max-addr-handling-from-cgs.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0952-drm-amd-remove-min-max-addr-handling-from-cgs.patch173
1 files changed, 0 insertions, 173 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0952-drm-amd-remove-min-max-addr-handling-from-cgs.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0952-drm-amd-remove-min-max-addr-handling-from-cgs.patch
deleted file mode 100644
index 243aeb84..00000000
--- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0952-drm-amd-remove-min-max-addr-handling-from-cgs.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From cb63931f27ed4ff79a1922bd592ac19b86f41099 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Mon, 11 Sep 2017 17:10:26 +0200
-Subject: [PATCH 0952/4131] drm/amd: remove min/max addr handling from cgs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Nobody is actually using this and it causes a bunch of unused and buggy 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_cgs.c | 48 ++-------------------------
- drivers/gpu/drm/amd/include/cgs_common.h | 7 ++--
- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 2 +-
- 3 files changed, 6 insertions(+), 51 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
-index 8b5fa22..53d1591 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
-@@ -45,7 +45,6 @@ struct amdgpu_cgs_device {
- static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device,
- enum cgs_gpu_mem_type type,
- uint64_t size, uint64_t align,
-- uint64_t min_offset, uint64_t max_offset,
- cgs_handle_t *handle)
- {
- CGS_FUNC_ADEV;
-@@ -53,13 +52,6 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device,
- int ret = 0;
- uint32_t domain = 0;
- struct amdgpu_bo *obj;
-- struct ttm_placement placement;
-- struct ttm_place place;
--
-- if (min_offset > max_offset) {
-- BUG_ON(1);
-- return -EINVAL;
-- }
-
- /* fail if the alignment is not a power of 2 */
- if (((align != 1) && (align & (align - 1)))
-@@ -73,41 +65,19 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device,
- flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
- AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
- domain = AMDGPU_GEM_DOMAIN_VRAM;
-- if (max_offset > adev->mc.real_vram_size)
-- return -EINVAL;
-- place.fpfn = min_offset >> PAGE_SHIFT;
-- place.lpfn = max_offset >> PAGE_SHIFT;
-- place.flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |
-- TTM_PL_FLAG_VRAM;
- break;
- case CGS_GPU_MEM_TYPE__INVISIBLE_CONTIG_FB:
- case CGS_GPU_MEM_TYPE__INVISIBLE_FB:
- flags = AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
- AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
- domain = AMDGPU_GEM_DOMAIN_VRAM;
-- if (adev->mc.visible_vram_size < adev->mc.real_vram_size) {
-- place.fpfn =
-- max(min_offset, adev->mc.visible_vram_size) >> PAGE_SHIFT;
-- place.lpfn =
-- min(max_offset, adev->mc.real_vram_size) >> PAGE_SHIFT;
-- place.flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |
-- TTM_PL_FLAG_VRAM;
-- }
--
- break;
- case CGS_GPU_MEM_TYPE__GART_CACHEABLE:
- domain = AMDGPU_GEM_DOMAIN_GTT;
-- place.fpfn = min_offset >> PAGE_SHIFT;
-- place.lpfn = max_offset >> PAGE_SHIFT;
-- place.flags = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_TT;
- break;
- case CGS_GPU_MEM_TYPE__GART_WRITECOMBINE:
- flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;
- domain = AMDGPU_GEM_DOMAIN_GTT;
-- place.fpfn = min_offset >> PAGE_SHIFT;
-- place.lpfn = max_offset >> PAGE_SHIFT;
-- place.flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT |
-- TTM_PL_FLAG_UNCACHED;
- break;
- default:
- return -EINVAL;
-@@ -116,15 +86,8 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device,
-
- *handle = 0;
-
-- placement.placement = &place;
-- placement.num_placement = 1;
-- placement.busy_placement = &place;
-- placement.num_busy_placement = 1;
--
-- ret = amdgpu_bo_create_restricted(adev, size, align,
-- true, domain, flags,
-- NULL, &placement, NULL,
-- 0, &obj);
-+ ret = amdgpu_bo_create(adev, size, align, true, domain, flags,
-+ NULL, NULL, 0, &obj);
- if (ret) {
- DRM_ERROR("(%d) bo create failed\n", ret);
- return ret;
-@@ -155,19 +118,14 @@ static int amdgpu_cgs_gmap_gpu_mem(struct cgs_device *cgs_device, cgs_handle_t h
- uint64_t *mcaddr)
- {
- int r;
-- u64 min_offset, max_offset;
- struct amdgpu_bo *obj = (struct amdgpu_bo *)handle;
-
- WARN_ON_ONCE(obj->placement.num_placement > 1);
-
-- min_offset = obj->placements[0].fpfn << PAGE_SHIFT;
-- max_offset = obj->placements[0].lpfn << PAGE_SHIFT;
--
- r = amdgpu_bo_reserve(obj, true);
- if (unlikely(r != 0))
- return r;
-- r = amdgpu_bo_pin_restricted(obj, obj->preferred_domains,
-- min_offset, max_offset, mcaddr);
-+ r = amdgpu_bo_pin(obj, obj->preferred_domains, mcaddr);
- amdgpu_bo_unreserve(obj);
- return r;
- }
-diff --git a/drivers/gpu/drm/amd/include/cgs_common.h b/drivers/gpu/drm/amd/include/cgs_common.h
-index 92eaa81..2c1f13e 100644
---- a/drivers/gpu/drm/amd/include/cgs_common.h
-+++ b/drivers/gpu/drm/amd/include/cgs_common.h
-@@ -193,8 +193,6 @@ struct cgs_acpi_method_info {
- * @type: memory type
- * @size: size in bytes
- * @align: alignment in bytes
-- * @min_offset: minimum offset from start of heap
-- * @max_offset: maximum offset from start of heap
- * @handle: memory handle (output)
- *
- * The memory types CGS_GPU_MEM_TYPE_*_CONTIG_FB force contiguous
-@@ -216,7 +214,6 @@ struct cgs_acpi_method_info {
- */
- typedef int (*cgs_alloc_gpu_mem_t)(struct cgs_device *cgs_device, enum cgs_gpu_mem_type type,
- uint64_t size, uint64_t align,
-- uint64_t min_offset, uint64_t max_offset,
- cgs_handle_t *handle);
-
- /**
-@@ -479,8 +476,8 @@ struct cgs_device
- #define CGS_OS_CALL(func,dev,...) \
- (((struct cgs_device *)dev)->os_ops->func(dev, ##__VA_ARGS__))
-
--#define cgs_alloc_gpu_mem(dev,type,size,align,min_off,max_off,handle) \
-- CGS_CALL(alloc_gpu_mem,dev,type,size,align,min_off,max_off,handle)
-+#define cgs_alloc_gpu_mem(dev,type,size,align,handle) \
-+ CGS_CALL(alloc_gpu_mem,dev,type,size,align,handle)
- #define cgs_free_gpu_mem(dev,handle) \
- CGS_CALL(free_gpu_mem,dev,handle)
- #define cgs_gmap_gpu_mem(dev,handle,mcaddr) \
-diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
-index 3bdf647..e397349 100644
---- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
-+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
-@@ -316,7 +316,7 @@ int smu_allocate_memory(void *device, uint32_t size,
- return -EINVAL;
-
- ret = cgs_alloc_gpu_mem(device, type, size, byte_align,
-- 0, 0, (cgs_handle_t *)handle);
-+ (cgs_handle_t *)handle);
- if (ret)
- return -ENOMEM;
-
---
-2.7.4
-
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-19 21:56:15 +0000