Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 May 2020 17:01:25 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r536986 - in head/lang/intel-compute-runtime: . files
Message-ID:  <202005291701.04TH1PxN005444@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri May 29 17:01:25 2020
New Revision: 536986
URL: https://svnweb.freebsd.org/changeset/ports/536986

Log:
  lang/intel-compute-runtime: unbreak on i386

Modified:
  head/lang/intel-compute-runtime/Makefile   (contents, props changed)
  head/lang/intel-compute-runtime/files/patch-i386   (contents, props changed)

Modified: head/lang/intel-compute-runtime/Makefile
==============================================================================
--- head/lang/intel-compute-runtime/Makefile	Fri May 29 16:39:43 2020	(r536985)
+++ head/lang/intel-compute-runtime/Makefile	Fri May 29 17:01:25 2020	(r536986)
@@ -13,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Only Intel GPUs on x86 are supported
-BROKEN_i386=	https://github.com/intel/compute-runtime/issues/316
 
 LIB_DEPENDS=	libigc.so:devel/intel-graphics-compiler \
 		libigdgmm.so:multimedia/gmmlib

Modified: head/lang/intel-compute-runtime/files/patch-i386
==============================================================================
--- head/lang/intel-compute-runtime/files/patch-i386	Fri May 29 16:39:43 2020	(r536985)
+++ head/lang/intel-compute-runtime/files/patch-i386	Fri May 29 17:01:25 2020	(r536986)
@@ -1,9 +1,32 @@
+Revert BufferObject's size to size_t like before 45a0ceecfbe4
+
+shared/source/os_interface/linux/drm_memory_manager.cpp:61:54: error: non-const
+      lvalue reference to type 'size_t' (aka 'unsigned int') cannot bind to a value of unrelated type 'uint64_t'
+      (aka 'unsigned long long')
+                    bo->gpuAddress = acquireGpuRange(bo->size, false, rootDeviceIndex, false);
+                                                     ^~~~~~~~
+shared/source/os_interface/linux/drm_memory_manager.h:66:38: note: passing argument
+      to parameter 'size' here
+    uint64_t acquireGpuRange(size_t &size, bool requireSpecificBitness, uint32_t rootDeviceIndex, bool requi...
+                                     ^
+
 SSE2 is not enabled by default on BSDs
 
 core/utilities/clflush.cpp:16:5: error: '_mm_clflush' needs target feature sse2
     _mm_clflush(ptr);
     ^
 
+--- shared/source/os_interface/linux/drm_buffer_object.h.orig	2020-05-21 10:39:12 UTC
++++ shared/source/os_interface/linux/drm_buffer_object.h
+@@ -55,7 +55,7 @@ class BufferObject {
+     std::atomic<uint32_t> refCount;
+ 
+     int handle; // i915 gem object handle
+-    uint64_t size;
++    size_t size;
+     bool isReused;
+ 
+     //Tiling
 --- shared/source/utilities/cpuintrinsics.cpp.orig	2020-02-28 16:16:42 UTC
 +++ shared/source/utilities/cpuintrinsics.cpp
 @@ -12,6 +12,9 @@



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005291701.04TH1PxN005444>