Drop list of patches already merged: - 0001-Change-RGB-mask-and-order.patch - 0001-Add-Y210-caps-for-BMG-HEVC-encode.patch
Release notes: https://github.com/intel/media-driver/releases/tag/intel-media-24.4.4 Signed-off-by: Lim Siew Hoon <siew.hoon....@intel.com> --- ...01-Add-Y210-caps-for-BMG-HEVC-encode.patch | 26 ---- .../0001-Change-RGB-mask-and-order.patch | 126 ------------------ ...24.4.1.bb => intel-media-driver_24.4.4.bb} | 4 +- 3 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 recipes-multimedia/libva/files/0001-Add-Y210-caps-for-BMG-HEVC-encode.patch delete mode 100644 recipes-multimedia/libva/files/0001-Change-RGB-mask-and-order.patch rename recipes-multimedia/libva/{intel-media-driver_24.4.1.bb => intel-media-driver_24.4.4.bb} (90%) diff --git a/recipes-multimedia/libva/files/0001-Add-Y210-caps-for-BMG-HEVC-encode.patch b/recipes-multimedia/libva/files/0001-Add-Y210-caps-for-BMG-HEVC-encode.patch deleted file mode 100644 index 2fd74390..00000000 --- a/recipes-multimedia/libva/files/0001-Add-Y210-caps-for-BMG-HEVC-encode.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 273986f0944cd8e42c676e10700015c093e1c102 Mon Sep 17 00:00:00 2001 -From: "Hoe, Sheng Yang" <sheng.yang....@intel.com> -Date: Mon, 4 Nov 2024 08:53:46 +0000 -Subject: [PATCH] Add Y210 caps for BMG HEVC encode - -Upstream-Status: Backport [https://github.com/intel/media-driver/commit/e66314103cfec73d0bd4b8f687973d094e129838] -Signed-off-by: Hoe, Sheng Yang <sheng.yang....@intel.com> ---- - .../hevc/ddi/capstable_data_hevc_encode_xe2_hpm_r0_specific.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/media_softlet/linux/xe2_hpm_r0/encode/hevc/ddi/capstable_data_hevc_encode_xe2_hpm_r0_specific.h b/media_softlet/linux/xe2_hpm_r0/encode/hevc/ddi/capstable_data_hevc_encode_xe2_hpm_r0_specific.h -index bfcba8277..4c4464917 100644 ---- a/media_softlet/linux/xe2_hpm_r0/encode/hevc/ddi/capstable_data_hevc_encode_xe2_hpm_r0_specific.h -+++ b/media_softlet/linux/xe2_hpm_r0/encode/hevc/ddi/capstable_data_hevc_encode_xe2_hpm_r0_specific.h -@@ -486,6 +486,7 @@ static const ProfileSurfaceAttribInfo surfaceAttribInfo_VAProfileHEVCMain10_VAEn - static const ProfileSurfaceAttribInfo surfaceAttribInfo_VAProfileHEVCMain422_10_VAEntrypointEncSlice_Xe2_Hpm_r0 = - { - {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_YUY2}}}, -+ {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_Y210}}}, - {VASurfaceAttribMaxWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {CODEC_16K_MAX_PIC_WIDTH}}}, - {VASurfaceAttribMaxHeight, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {CODEC_12K_MAX_PIC_HEIGHT}}}, - {VASurfaceAttribMinWidth, VA_SURFACE_ATTRIB_GETTABLE, {VAGenericValueTypeInteger, {CODEC_128_MIN_PIC_WIDTH}}}, --- -2.43.2 - diff --git a/recipes-multimedia/libva/files/0001-Change-RGB-mask-and-order.patch b/recipes-multimedia/libva/files/0001-Change-RGB-mask-and-order.patch deleted file mode 100644 index 08d15529..00000000 --- a/recipes-multimedia/libva/files/0001-Change-RGB-mask-and-order.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 3e4c7a15148178e670c46bcccd89e48c4c10f370 Mon Sep 17 00:00:00 2001 -From: WenshengZhang <wensheng.zh...@intel.com> -Date: Tue, 22 Oct 2024 14:49:11 +0800 -Subject: [PATCH] Change RGB mask and order - -Change RGB mask and order. - -Upstream-Status: Backport [https://github.com/intel/media-driver/commit/8c7b05bf8a81961c1f111b75cae99818a8bd8aa9] -Signed-off-by: Lim Siew Hoon <siew.hoon....@intel.com> - ---- - media_driver/linux/gen11/ddi/media_libva_caps_g11.cpp | 10 ++++++---- - media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp | 10 ++++++---- - media_driver/linux/gen8/ddi/media_libva_caps_g8.cpp | 10 ++++++---- - media_driver/linux/gen9/ddi/media_libva_caps_g9.cpp | 10 ++++++---- - .../linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp | 10 ++++++---- - 5 files changed, 30 insertions(+), 20 deletions(-) - -diff --git a/media_driver/linux/gen11/ddi/media_libva_caps_g11.cpp b/media_driver/linux/gen11/ddi/media_libva_caps_g11.cpp -index 49d252a6b..a04a73a6d 100755 ---- a/media_driver/linux/gen11/ddi/media_libva_caps_g11.cpp -+++ b/media_driver/linux/gen11/ddi/media_libva_caps_g11.cpp -@@ -36,10 +36,12 @@ - #include "media_libva_vp.h" - - const VAImageFormat m_supportedImageformatsG11[] = --{ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff}, /* [31:0] B:G:R:A 8:8:8:8 little endian */ -- {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff}, /* [31:0] R:G:B:A 8:8:8:8 little endian */ -- {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0}, /* [31:0] B:G:R:x 8:8:8:8 little endian */ -- {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0}, /* [31:0] R:G:B:x 8:8:8:8 little endian */ -+{ -+ // "VA_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming. -+ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, /* [31:0] A:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, /* [31:0] A:B:G:R 8:8:8:8 little endian */ -+ {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, /* [31:0] X:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}, /* [31:0] X:B:G:R 8:8:8:8 little endian */ - {VA_FOURCC_A2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0x30000000}, /* [31:0] A:R:G:B 2:10:10:10 little endian */ - {VA_FOURCC_A2B10G10R10, VA_LSB_FIRST, 32, 30, 0x000003ff, 0x000ffc00, 0x3ff00000, 0x30000000}, /* [31:0] A:B:G:R 2:10:10:10 little endian */ - {VA_FOURCC_X2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0}, /* [31:0] X:R:G:B 2:10:10:10 little endian */ -diff --git a/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp b/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp -index 39b069c78..870e8dcc8 100644 ---- a/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp -+++ b/media_driver/linux/gen12/ddi/media_libva_caps_g12.cpp -@@ -48,10 +48,12 @@ - #endif - - const VAImageFormat m_supportedImageformatsG12[] = --{ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff}, /* [31:0] B:G:R:A 8:8:8:8 little endian */ -- {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff}, /* [31:0] R:G:B:A 8:8:8:8 little endian */ -- {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0}, /* [31:0] B:G:R:x 8:8:8:8 little endian */ -- {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0}, /* [31:0] R:G:B:x 8:8:8:8 little endian */ -+{ -+ // "VA_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming. -+ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, /* [31:0] A:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, /* [31:0] A:B:G:R 8:8:8:8 little endian */ -+ {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, /* [31:0] X:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}, /* [31:0] X:B:G:R 8:8:8:8 little endian */ - {VA_FOURCC_A2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0x30000000}, /* [31:0] A:R:G:B 2:10:10:10 little endian */ - {VA_FOURCC_A2B10G10R10, VA_LSB_FIRST, 32, 30, 0x000003ff, 0x000ffc00, 0x3ff00000, 0x30000000}, /* [31:0] A:B:G:R 2:10:10:10 little endian */ - {VA_FOURCC_X2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0}, /* [31:0] X:R:G:B 2:10:10:10 little endian */ -diff --git a/media_driver/linux/gen8/ddi/media_libva_caps_g8.cpp b/media_driver/linux/gen8/ddi/media_libva_caps_g8.cpp -index 3ec2e1e39..b31315cf4 100644 ---- a/media_driver/linux/gen8/ddi/media_libva_caps_g8.cpp -+++ b/media_driver/linux/gen8/ddi/media_libva_caps_g8.cpp -@@ -31,10 +31,12 @@ - #include "media_libva_caps_factory.h" - - const VAImageFormat m_supportedImageformatsG8[] = --{ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, -- {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, -- {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, -- {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}, -+{ -+ // "VA_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming. -+ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, /* [31:0] A:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, /* [31:0] A:B:G:R 8:8:8:8 little endian */ -+ {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, /* [31:0] X:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}, /* [31:0] X:B:G:R 8:8:8:8 little endian */ - {VA_FOURCC_RGB565, VA_LSB_FIRST, 16, 16, 0xf800, 0x07e0, 0x001f, 0}, - {VA_FOURCC_NV12, VA_LSB_FIRST, 12, 0,0,0,0,0}, - {VA_FOURCC_NV21, VA_LSB_FIRST, 12, 0,0,0,0,0}, -diff --git a/media_driver/linux/gen9/ddi/media_libva_caps_g9.cpp b/media_driver/linux/gen9/ddi/media_libva_caps_g9.cpp -index cdf891a26..4c2f82041 100755 ---- a/media_driver/linux/gen9/ddi/media_libva_caps_g9.cpp -+++ b/media_driver/linux/gen9/ddi/media_libva_caps_g9.cpp -@@ -32,10 +32,12 @@ - #include "media_libva_caps_factory.h" - - const VAImageFormat m_supportedImageformatsG9[] = --{ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff}, /* [31:0] B:G:R:A 8:8:8:8 little endian */ -- {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff}, /* [31:0] R:G:B:A 8:8:8:8 little endian */ -- {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0}, /* [31:0] B:G:R:x 8:8:8:8 little endian */ -- {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0}, /* [31:0] R:G:B:x 8:8:8:8 little endian */ -+{ -+ // "VA_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming. -+ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, /* [31:0] A:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, /* [31:0] A:B:G:R 8:8:8:8 little endian */ -+ {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, /* [31:0] X:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}, /* [31:0] X:B:G:R 8:8:8:8 little endian */ - {VA_FOURCC_A2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0x30000000}, /* [31:0] A:R:G:B 2:10:10:10 little endian */ - {VA_FOURCC_A2B10G10R10, VA_LSB_FIRST, 32, 30, 0x000003ff, 0x000ffc00, 0x3ff00000, 0x30000000}, /* [31:0] A:B:G:R 2:10:10:10 little endian */ - {VA_FOURCC_X2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0}, /* [31:0] X:R:G:B 2:10:10:10 little endian */ -diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp -index d985fccba..ac9bb5c62 100644 ---- a/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp -+++ b/media_softlet/linux/Xe_M_plus/ddi/media_libva_caps_mtl_base.cpp -@@ -39,10 +39,12 @@ - #include "drm_fourcc.h" - - const VAImageFormat m_supportedImageformatsXe_Lpm_Plus_Base[] = --{ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff}, /* [31:0] B:G:R:A 8:8:8:8 little endian */ -- {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff}, /* [31:0] R:G:B:A 8:8:8:8 little endian */ -- {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0}, /* [31:0] B:G:R:x 8:8:8:8 little endian */ -- {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0}, /* [31:0] R:G:B:x 8:8:8:8 little endian */ -+{ -+ // "VA_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming. -+ {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}, /* [31:0] A:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}, /* [31:0] A:B:G:R 8:8:8:8 little endian */ -+ {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, /* [31:0] X:R:G:B 8:8:8:8 little endian */ -+ {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}, /* [31:0] X:B:G:R 8:8:8:8 little endian */ - {VA_FOURCC_A2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0x30000000}, /* [31:0] A:R:G:B 2:10:10:10 little endian */ - {VA_FOURCC_A2B10G10R10, VA_LSB_FIRST, 32, 30, 0x000003ff, 0x000ffc00, 0x3ff00000, 0x30000000}, /* [31:0] A:B:G:R 2:10:10:10 little endian */ - {VA_FOURCC_X2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0}, /* [31:0] X:R:G:B 2:10:10:10 little endian */ --- -2.43.2 - diff --git a/recipes-multimedia/libva/intel-media-driver_24.4.1.bb b/recipes-multimedia/libva/intel-media-driver_24.4.4.bb similarity index 90% rename from recipes-multimedia/libva/intel-media-driver_24.4.1.bb rename to recipes-multimedia/libva/intel-media-driver_24.4.4.bb index 4c1fd02c..f2f8b83c 100644 --- a/recipes-multimedia/libva/intel-media-driver_24.4.1.bb +++ b/recipes-multimedia/libva/intel-media-driver_24.4.4.bb @@ -21,12 +21,10 @@ DEPENDS += "libva gmmlib" SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ file://0001-Force-ARGB-surface-to-tile4-for-ACM.patch \ file://0001-Fix-failed-4k-videowalll-test-case-and-color-corrupt.patch \ - file://0001-Change-RGB-mask-and-order.patch \ - file://0001-Add-Y210-caps-for-BMG-HEVC-encode.patch \ file://0001-Change-RGB-mask-and-order-for-BMG.patch \ " -SRCREV = "105a308ea3d86596f9b90853f9d4fc83671e8a5e" +SRCREV = "d3c30f6dddb43bd7b1b0a4d38a0d0ba47dda5726" S = "${WORKDIR}/git" COMPATIBLE_HOST:x86-x32 = "null" -- 2.48.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8489): https://lists.yoctoproject.org/g/meta-intel/message/8489 Mute This Topic: https://lists.yoctoproject.org/mt/111156514/21656 Group Owner: meta-intel+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
