File 0001-zocl-Fix-build-for-Linux-kernel-5.6.patch of Package libxrt

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-zocl-Fix-build-for-Linux-kernel-5.6.patch of Package libxrt

From 5c3f4fd70e664235f6834997cffd6f909ae6de93 Mon Sep 17 00:00:00 2001
From: "Matwey V. Kornilov" <matwey@sai.msu.ru>
Date: Tue, 31 Mar 2020 13:22:39 +0300
Subject: [PATCH 1/5] zocl: Fix build for Linux kernel 5.6

drm/drmP.h header has been dropped from Linux kernel 5.5+ in favour of
including really required headers.

Reference: 4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
---
 src/runtime_src/core/edge/drm/zocl/zocl_cu.c          | 2 +-
 src/runtime_src/core/edge/drm/zocl/zocl_dma.c         | 2 +-
 src/runtime_src/core/edge/drm/zocl/zocl_drv.c         | 2 ++
 src/runtime_src/core/edge/drm/zocl/zocl_drv.h         | 3 ++-
 src/runtime_src/core/edge/drm/zocl/zocl_generic_cu.c  | 3 ++-
 src/runtime_src/core/edge/drm/zocl/zocl_ospi_versal.c | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_cu.c b/src/runtime_src/core/edge/drm/zocl/zocl_cu.c
index 101a47a4..f2869de9 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_cu.c
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_cu.c
@@ -17,7 +17,7 @@
  */
 
 
-#include <drm/drmP.h>
+#include <drm/drm_print.h>
 #include <linux/io.h>
 
 #include "zocl_cu.h"
diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_dma.c b/src/runtime_src/core/edge/drm/zocl/zocl_dma.c
index 6ba10c3c..78fd118e 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_dma.c
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_dma.c
@@ -20,7 +20,7 @@
  */
 
 #include "zocl_dma.h"
-#include <drm/drmP.h>
+#include <drm/drm_print.h>
 
 static void zocl_dma_irq_done(void *data)
 {
diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_drv.c b/src/runtime_src/core/edge/drm/zocl/zocl_drv.c
index 50848b78..9d1ad5df 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_drv.c
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_drv.c
@@ -20,6 +20,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/delay.h>
 #include <linux/dma-buf.h>
 #include <linux/module.h>
 #include <linux/fpga/fpga-mgr.h>
@@ -29,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/poll.h>
 #include <linux/spinlock.h>
 #include "zocl_drv.h"
 #include "zocl_sk.h"
diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_drv.h b/src/runtime_src/core/edge/drm/zocl/zocl_drv.h
index 479d19c1..217d7572 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_drv.h
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_drv.h
@@ -21,7 +21,8 @@
 
 #ifndef _ZOCL_DRV_H_
 #define _ZOCL_DRV_H_
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_mm.h>
 #include <drm/drm_gem_cma_helper.h>
diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_generic_cu.c b/src/runtime_src/core/edge/drm/zocl/zocl_generic_cu.c
index 20963ad9..29239147 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_generic_cu.c
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_generic_cu.c
@@ -16,8 +16,9 @@
  * GNU General Public License for more details.
  */
 
-#include <drm/drmP.h>
+#include <drm/drm_print.h>
 #include <linux/anon_inodes.h>
+#include <linux/poll.h>
 #include "zocl_util.h"
 #include "sched_exec.h"
 #include "zocl_generic_cu.h"
diff --git a/src/runtime_src/core/edge/drm/zocl/zocl_ospi_versal.c b/src/runtime_src/core/edge/drm/zocl/zocl_ospi_versal.c
index 826b1ae2..7f0e445a 100644
--- a/src/runtime_src/core/edge/drm/zocl/zocl_ospi_versal.c
+++ b/src/runtime_src/core/edge/drm/zocl/zocl_ospi_versal.c
@@ -17,6 +17,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/platform_device.h>
 
-- 
2.16.4

Places

File 0001-zocl-Fix-build-for-Linux-kernel-5.6.patch of Package libxrt

Places