diff -Nru evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/debian/changelog evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/debian/changelog
--- evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/debian/changelog	2021-07-06 09:34:12.000000000 +0000
+++ evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/debian/changelog	2021-07-08 09:12:09.000000000 +0000
@@ -1,8 +1,8 @@
-evdi (1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1) groovy; urgency=low
+evdi (1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1) groovy; urgency=low
 
   * Auto build.
 
- -- Thomas Karl Pietrowski <thomas@thopiekar.eu>  Tue, 06 Jul 2021 09:34:12 +0000
+ -- Thomas Karl Pietrowski <thomas@thopiekar.eu>  Thu, 08 Jul 2021 09:12:09 +0000
 
 evdi (1.9.1) focal; urgency=medium
 
diff -Nru evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/debian/git-build-recipe.manifest evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/debian/git-build-recipe.manifest
--- evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/debian/git-build-recipe.manifest	2021-07-06 09:34:12.000000000 +0000
+++ evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/debian/git-build-recipe.manifest	2021-07-08 09:12:09.000000000 +0000
@@ -1,3 +1,3 @@
-# git-build-recipe format 0.4 deb-version {debversion}+master~202107060934~rev339~pkg9
-lp:evdi git-commit:03ae0ad16c1b517d99d8d00c53cfa1f21d56b40a
+# git-build-recipe format 0.4 deb-version {debversion}+master~202107080912~rev344~pkg9
+lp:evdi git-commit:b0b2c80eb63f9b858b71afa772135f434aea192a
 nest packaging lp:~thopiekar/evdi/+git/evdi-packaging debian git-commit:a33771665022e5a567cea3e568e64c3a1a66c758
diff -Nru evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/module/evdi_modeset.c evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/module/evdi_modeset.c
--- evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/module/evdi_modeset.c	2021-07-06 09:34:06.000000000 +0000
+++ evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/module/evdi_modeset.c	2021-07-08 09:12:03.000000000 +0000
@@ -12,7 +12,7 @@
  */
 
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE || defined(EL8)
+#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE || defined(EL8)
 #include <drm/drm_damage_helper.h>
 #else
 #include <drm/drmP.h>
@@ -26,7 +26,11 @@
 #include "evdi_drm_drv.h"
 #include "evdi_cursor.h"
 #include "evdi_params.h"
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+#include <drm/drm_gem_atomic_helper.h>
+#else
 #include <drm/drm_gem_framebuffer_helper.h>
+#endif
 
 static void evdi_crtc_dpms(__always_unused struct drm_crtc *crtc,
 			   __always_unused int mode)
@@ -205,8 +209,17 @@
 };
 
 static void evdi_plane_atomic_update(struct drm_plane *plane,
-				     struct drm_plane_state *old_state)
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+				     struct drm_atomic_state *atom_state
+#else
+				     struct drm_plane_state *old_state
+#endif
+		)
 {
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+	struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(atom_state, plane);
+#else
+#endif
 	struct drm_plane_state *state;
 	struct evdi_device *evdi;
 	struct evdi_painter *painter;
@@ -294,8 +307,17 @@
 }
 
 static void evdi_cursor_atomic_update(struct drm_plane *plane,
-				      struct drm_plane_state *old_state)
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+				     struct drm_atomic_state *atom_state
+#else
+				     struct drm_plane_state *old_state
+#endif
+		)
 {
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+	struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(atom_state, plane);
+#else
+#endif
 	if (plane && plane->state && plane->dev && plane->dev->dev_private) {
 		struct drm_plane_state *state = plane->state;
 		struct evdi_device *evdi = plane->dev->dev_private;
@@ -355,12 +377,20 @@
 
 static const struct drm_plane_helper_funcs evdi_plane_helper_funcs = {
 	.atomic_update = evdi_plane_atomic_update,
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+	.prepare_fb = drm_gem_plane_helper_prepare_fb
+#else
 	.prepare_fb = drm_gem_fb_prepare_fb
+#endif
 };
 
 static const struct drm_plane_helper_funcs evdi_cursor_helper_funcs = {
 	.atomic_update = evdi_cursor_atomic_update,
+#if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE
+	.prepare_fb = drm_gem_plane_helper_prepare_fb
+#else
 	.prepare_fb = drm_gem_fb_prepare_fb
+#endif
 };
 
 static const struct drm_plane_funcs evdi_plane_funcs = {
@@ -431,7 +461,7 @@
 	primary_plane = evdi_create_plane(dev, DRM_PLANE_TYPE_PRIMARY,
 					  &evdi_plane_helper_funcs);
 
-#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE || defined (EL8)
+#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE || defined(EL8)
 	drm_plane_enable_fb_damage_clips(primary_plane);
 #endif
 
diff -Nru evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/module/evdi_painter.c evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/module/evdi_painter.c
--- evdi-1.9.1+master~202107060934~rev339~pkg9~ubuntu20.10.1/module/evdi_painter.c	2021-07-06 09:34:06.000000000 +0000
+++ evdi-1.9.1+master~202107080912~rev344~pkg9~ubuntu20.10.1/module/evdi_painter.c	2021-07-08 09:12:03.000000000 +0000
@@ -716,10 +716,14 @@
 static void evdi_log_pixel_format(uint32_t pixel_format,
 		char *buf, size_t size)
 {
+#if KERNEL_VERSION(5, 14, 0) <= LINUX_VERSION_CODE
+	snprintf(buf, size, "pixel format %p4cc", &pixel_format);
+#else
 	struct drm_format_name_buf format_name;
 
 	drm_get_format_name(pixel_format, &format_name);
 	snprintf(buf, size, "pixel format %s", format_name.str);
+#endif
 }
 
 void evdi_painter_mode_changed_notify(struct evdi_device *evdi,