diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0305-drm-amdgpu-use-separate-scheduler-entitiy-for-buffer.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0305-drm-amdgpu-use-separate-scheduler-entitiy-for-buffer.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/common/recipes-kernel/linux/files/0305-drm-amdgpu-use-separate-scheduler-entitiy-for-buffer.patch b/common/recipes-kernel/linux/files/0305-drm-amdgpu-use-separate-scheduler-entitiy-for-buffer.patch deleted file mode 100644 index 9da1ab01..00000000 --- a/common/recipes-kernel/linux/files/0305-drm-amdgpu-use-separate-scheduler-entitiy-for-buffer.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4daaf81885958741dd2b113f080f935bf13889de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> -Date: Wed, 10 Feb 2016 14:20:50 +0100 -Subject: [PATCH 0305/1110] drm/amdgpu: use separate scheduler entitiy for - buffer moves -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows us to remove the global kernel context. - -Signed-off-by: Christian König <christian.koenig@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Kalyan Alle <kalyan.alle@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 ++++++++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index fd00d29..a6b4b03 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -417,6 +417,8 @@ struct amdgpu_mman { - /* buffer handling */ - const struct amdgpu_buffer_funcs *buffer_funcs; - struct amdgpu_ring *buffer_funcs_ring; -+ /* Scheduler entity for buffer moves */ -+ struct amd_sched_entity entity; - }; - - int amdgpu_copy_buffer(struct amdgpu_ring *ring, -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -index 7355007..e5a684e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c -@@ -77,6 +77,8 @@ static void amdgpu_ttm_mem_global_release(struct drm_global_reference *ref) - static int amdgpu_ttm_global_init(struct amdgpu_device *adev) - { - struct drm_global_reference *global_ref; -+ struct amdgpu_ring *ring; -+ struct amd_sched_rq *rq; - int r; - - adev->mman.mem_global_referenced = false; -@@ -106,13 +108,27 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev) - return r; - } - -+ ring = adev->mman.buffer_funcs_ring; -+ rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_KERNEL]; -+ r = amd_sched_entity_init(&ring->sched, &adev->mman.entity, -+ rq, amdgpu_sched_jobs); -+ if (r != 0) { -+ DRM_ERROR("Failed setting up TTM BO move run queue.\n"); -+ drm_global_item_unref(&adev->mman.mem_global_ref); -+ drm_global_item_unref(&adev->mman.bo_global_ref.ref); -+ return r; -+ } -+ - adev->mman.mem_global_referenced = true; -+ - return 0; - } - - static void amdgpu_ttm_global_fini(struct amdgpu_device *adev) - { - if (adev->mman.mem_global_referenced) { -+ amd_sched_entity_fini(adev->mman.entity.sched, -+ &adev->mman.entity); - drm_global_item_unref(&adev->mman.bo_global_ref.ref); - drm_global_item_unref(&adev->mman.mem_global_ref); - adev->mman.mem_global_referenced = false; --- -2.7.4 - |