File global.patch of Package displaylink

Overview Repositories Revisions Requests Users Attributes Meta

File global.patch of Package displaylink (Revision 836b3442c50657f3936f61be889d4388)

Currently displaying revision 836b3442c50657f3936f61be889d4388 , Show latest

diff --git a/Jenkinsfile b/Jenkinsfile
index 329e2b8..59d7242 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,6 @@ pipeline {
             steps {
                 dir('src') {
                     sh '''
-                    ./ci/check_version
                     EVDI_VERSION_SHORT=$(echo ${EVDI_VERSION} | awk -F '.' '{printf("%d.%d", $1, $2)}')
                     bash -c "[[ ${JOB_BASE_NAME} == *evdi-${EVDI_VERSION_SHORT}* ]]"
                     '''
diff --git a/ci/run_style_check b/ci/run_style_check
index dc3ccdc..b9044ef 100755
--- a/ci/run_style_check
+++ b/ci/run_style_check
@@ -10,7 +10,7 @@ files=(
   spelling.txt
 )
 
-KVER="v$(grep --only-matching --perl-regexp 'KVER=\K[\d\.]*' .travis.yml | tail -n 1)"
+KVER=master
 
 for file in "${files[@]}"; do
   wget -N -q "https://raw.githubusercontent.com/torvalds/linux/${KVER}/scripts/${file}"
diff --git a/module/Makefile b/module/Makefile
index fe573de..c8022c8 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -50,7 +50,7 @@ ifneq ($(KERNELRELEASE),)
 # inside kbuild
 # Note: this can be removed once it is in kernel tree and Kconfig is properly used
 CONFIG_DRM_EVDI := m
-ccflags-y := -isystem include/uapi/drm include/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG)
+ccflags-y := -isystem include/uapi/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG)
 evdi-y := evdi_platform_drv.o evdi_platform_dev.o evdi_sysfs.o evdi_modeset.o evdi_connector.o evdi_encoder.o evdi_drm_drv.o evdi_fb.o evdi_gem.o evdi_painter.o evdi_params.o evdi_cursor.o evdi_debug.o evdi_i2c.o
 evdi-$(CONFIG_COMPAT) += evdi_ioc32.o
 obj-$(CONFIG_DRM_EVDI) := evdi.o
diff --git a/module/evdi_drm.h b/module/evdi_drm.h
index 29b8427..5012693 100644
--- a/module/evdi_drm.h
+++ b/module/evdi_drm.h
@@ -12,12 +12,11 @@
 
 #ifdef __KERNEL__
 #include <linux/types.h>
+#include <drm/drm.h>
 #else
 #include <stdint.h>
 #endif
 
-#include "drm.h"
-
 /* Output events sent from driver to evdi lib */
 #define DRM_EVDI_EVENT_UPDATE_READY  0x80000000
 #define DRM_EVDI_EVENT_DPMS          0x80000001
diff --git a/module/evdi_drm_drv.h b/module/evdi_drm_drv.h
index 747218b..5eea878 100644
--- a/module/evdi_drm_drv.h
+++ b/module/evdi_drm_drv.h
@@ -18,7 +18,7 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/i2c.h>
-#if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE || defined(EL8)
+#if KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
 #include <drm/drm_drv.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_ioctl.h>
@@ -26,7 +26,7 @@
 #else
 #include <drm/drmP.h>
 #endif
-#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE || defined(EL9)
+#if KERNEL_VERSION(5, 14, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
 #include <drm/drm_framebuffer.h>
 #else
 #include <drm/drm_irq.h>
@@ -36,11 +36,6 @@
 #include <drm/drm_rect.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_framebuffer.h>
-#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE || defined(EL8)
-#include <linux/dma-resv.h>
-#else
-#include <linux/reservation.h>
-#endif
 
 #include "evdi_debug.h"
 
@@ -74,13 +69,6 @@ struct evdi_gem_object {
 	bool vmap_is_iomem;
 #endif
 	struct sg_table *sg;
-#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE || defined(EL8)
-	struct dma_resv *resv;
-	struct dma_resv _resv;
-#else
-	struct reservation_object *resv;
-	struct reservation_object _resv;
-#endif
 	bool allow_sw_cursor_rect_updates;
 };
 
diff --git a/module/evdi_fb.c b/module/evdi_fb.c
index 07ec656..dec10d3 100644
--- a/module/evdi_fb.c
+++ b/module/evdi_fb.c
@@ -224,7 +224,7 @@ static const struct fb_ops evdifb_ops = {
 #else
 /*
  * Function taken from
- * https://lists.freedesktop.org/archives/dri-devel/2018-September/188716.html
+ * https://lore.kernel.org/dri-devel/20180905233901.2321-5-drawat@vmware.com/
  */
 static int evdi_user_framebuffer_dirty(
 		struct drm_framebuffer *fb,
diff --git a/module/evdi_gem.c b/module/evdi_gem.c
index d009b0e..de92a2b 100644
--- a/module/evdi_gem.c
+++ b/module/evdi_gem.c
@@ -10,7 +10,7 @@
 
 #include <linux/sched.h>
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
 #elif KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE
 #include <linux/dma-buf-map.h>
 #endif
@@ -101,12 +101,6 @@ struct evdi_gem_object *evdi_gem_alloc_object(struct drm_device *dev,
 		return NULL;
 	}
 
-#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE || defined(EL8)
-	dma_resv_init(&obj->_resv);
-#else
-	reservation_object_init(&obj->_resv);
-#endif
-	obj->resv = &obj->_resv;
 
 #if KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE || defined(EL8)
 	obj->base.funcs = &gem_obj_funcs;
@@ -295,7 +289,7 @@ int evdi_gem_vmap(struct evdi_gem_object *obj)
 	int ret;
 
 	if (evdi_drm_gem_object_use_import_attach(&obj->base)) {
-#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
 		struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL);
 #elif KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE || defined(EL8)
 		struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(NULL);
@@ -328,7 +322,7 @@ int evdi_gem_vmap(struct evdi_gem_object *obj)
 void evdi_gem_vunmap(struct evdi_gem_object *obj)
 {
 	if (evdi_drm_gem_object_use_import_attach(&obj->base)) {
-#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9)
 		struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL);
 
 		if (obj->vmap_is_iomem)
@@ -377,12 +371,6 @@ void evdi_gem_free_object(struct drm_gem_object *gem_obj)
 
 	if (gem_obj->dev->vma_offset_manager)
 		drm_gem_free_mmap_offset(gem_obj);
-#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE || defined(EL8)
-	dma_resv_fini(&obj->_resv);
-#else
-	reservation_object_fini(&obj->_resv);
-#endif
-	obj->resv = NULL;
 	mutex_destroy(&obj->pages_lock);
 	drm_gem_object_release(&obj->base);
 	kfree(obj);
diff --git a/module/evdi_modeset.c b/module/evdi_modeset.c
index f239b46..55cbea7 100644
--- a/module/evdi_modeset.c
+++ b/module/evdi_modeset.c
@@ -327,6 +327,7 @@ static void evdi_cursor_atomic_update(struct drm_plane *plane,
 {
 #if KERNEL_VERSION(5, 13, 0) <= LINUX_VERSION_CODE || defined(EL8)
 	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) {

Places

File global.patch of Package displaylink (Revision 836b3442c50657f3936f61be889d4388)

Places