From owner-svn-ports-head@freebsd.org Thu Apr 23 07:13:59 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B44582AA009; Thu, 23 Apr 2020 07:13:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4977nz46Bdz4Zd3; Thu, 23 Apr 2020 07:13:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 881CF6D6; Thu, 23 Apr 2020 07:13:59 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03N7DxUJ045180; Thu, 23 Apr 2020 07:13:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03N7DxQT045178; Thu, 23 Apr 2020 07:13:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202004230713.03N7DxQT045178@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 23 Apr 2020 07:13:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532647 - in head/lang/intel-compute-runtime: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/lang/intel-compute-runtime: . files X-SVN-Commit-Revision: 532647 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 07:13:59 -0000 Author: jbeich Date: Thu Apr 23 07:13:58 2020 New Revision: 532647 URL: https://svnweb.freebsd.org/changeset/ports/532647 Log: lang/intel-compute-runtime: don't hardcode /dev/dri/card0 Similar to https://github.com/intel/compute-runtime/commit/719b22ee117f Modified: head/lang/intel-compute-runtime/Makefile (contents, props changed) head/lang/intel-compute-runtime/files/patch-max_freq (contents, props changed) Modified: head/lang/intel-compute-runtime/Makefile ============================================================================== --- head/lang/intel-compute-runtime/Makefile Thu Apr 23 06:34:32 2020 (r532646) +++ head/lang/intel-compute-runtime/Makefile Thu Apr 23 07:13:58 2020 (r532647) @@ -2,6 +2,7 @@ PORTNAME= compute-runtime DISTVERSION= 20.15.16524 +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= intel- Modified: head/lang/intel-compute-runtime/files/patch-max_freq ============================================================================== --- head/lang/intel-compute-runtime/files/patch-max_freq Thu Apr 23 06:34:32 2020 (r532646) +++ head/lang/intel-compute-runtime/files/patch-max_freq Thu Apr 23 07:13:58 2020 (r532647) @@ -5,27 +5,43 @@ --- shared/source/os_interface/linux/drm_neo.cpp.orig 2020-04-11 07:41:07 UTC +++ shared/source/os_interface/linux/drm_neo.cpp -@@ -24,6 +24,11 @@ +@@ -24,6 +24,13 @@ #include #include +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#include +#include ++#include ++#include +#endif + namespace NEO { namespace IoctlHelper { -@@ -104,6 +109,16 @@ int Drm::getEnabledPooledEu(int &enabled) { +@@ -104,6 +111,30 @@ int Drm::getEnabledPooledEu(int &enabled) { int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { maxGpuFrequency = 0; +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++ struct stat sb; ++ if (fstat(getFileDescriptor(), &sb)) { ++ return 0; ++ } ++ char name[SPECNAMELEN + 1]; ++ if (!devname_r(sb.st_rdev, S_IFCHR, name, sizeof(name))) { ++ return 0; ++ } ++ int id; ++ if (!sscanf(name, "drm/%d", &id) && !sscanf(name, "dri/renderD%d", &id)) { ++ return 0; ++ } ++ ++ char oid[MAXPATHLEN + 1]; + char max_freq[PAGE_SIZE]; + size_t len = sizeof(max_freq); -+ -+ if (sysctlbyname("sys.class.drm.card0.gt_max_freq_mhz", &max_freq, &len, NULL, 0)) { ++ snprintf(oid, sizeof(oid), "sys.class.drm.card%d.gt_max_freq_mhz", id - 128); ++ if (sysctlbyname(oid, &max_freq, &len, NULL, 0)) { + return 0; + } + @@ -34,7 +50,7 @@ std::string clockSysFsPath = getSysFsPciPath(); clockSysFsPath += "/gt_max_freq_mhz"; -@@ -115,6 +130,7 @@ int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { +@@ -115,6 +146,7 @@ int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { ifs >> maxGpuFrequency; ifs.close();