From 31ebf1b3469dd2cf2d45fc8f9eea5e0c449a0b09 Mon Sep 17 00:00:00 2001 From: Lim Siew Hoon Date: Wed, 27 Nov 2024 10:41:47 +0800 Subject: [PATCH] gmmlib: upgrade 22.5.1 -> 22.5.2 Add bug fixed on BMG platform: - 0001-Extend-helper-Macros-219.patch Signed-off-by: Lim Siew Hoon Signed-off-by: Anuj Mittal --- .../files/0001-Extend-helper-Macros-219.patch | 74 +++++++++++++++++++ .../{gmmlib_22.5.1.bb => gmmlib_22.5.2.bb} | 3 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 recipes-graphics/gmmlib/files/0001-Extend-helper-Macros-219.patch rename recipes-graphics/gmmlib/{gmmlib_22.5.1.bb => gmmlib_22.5.2.bb} (86%) diff --git a/recipes-graphics/gmmlib/files/0001-Extend-helper-Macros-219.patch b/recipes-graphics/gmmlib/files/0001-Extend-helper-Macros-219.patch new file mode 100644 index 00000000..d6be11f4 --- /dev/null +++ b/recipes-graphics/gmmlib/files/0001-Extend-helper-Macros-219.patch @@ -0,0 +1,74 @@ +From a025de4d83066f1ddf0890a0c7d87044f8723777 Mon Sep 17 00:00:00 2001 +From: John Machado +Date: Mon, 18 Nov 2024 16:14:08 +0530 +Subject: [PATCH] Extend helper Macros (#219) + +Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/31ee7e6d48a98a2cb8afb87f0d4f2afc97fe06a0] +Signed-off-by: Lim Siew Hoon + +--- + Source/inc/common/igfxfmid.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h +index a9176de..8d831e4 100644 +--- a/Source/inc/common/igfxfmid.h ++++ b/Source/inc/common/igfxfmid.h +@@ -399,7 +399,7 @@ typedef enum __NATIVEGTTYPE + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HP_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \ +- ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPC_CORE ) || \ ++ ( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_XE_HPC_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) ) + + #define GFX_IS_GEN_8_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN8_CORE ) || \ +@@ -409,7 +409,7 @@ typedef enum __NATIVEGTTYPE + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HP_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \ +- ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPC_CORE ) || \ ++ ( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_XE_HPC_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) ) + + #define GFX_IS_GEN_8_CHV_OR_LATER(p) ( ( GFX_GET_CURRENT_PRODUCT(p) == IGFX_CHERRYVIEW ) || \ +@@ -419,7 +419,7 @@ typedef enum __NATIVEGTTYPE + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HP_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \ +- ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPC_CORE ) || \ ++ ( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_XE_HPC_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) ) + + #define GFX_IS_GEN_9_OR_LATER(p) ( ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN9_CORE ) || \ +@@ -428,7 +428,7 @@ typedef enum __NATIVEGTTYPE + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HP_CORE ) || \ +- ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPC_CORE ) || \ ++ ( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_XE_HPC_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) ) + + #define GFX_IS_GEN_10_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN10_CORE ) || \ +@@ -436,15 +436,16 @@ typedef enum __NATIVEGTTYPE + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HP_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \ +- ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPC_CORE ) || \ ++ ( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_XE_HPC_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) ) + + #define GFX_IS_GEN_11_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN11_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GEN12_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HP_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPG_CORE ) || \ +- ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_XE_HPC_CORE ) || \ ++ ( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_XE_HPC_CORE ) || \ + ( GFX_GET_CURRENT_RENDERCORE(p) == IGFX_GENNEXT_CORE ) ) ++ + #define GFX_IS_GEN_12_OR_LATER(p) (( GFX_GET_CURRENT_RENDERCORE(p) >= IGFX_GEN12_CORE )) + #define GFX_IS_ATOM_PRODUCT_FAMILY(p) ( GFX_IS_PRODUCT(p, IGFX_VALLEYVIEW) || \ + GFX_IS_PRODUCT(p, IGFX_CHERRYVIEW) || \ +-- +2.43.2 + diff --git a/recipes-graphics/gmmlib/gmmlib_22.5.1.bb b/recipes-graphics/gmmlib/gmmlib_22.5.2.bb similarity index 86% rename from recipes-graphics/gmmlib/gmmlib_22.5.1.bb rename to recipes-graphics/gmmlib/gmmlib_22.5.2.bb index 93567f52..c380d449 100644 --- a/recipes-graphics/gmmlib/gmmlib_22.5.1.bb +++ b/recipes-graphics/gmmlib/gmmlib_22.5.2.bb @@ -8,9 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654" SRC_URI = " \ git://github.com/intel/gmmlib.git;protocol=https;branch=master \ + file://0001-Extend-helper-Macros-219.patch \ " -SRCREV = "06c05158f5d9d55906271feda50b161d743aee9b" +SRCREV = "567dc09fd3859de3d9c09456ee7b366c0d327eb6" S = "${WORKDIR}/git"