gmmlib: upgrade 22.3.15 -> 22.3.18

Drops patches already merged:
 - 0001-Introduce-ARL-H-support-172.patch

Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Lim Siew Hoon 2024-05-07 13:13:04 +08:00 committed by Anuj Mittal
parent 11c41c9a46
commit 7655d2b265
3 changed files with 7 additions and 53 deletions

View File

@ -1,4 +1,4 @@
From 8729d66800995a9b7e693bd78249932bd12383e1 Mon Sep 17 00:00:00 2001
From 683f3552e7d5089601bb37952641b1c7691cf475 Mon Sep 17 00:00:00 2001
From: John Machado <john.machado@intel.com>
Date: Mon, 25 Mar 2024 11:13:27 +0530
Subject: [PATCH] Add new DG2 device IDs (#194)
@ -11,10 +11,10 @@ Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
1 file changed, 4 insertions(+)
diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
index 7969779..8e2c955 100644
index 1264087..e944e1e 100644
--- a/Source/inc/common/igfxfmid.h
+++ b/Source/inc/common/igfxfmid.h
@@ -1932,6 +1932,8 @@ typedef enum __NATIVEGTTYPE
@@ -1934,6 +1934,8 @@ typedef enum __NATIVEGTTYPE
#define DEV_ID_56BB 0x56BB
#define DEV_ID_56BC 0x56BC
#define DEV_ID_56BD 0x56BD
@ -22,16 +22,13 @@ index 7969779..8e2c955 100644
+#define DEV_ID_56BF 0x56BF
#define DEV_ID_56C0 0x56C0
#define DEV_ID_56C1 0x56C1
@@ -1992,6 +1994,8 @@ typedef enum __NATIVEGTTYPE
#define DEV_ID_56C2 0x56C2
@@ -2001,6 +2003,8 @@ typedef enum __NATIVEGTTYPE
( d == DEV_ID_5690 ) || \
( d == DEV_ID_5691 ) || \
( d == DEV_ID_5692 ) || \
+ ( d == DEV_ID_56BE ) || \
+ ( d == DEV_ID_56BF ) || \
( d == DEV_ID_56C0 ) || \
( d == DEV_ID_56C2 ) || \
( d == DEV_ID_4F80 ) || \
( d == DEV_ID_4F81 ) || \
--
2.34.1

View File

@ -1,42 +0,0 @@
From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001
From: John Machado <john.machado@intel.com>
Date: Fri, 9 Feb 2024 13:10:18 +0530
Subject: [PATCH] Introduce ARL-H support (#172)
Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179]
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
Source/inc/common/igfxfmid.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
index 99fc624..19aa505 100644
--- a/Source/inc/common/igfxfmid.h
+++ b/Source/inc/common/igfxfmid.h
@@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE
// ARL-S
#define DEV_ID_7D67 0x7D67
+// ARL-H
+#define DEV_ID_7D41 0x7D41
+#define DEV_ID_7D51 0x7D51
+#define DEV_ID_7DD1 0x7DD1
+
#define MGM_HAS 0
//#define SDG_HAS 1 //Reserve place for Springdale-G HAS
@@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE
// Macro to identify ARL-S Device ID
#define GFX_IS_ARL_S(d) ( ( d == DEV_ID_7D67 ) )
+// Macro to identify ARL-H Device ID
+#define GFX_IS_ARL_H(d) ( ( d == DEV_ID_7D41 ) || \
+ ( d == DEV_ID_7D51 ) || \
+ ( d == DEV_ID_7DD1 ))
+
//we define the highest cap and lower cap of stepping IDs
#define SI_REV_ID(lo,hi) (lo | hi<<16)
--
2.40.1

View File

@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654"
SRC_URI = " \
git://github.com/intel/gmmlib.git;protocol=https;branch=master \
file://0001-Introduce-ARL-H-support-172.patch \
file://0001-Add-new-DG2-device-IDs-194.patch \
"
SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc"
SRCREV = "ac964bdffdda7730e8234511f61016071e63783b"
S = "${WORKDIR}/git"