Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime-devices/intel-gmmlib/autobuild/defines
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PKGSEC=libs
PKGDEP="glibc"
PKGDES="Intel Graphics Memory Management Library"

FAIL_ARCH="!(amd64|loongarch64)"
FAIL_ARCH="!(amd64|arm64|loongarch64)"
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 5f7d53ef6c1a6c40d0ff2d717dca59533ad633d5 Mon Sep 17 00:00:00 2001
From: Vihang Mehta <vihang@gimletlabs.ai>
Date: Wed, 26 Feb 2025 09:59:15 -0800
Subject: [PATCH] Disable AuxTable test on aarch64

Signed-off-by: Vihang Mehta <vihang@gimletlabs.ai>
---
Source/GmmLib/ULT/GmmAuxTableULT.cpp | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/Source/GmmLib/ULT/GmmAuxTableULT.cpp b/Source/GmmLib/ULT/GmmAuxTableULT.cpp
index c6a9b537..46a66f50 100644
--- a/Source/GmmLib/ULT/GmmAuxTableULT.cpp
+++ b/Source/GmmLib/ULT/GmmAuxTableULT.cpp
@@ -213,7 +213,14 @@ TEST_F(CTestAuxTable, DISABLED_TestUpdateAuxTableStress)
pGmmULTClientContext->DestroyPageTblMgrObject(mgr);
}

+#if defined(__aarch64__)
+// aarch64 systems have VAs where the 48th bit is set but don't have the same
+// canonize semantics as x86_64 where bits 63-49 need to be the same as bit 48.
+// This causes this test to fault, instead we disable it in aarch64.
+TEST_F(CTestAuxTable, DISABLED_TestAuxTableContent)
+#else
TEST_F(CTestAuxTable, TestAuxTableContent)
+#endif
{
GmmPageTableMgr *mgr = pGmmULTClientContext->CreatePageTblMgrObject(&DeviceCBInt, TT_TYPE::AUXTT);

5 changes: 5 additions & 0 deletions runtime-devices/intel-gmmlib/autobuild/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ if ab_match_arch loongarch64; then
abinfo "Appending -mno-lsx, -mno-lasx to workaround build failure ..."
export CFLAGS="${CFLAGS} -mno-lsx -mno-lasx"
export CXXFLAGS="${CXXFLAGS} -mno-lsx -mno-lasx"
elif ab_match_arch arm64; then
# FIXME:
# cc1plus: error:‘-Wformat-security’ ignored without ‘-Wformat’
export CFLAGS="${CFLAGS} -Wformat"
export CXXFLAGS="${CXXFLAGS} -Wformat"
fi
1 change: 1 addition & 0 deletions runtime-devices/intel-gmmlib/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VER=22.7.0
REL=1
SRCS="git::commit=tags/intel-gmmlib-$VER;copy-repo=true::https://github.com/intel/gmmlib"
CHKSUMS="SKIP"
CHKUPDATE="anitya::id=20342"
2 changes: 1 addition & 1 deletion runtime-multimedia/intel-media-driver/autobuild/defines
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ BUILDDEP="cmake"
PKGDES="Intel Media Driver for VAAPI (for Broadwell+ Intel GPUs)"

# FIXME: Limited by intel-gmmlib.
FAIL_ARCH="!(amd64|loongarch64)"
FAIL_ARCH="!(amd64|arm64|loongarch64)"
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From ab646833d10cf744c79fefcb8344757ac0173fae Mon Sep 17 00:00:00 2001
From: Qing Yun <kf@aosc.io>
Date: Sun, 13 Apr 2025 23:06:17 +0800
Subject: [PATCH] ARM64: fix redefined on arm64

---
media_common/linux/common/os/mos_defs_specific.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/media_common/linux/common/os/mos_defs_specific.h b/media_common/linux/common/os/mos_defs_specific.h
index c5b4143..4806b1c 100644
--- a/media_common/linux/common/os/mos_defs_specific.h
+++ b/media_common/linux/common/os/mos_defs_specific.h
@@ -99,6 +99,9 @@ typedef struct _TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE, *PTP_CALLBACK_INSTANC
#if defined __x86_64__
#define __stdcall // deprecated for x86-64
#define __cdecl // deprecated for x86-64
+#elif defined(__ARM_ARCH)
+ #define __stdcall
+ #define __cdecl
#else
#define __cdecl __attribute__((__cdecl__))
#define __stdcall __attribute__((__stdcall__))
--
2.49.0
10 changes: 10 additions & 0 deletions runtime-multimedia/intel-media-driver/autobuild/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,14 @@ if ab_match_arch loongarch64; then
git config --local user.email "maintainers@aosc.io"
git am "$SRCDIR"/autobuild/patches/*.am.loongarch64
git submodule update --init --recursive
elif ab_match_arch arm64; then
abinfo "Applying ARM64 support patch ..."
git config --local user.name "AOSC Maintainers"
git config --local user.email "maintainers@aosc.io"

# NOTE: simde is also compatible on arm64,
# so apply loongarch support patches
git am "$SRCDIR"/autobuild/patches/*.am.loongarch64
git am "$SRCDIR"/autobuild/patches/*.am.arm64
git submodule update --init --recursive
fi
2 changes: 1 addition & 1 deletion runtime-multimedia/intel-media-driver/spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VER=24.4.4
REL=1
REL=2
SRCS="git::commit=tags/intel-media-$VER;copy-repo=true::https://github.com/intel/media-driver"
CHKSUMS="SKIP"
CHKUPDATE="anitya::id=20341"