intel-media-driver: upgrade 24.4.4 -> 25.1.4

Drop list of patches already merged
 - 0001-Change-RGB-mask-and-order-for-BMG.patch

Release notes:
https://github.com/intel/media-driver/releases/tag/intel-media-25.1.4

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 2025-05-05 01:15:20 -07:00 committed by Anuj Mittal
parent 046ad0ede1
commit 172651fbb9
No known key found for this signature in database
GPG Key ID: B749E1556041E1B2
4 changed files with 10 additions and 56 deletions

View File

@ -1,45 +0,0 @@
From 8e7b263729bec520cf830cbf85216c2d6466421d Mon Sep 17 00:00:00 2001
From: "Hoe, Sheng Yang" <sheng.yang.hoe@intel.com>
Date: Fri, 22 Nov 2024 10:11:14 +0000
Subject: [PATCH] Change RGB mask and order for BMG
Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1884]
Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
---
.../ddi/capstable_data_image_format_definition.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/media_softlet/linux/common/ddi/capstable_data_image_format_definition.h b/media_softlet/linux/common/ddi/capstable_data_image_format_definition.h
index af28653a5..ec99164ce 100644
--- a/media_softlet/linux/common/ddi/capstable_data_image_format_definition.h
+++ b/media_softlet/linux/common/ddi/capstable_data_image_format_definition.h
@@ -29,13 +29,14 @@
#include "va/va.h"
-static VAImageFormat formatBGRA = {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_LSB_FIRST" is to identify how following bit masks mapped to address instead of char order in VA_FOURCC_RGBA naming.
+static VAImageFormat formatBGRA = {VA_FOURCC_BGRA, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000}; /* [31:0] A:R:G:B 8:8:8:8 little endian */
static VAImageFormat formatARGB = {VA_FOURCC_ARGB, VA_LSB_FIRST, 32, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }; /* [31:0] A:R:G:B 8:8:8:8 little endian */
-static VAImageFormat formatRGBA = {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff }; /* [31:0] R:G:B:A 8:8:8:8 little endian */
+static VAImageFormat formatRGBA = {VA_FOURCC_RGBA, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000}; /* [31:0] A:B:G:R 8:8:8:8 little endian */
static VAImageFormat formatABGR = {VA_FOURCC_ABGR, VA_LSB_FIRST, 32, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 }; /* [31:0] A:B:G:R 8:8:8:8 little endian */
-static VAImageFormat formatBGRX = {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x0000ff00, 0x00ff0000, 0xff000000, 0 }; /* [31:0] B:G:R:x 8:8:8:8 little endian */
+static VAImageFormat formatBGRX = {VA_FOURCC_BGRX, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}; /* [31:0] X:R:G:B 8:8:8:8 little endian */
static VAImageFormat formatXRGB = {VA_FOURCC_XRGB, VA_LSB_FIRST, 32, 24, 0x00ff0000, 0x0000ff00, 0x000000ff, 0 }; /* [31:0] x:R:G:B 8:8:8:8 little endian */
-static VAImageFormat formatRGBX = {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0xff000000, 0x00ff0000, 0x0000ff00, 0 }; /* [31:0] R:G:B:x 8:8:8:8 little endian */
+static VAImageFormat formatRGBX = {VA_FOURCC_RGBX, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0}; /* [31:0] X:B:G:R 8:8:8:8 little endian */
static VAImageFormat formatXBGR = {VA_FOURCC_XBGR, VA_LSB_FIRST, 32, 24, 0x000000ff, 0x0000ff00, 0x00ff0000, 0 }; /* [31:0] x:B:G:R 8:8:8:8 little endian */
static VAImageFormat formatA2R10G10B10 = {VA_FOURCC_A2R10G10B10, VA_LSB_FIRST, 32, 30, 0x3ff00000, 0x000ffc00, 0x000003ff, 0x30000000 }; /* [31:0] A:R:G:B 2:10:10:10 little endian */
static VAImageFormat formatA2B10G10R10 = {VA_FOURCC_A2B10G10R10, VA_LSB_FIRST, 32, 30, 0x000003ff, 0x000ffc00, 0x3ff00000, 0x30000000 }; /* [31:0] A:B:G:R 2:10:10:10 little endian */
@@ -70,4 +71,4 @@ static VAImageFormat formatY416 = {VA_FOURCC_Y416, VA_LSB_FIRST,
static VAImageFormat formatRGBP = {VA_FOURCC_RGBP, VA_LSB_FIRST, 24, 24,0,0,0,0};
static VAImageFormat formatBGRP = {VA_FOURCC_BGRP, VA_LSB_FIRST, 24, 24,0,0,0,0};
-#endif //__CAPSTABLE_DATA_IMAGE_FORMAT_DEFINITION_H__
\ No newline at end of file
+#endif //__CAPSTABLE_DATA_IMAGE_FORMAT_DEFINITION_H__
--
2.34.1

View File

@ -1,7 +1,7 @@
From f318522175fb2ecc6d364b995a7b1926fd158a88 Mon Sep 17 00:00:00 2001
From 6132115dd2f1db55a6a5371618247dfaa334a035 Mon Sep 17 00:00:00 2001
From: Lim Siew Hoon <siew.hoon.lim@intel.com>
Date: Wed, 11 Oct 2023 15:36:21 +0800
Subject: [PATCH] Force ARGB surface to tile4 for ACM
Subject: [PATCH 3/7] Force ARGB surface to tile4 for ACM
Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1728]
@ -40,5 +40,5 @@ index a4e12edfa..11634f66e 100755
case TILING_X:
gmmParams.Flags.Info.TiledX = true;
--
2.43.2
2.43.0

View File

@ -1,8 +1,8 @@
From 38e6883e54e65a73aa7795dc2ff9f072448cb3dc Mon Sep 17 00:00:00 2001
From a32b95e58fd3e34847e799b909e08dbe5c9dc692 Mon Sep 17 00:00:00 2001
From: Lim Siew Hoon <siew.hoon.lim@intel.com>
Date: Fri, 2 Aug 2024 13:25:13 +0800
Subject: [PATCH] Fix failed 4k videowalll test case and color corruption of
video composition in Gen12 platform
Subject: [PATCH 4/7] Fix failed 4k videowalll test case and color corruption
of video composition in Gen12 platform
Fix failed 4k video wall test case from 16CH video only show
1CH output and corruption observed on certain number of video
@ -81,5 +81,5 @@ index 48a452315..4f0fc2c48 100644
{
MOS_FreeMemAndSetNull(pVpHalRenderParams->pColorFillParams);
--
2.43.2
2.43.0

View File

@ -19,12 +19,11 @@ REQUIRED_DISTRO_FEATURES = "opengl"
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-for-BMG.patch \
file://0003-Force-ARGB-surface-to-tile4-for-ACM.patch \
file://0004-Fix-failed-4k-videowalll-test-case-and-color-corrupt.patch \
"
SRCREV = "d3c30f6dddb43bd7b1b0a4d38a0d0ba47dda5726"
SRCREV = "14e2e7bcf1014186dbf1c099089c7c05cd880ae8"
S = "${WORKDIR}/git"
COMPATIBLE_HOST:x86-x32 = "null"