1 files changed, 0 insertions, 137 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0922-drm-amdgpu-move-MMU-notifier-related-defines-to-amdg.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0922-drm-amdgpu-move-MMU-notifier-related-defines-to-amdg.patch
deleted file mode 100644
index f4604f4c..00000000
--- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0922-drm-amdgpu-move-MMU-notifier-related-defines-to-amdg.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 8900c5a9f4d51a46207f53440c7a7d48580e6a5e Mon Sep 17 00:00:00 2001
-From: Christian Koenig <christian.koenig@amd.com>
-Date: Fri, 8 Sep 2017 17:51:08 +0200
-Subject: [PATCH 0922/4131] drm/amdgpu: move MMU notifier related defines to
- amdgpu_mn.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just some cleanup.
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
-
- Conflicts:
-        drivers/gpu/drm/amd/amdgpu/amdgpu.h
-
-Change-Id: Iee191903259ae178510dc2ae3fedbc413bdcff1f
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h    | 25 +---------------
- drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 52 ++++++++++++++++++++++++++++++++++
- 2 files changed, 53 insertions(+), 24 deletions(-)
- create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index e2c97b6..1fbfe98 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -67,6 +67,7 @@
- #include "amdgpu_vce.h"
- #include "amdgpu_vcn.h"
- #include "amdgpu_dm.h"
-+#include "amdgpu_mn.h"
- 
- #include "gpu_scheduler.h"
- #include "amdgpu_virt.h"
-@@ -182,7 +183,6 @@ struct amdgpu_cs_parser;
- struct amdgpu_job;
- struct amdgpu_irq_src;
- struct amdgpu_fpriv;
--struct amdgpu_mn;
- struct amdgpu_bo_va_mapping;
- 
- enum amdgpu_cp_irq {
-@@ -1218,29 +1218,6 @@ void amdgpu_benchmark(struct amdgpu_device *adev, int test_number);
- void amdgpu_test_moves(struct amdgpu_device *adev);
- 
- /*
-- * MMU Notifier
-- */
--#if defined(CONFIG_MMU_NOTIFIER)
--void amdgpu_mn_lock(struct amdgpu_mn *mn);
--void amdgpu_mn_unlock(struct amdgpu_mn *mn);
--struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev);
--int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr);
--void amdgpu_mn_unregister(struct amdgpu_bo *bo);
--#else
--static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {}
--static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {}
--static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev)
--{
--	return NULL;
--}
--static inline int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr)
--{
--	return -ENODEV;
--}
--static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {}
--#endif
--
--/*
-  * Debugfs
-  */
- struct amdgpu_debugfs {
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
-new file mode 100644
-index 0000000..d0095a3
---- /dev/null
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright 2017 Advanced Micro Devices, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * Authors: Christian König
-+ */
-+#ifndef __AMDGPU_MN_H__
-+#define __AMDGPU_MN_H__
-+
-+/*
-+ * MMU Notifier
-+ */
-+struct amdgpu_mn;
-+
-+#if defined(CONFIG_MMU_NOTIFIER)
-+void amdgpu_mn_lock(struct amdgpu_mn *mn);
-+void amdgpu_mn_unlock(struct amdgpu_mn *mn);
-+struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev);
-+int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr);
-+void amdgpu_mn_unregister(struct amdgpu_bo *bo);
-+#else
-+static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {}
-+static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {}
-+static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev)
-+{
-+	return NULL;
-+}
-+static inline int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr)
-+{
-+	return -ENODEV;
-+}
-+static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {}
-+#endif
-+
-+#endif
--- 
-2.7.4
-