Merge ~vicamo/ubuntu/+source/evdi:bug-2138852/new-1.14.12-release/resolute-mp into ubuntu/+source/evdi:ubuntu/devel

[You-Sheng Yang]

* New upstream version 1.14.12 (LP: #2138852)
  - Drop upstreamed fix for FTBFS against kernel v6.18

[You-Sheng Yang (vicamo)]

Debdiff in https://bugs.launchpad.net/ubuntu/+source/evdi/+bug/2138852/comments/3.

While this is a new upstream v1.14.12 release, original tarball, along with prebuilt binaries, are uploaded to https://launchpad.net/~vicamo/+archive/ubuntu/sru-2138852 for easier review and verification.

Unmerged commits

13371ef... by You-Sheng Yang on 2026-01-22

debian: bump version

Signed-off-by: You-Sheng Yang <email address hidden>

961411d... by You-Sheng Yang on 2026-01-22

debian: refresh patches

Signed-off-by: You-Sheng Yang <email address hidden>

1fb2ff8... by You-Sheng Yang on 2026-01-22

New upstream version 1.14.12+dfsg

Signed-off-by: You-Sheng Yang <email address hidden>

8b2e6c1... by You-Sheng Yang on 2025-12-09

1.14.11+dfsg-1ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index f647c69..68588ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+evdi (1.14.12+dfsg-1ubuntu1) resolute; urgency=medium
+
+  * New upstream version 1.14.12 (LP: #2138852)
+    - Drop upstreamed fix for FTBFS against kernel v6.18
+
+ -- You-Sheng Yang <[e-mail]>  Thu, 22 Jan 2026 21:01:10 +0800
+
+evdi (1.14.12+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 1.14.12+dfsg (Closes: #1119309, #1124928)
+
+ -- Harlan Lieberman-Berg <[e-mail]>  Thu, 15 Jan 2026 08:17:53 -0500
+
 evdi (1.14.11+dfsg-1ubuntu1) resolute; urgency=medium
 
   * New upstream version 1.14.11
     - Drop upstreamed fix for FTBFS against kernel v6.17
-  * Fix build for kernel >= v6.18-rc1 (LP: #21130333)
+  * Fix build for kernel >= v6.18-rc1 (LP: #2130333)
 
  -- You-Sheng Yang <[e-mail]>  Tue, 09 Dec 2025 16:57:17 +0800
 
diff --git a/debian/patches/Support-Linux-v6.18-Lock-on-dev-struct_mutex-unnecessary-.patch b/debian/patches/Support-Linux-v6.18-Lock-on-dev-struct_mutex-unnecessary-.patch
deleted file mode 100644
index 0df5a53..0000000
--- a/debian/patches/Support-Linux-v6.18-Lock-on-dev-struct_mutex-unnecessary-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?utf-8?q?=C5=81ukasz_Spintzyk?= <[e-mail]>
-Date: Mon, 13 Oct 2025 23:59:29 +0000
-Subject: [Support Linux v6.18] Lock on dev struct_mutex unnecessary as cursor
- is only modified
-
-BugLink: https://bugs.launchpad.net/bugs/2130333
-Origin: upstream, https://github.com/DisplayLink/evdi/commit/d00021b6a926b5ae14f45c95e908180422425b96.patch
-Signed-off-by: You-Sheng Yang <[e-mail]>
----
- module/evdi_modeset.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/module/evdi_modeset.c b/module/evdi_modeset.c
-index 9636323..6674e4b 100644
---- a/module/evdi_modeset.c
-+++ b/module/evdi_modeset.c
-@@ -341,8 +341,6 @@ static void evdi_cursor_atomic_update(struct drm_plane *plane,
- 		int32_t cursor_position_x = 0;
- 		int32_t cursor_position_y = 0;
- 
--		mutex_lock(&plane->dev->struct_mutex);
--
- 		evdi_cursor_position(evdi->cursor, &cursor_position_x,
- 		&cursor_position_y);
- 		evdi_cursor_move(evdi->cursor, state->crtc_x, state->crtc_y);
-@@ -367,7 +365,6 @@ static void evdi_cursor_atomic_update(struct drm_plane *plane,
- 			cursor_changed = true;
- 		}
- 
--		mutex_unlock(&plane->dev->struct_mutex);
- 		if (!evdi->cursor_events_enabled) {
- 			if (fb != NULL) {
- 				if (efb->obj->allow_sw_cursor_rect_updates) {
diff --git a/debian/patches/Support-Linux-v6.18-No-need-to-lock-in-drm_gem_lookup-as-.patch b/debian/patches/Support-Linux-v6.18-No-need-to-lock-in-drm_gem_lookup-as-.patch
deleted file mode 100644
index 79beb8f..0000000
--- a/debian/patches/Support-Linux-v6.18-No-need-to-lock-in-drm_gem_lookup-as-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?utf-8?q?=C5=81ukasz_Spintzyk?= <[e-mail]>
-Date: Mon, 13 Oct 2025 14:37:34 -0700
-Subject: [Support Linux v6.18] No need to lock in drm_gem_lookup as it is
- already cares for locking
-
-BugLink: https://bugs.launchpad.net/bugs/2130333
-Origin: upstream, https://github.com/DisplayLink/evdi/commit/149dbaea6ca49a20fa04636cf4a60ca5ee75b8a6.patch
-Signed-off-by: You-Sheng Yang <[e-mail]>
----
- module/evdi_modeset.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/module/evdi_modeset.c b/module/evdi_modeset.c
-index cadd791..9636323 100644
---- a/module/evdi_modeset.c
-+++ b/module/evdi_modeset.c
-@@ -134,13 +134,11 @@ static int evdi_crtc_cursor_set(struct drm_crtc *crtc,
- 
- 	EVDI_CHECKPT();
- 	if (handle) {
--		mutex_lock(&dev->struct_mutex);
- 		obj = drm_gem_object_lookup(file, handle);
- 		if (obj)
- 			eobj = to_evdi_bo(obj);
- 		else
- 			EVDI_ERROR("Failed to lookup gem object.\n");
--		mutex_unlock(&dev->struct_mutex);
- 	}
- 
- 	evdi_cursor_set(evdi->cursor,
diff --git a/debian/patches/Support-Linux-v6.18-Remove-lock-on-device-struct_mutex.patch b/debian/patches/Support-Linux-v6.18-Remove-lock-on-device-struct_mutex.patch
deleted file mode 100644
index e6984f4..0000000
--- a/debian/patches/Support-Linux-v6.18-Remove-lock-on-device-struct_mutex.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?utf-8?q?=C5=81ukasz_Spintzyk?= <[e-mail]>
-Date: Tue, 14 Oct 2025 00:10:24 +0000
-Subject: [Support Linux v6.18] Remove lock on device->struct_mutex
-
-We unnecesarilly lock struct_mutex here
-- We do not modify struct drm_device object here.
-- evdi_pin_pages is already using own lock for pages
-- drm_gem_create_mmap_offset is already using vma lock inside
-- struct_mutex is removed since kernel 6.18
-
-BugLink: https://bugs.launchpad.net/bugs/2130333
-Origin: upstream, https://github.com/DisplayLink/evdi/commit/cc97fab0e2cfc7fba980f645b4901280018586db.patch
-Signed-off-by: You-Sheng Yang <[e-mail]>
----
- module/evdi_gem.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/module/evdi_gem.c b/module/evdi_gem.c
-index f594d1b..ee1dbcf 100644
---- a/module/evdi_gem.c
-+++ b/module/evdi_gem.c
-@@ -402,11 +402,9 @@ int evdi_gem_mmap(struct drm_file *file,
- 	struct drm_gem_object *obj;
- 	int ret = 0;
- 
--	mutex_lock(&dev->struct_mutex);
- 	obj = drm_gem_object_lookup(file, handle);
- 	if (obj == NULL) {
--		ret = -ENOENT;
--		goto unlock;
-+		return -ENOENT;
- 	}
- 	gobj = to_evdi_bo(obj);
- 
-@@ -429,8 +427,6 @@ int evdi_gem_mmap(struct drm_file *file,
- 
-  out:
- 	drm_gem_object_put(&gobj->base);
-- unlock:
--	mutex_unlock(&dev->struct_mutex);
- 	return ret;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1a9644c..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-Support-Linux-v6.18-No-need-to-lock-in-drm_gem_lookup-as-.patch
-Support-Linux-v6.18-Lock-on-dev-struct_mutex-unnecessary-.patch
-Support-Linux-v6.18-Remove-lock-on-device-struct_mutex.patch