diff options
author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2021-10-25 10:22:59 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-10-25 22:02:00 +0800 |
commit | c386c9cdcc9cb085d955c7e4f7258d70894c1710 (patch) | |
tree | af89f4fc80d6b69db5f07b245bd6302c85ff7e54 /recipes-multimedia | |
parent | 378ece5d08a0dd7a0eb49f7dd478a1cb262e483e (diff) | |
download | meta-intel-c386c9cdcc9cb085d955c7e4f7258d70894c1710.tar.gz |
intel-media-driver: upgrade 21.2.3 -> 21.3.5
Drops patches already merged.
* 0001-Expose-the-reg-to-disable-scalability.patch
* 0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r-- | recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch | 178 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch | 34 | ||||
-rw-r--r-- | recipes-multimedia/libva/intel-media-driver_21.3.5.bb (renamed from recipes-multimedia/libva/intel-media-driver_21.2.3.bb) | 4 |
3 files changed, 1 insertions, 215 deletions
diff --git a/recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch b/recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch deleted file mode 100644 index 03d94314..00000000 --- a/recipes-multimedia/libva/files/0001-Expose-the-reg-to-disable-scalability.patch +++ /dev/null | |||
@@ -1,178 +0,0 @@ | |||
1 | From 2cc1938f4692c0310df98726cc03d9d55d52e794 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Xu, Zhengguo" <zhengguo.xu@intel.com> | ||
3 | Date: Mon, 12 Jul 2021 11:14:53 +0800 | ||
4 | Subject: [PATCH] Expose the reg to disable scalability | ||
5 | |||
6 | This reg only works in release-internal/debug version. Expose it in release version now. | ||
7 | |||
8 | This patch was imported from iHD media-driver git server | ||
9 | (https://github.com/intel/media-driver.git) as of pull request | ||
10 | https://github.com/intel/media-driver/pull/1221 | ||
11 | |||
12 | Upstream-status: Submitted | ||
13 | Signed-off-by: jinchung <jin.chung.teng@intel.com> | ||
14 | --- | ||
15 | .../agnostic/common/codec/hal/codechal_decode_scalability.cpp | 5 +---- | ||
16 | media_driver/agnostic/common/os/mos_os.h | 3 ++- | ||
17 | media_driver/agnostic/common/os/mos_utilities.cpp | 2 +- | ||
18 | media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h | 5 +---- | ||
19 | .../agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp | 8 +++----- | ||
20 | media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h | 5 +---- | ||
21 | media_driver/linux/common/os/mos_os_specific.c | 2 +- | ||
22 | 7 files changed, 10 insertions(+), 20 deletions(-) | ||
23 | mode change 100644 => 100755 media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp | ||
24 | mode change 100644 => 100755 media_driver/agnostic/common/os/mos_os.h | ||
25 | mode change 100644 => 100755 media_driver/agnostic/common/os/mos_utilities.cpp | ||
26 | mode change 100644 => 100755 media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h | ||
27 | mode change 100644 => 100755 media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp | ||
28 | mode change 100644 => 100755 media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h | ||
29 | mode change 100644 => 100755 media_driver/linux/common/os/mos_os_specific.c | ||
30 | |||
31 | diff --git a/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp b/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp | ||
32 | old mode 100644 | ||
33 | new mode 100755 | ||
34 | index a7719c1..f6d71ef | ||
35 | --- a/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp | ||
36 | +++ b/media_driver/agnostic/common/codec/hal/codechal_decode_scalability.cpp | ||
37 | @@ -1968,10 +1968,7 @@ MOS_STATUS CodecHalDecodeScalability_InitializeState ( | ||
38 | vdboxNum = vdboxMfxInterface->GetNumVdbox(); | ||
39 | |||
40 | if (vdboxNum < 2 | ||
41 | -#if (_DEBUG || _RELEASE_INTERNAL) | ||
42 | - || !osInterface->bHcpDecScalabilityMode | ||
43 | -#endif | ||
44 | - ) | ||
45 | + || !osInterface->bHcpDecScalabilityMode) | ||
46 | { | ||
47 | eStatus = MOS_STATUS_INVALID_PARAMETER; | ||
48 | CODECHAL_DECODE_ASSERTMESSAGE("not support scalability on this platform."); | ||
49 | diff --git a/media_driver/agnostic/common/os/mos_os.h b/media_driver/agnostic/common/os/mos_os.h | ||
50 | old mode 100644 | ||
51 | new mode 100755 | ||
52 | index dafa184..f59f1ff | ||
53 | --- a/media_driver/agnostic/common/os/mos_os.h | ||
54 | +++ b/media_driver/agnostic/common/os/mos_os.h | ||
55 | @@ -1406,9 +1406,10 @@ typedef struct _MOS_INTERFACE | ||
56 | #endif // MOS_MEDIASOLO_SUPPORTED | ||
57 | bool VEEnable; | ||
58 | bool bCanEnableSecureRt; | ||
59 | + | ||
60 | + int32_t bHcpDecScalabilityMode; //!< enable scalability decode {mode: default, user force, false} | ||
61 | #if (_DEBUG || _RELEASE_INTERNAL) | ||
62 | MOS_FORCE_VEBOX eForceVebox; //!< Force select Vebox | ||
63 | - int32_t bHcpDecScalabilityMode; //!< enable scalability decode {mode: default, user force, false} | ||
64 | int32_t bEnableDbgOvrdInVE; //!< It is for all scalable engines: used together with KMD VE for UMD to specify an engine directly | ||
65 | int32_t bSoftReset; //!< trigger soft reset | ||
66 | #endif // (_DEBUG || _RELEASE_INTERNAL) | ||
67 | diff --git a/media_driver/agnostic/common/os/mos_utilities.cpp b/media_driver/agnostic/common/os/mos_utilities.cpp | ||
68 | old mode 100644 | ||
69 | new mode 100755 | ||
70 | index 74c46e7..15ced88 | ||
71 | --- a/media_driver/agnostic/common/os/mos_utilities.cpp | ||
72 | +++ b/media_driver/agnostic/common/os/mos_utilities.cpp | ||
73 | @@ -3858,7 +3858,7 @@ static MOS_USER_FEATURE_VALUE MOSUserFeatureDescFields[__MOS_USER_FEATURE_KEY_MA | ||
74 | MOS_USER_FEATURE_VALUE_TYPE_BOOL, | ||
75 | "0", | ||
76 | "TRUE for Enabling KMD Virtual Engine Debug Override. (Default FALSE: not override"), | ||
77 | - MOS_DECLARE_UF_KEY_DBGONLY(__MEDIA_USER_FEATURE_VALUE_ENABLE_HCP_SCALABILITY_DECODE_ID, | ||
78 | + MOS_DECLARE_UF_KEY(__MEDIA_USER_FEATURE_VALUE_ENABLE_HCP_SCALABILITY_DECODE_ID, | ||
79 | "Enable HCP Scalability Decode", | ||
80 | __MEDIA_USER_FEATURE_SUBKEY_INTERNAL, | ||
81 | __MEDIA_USER_FEATURE_SUBKEY_REPORT, | ||
82 | diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h | ||
83 | old mode 100644 | ||
84 | new mode 100755 | ||
85 | index ca6f30b..79e60b3 | ||
86 | --- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h | ||
87 | +++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_g11_X.h | ||
88 | @@ -119,11 +119,8 @@ public: | ||
89 | m_osInterface = osInterface; | ||
90 | |||
91 | if (m_numVdbox > 1 | ||
92 | -#if (_DEBUG || _RELEASE_INTERNAL) | ||
93 | && m_osInterface != nullptr | ||
94 | - && m_osInterface->bHcpDecScalabilityMode | ||
95 | -#endif | ||
96 | - ) | ||
97 | + && m_osInterface->bHcpDecScalabilityMode) | ||
98 | { | ||
99 | m_scalabilitySupported = true; | ||
100 | } | ||
101 | diff --git a/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp b/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp | ||
102 | old mode 100644 | ||
103 | new mode 100755 | ||
104 | index 857397b..6a6d3a8 | ||
105 | --- a/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp | ||
106 | +++ b/media_driver/agnostic/gen12/codec/hal/codechal_decode_scalability_g12.cpp | ||
107 | @@ -927,10 +927,7 @@ MOS_STATUS CodecHalDecodeScalability_InitializeState_G12( | ||
108 | vdboxNum = vdboxMfxInterface->GetNumVdbox(); | ||
109 | |||
110 | if (vdboxNum < 2 | ||
111 | -#if (_DEBUG || _RELEASE_INTERNAL) | ||
112 | - || !osInterface->bHcpDecScalabilityMode | ||
113 | -#endif | ||
114 | - ) | ||
115 | + || !osInterface->bHcpDecScalabilityMode) | ||
116 | { | ||
117 | eStatus = MOS_STATUS_INVALID_PARAMETER; | ||
118 | CODECHAL_DECODE_ASSERTMESSAGE("not support scalability on this platform."); | ||
119 | @@ -1587,13 +1584,14 @@ MOS_STATUS CodecHalDecodeScalability_DecidePipeNum_G12( | ||
120 | bCanEnableRealTile = !(static_cast<PCODECHAL_DECODE_SCALABILITY_STATE_G12>(pScalState))->bDisableRtMode; | ||
121 | if (!pScalStateG12->bEnableRtMultiPhase) | ||
122 | u8MaxTileColumn = 2; | ||
123 | +#endif | ||
124 | if(!bCanEnableScalability | ||
125 | && pOsInterface | ||
126 | && (pOsInterface->bHcpDecScalabilityMode == MOS_SCALABILITY_ENABLE_MODE_USER_FORCE)) | ||
127 | { | ||
128 | bCanEnableScalability = true; | ||
129 | } | ||
130 | -#endif | ||
131 | + | ||
132 | bCanEnableRealTile = bCanEnableRealTile && pInitParamsG12->bIsTileEnabled && (pInitParams->u8NumTileColumns > 1) && | ||
133 | (pInitParams->u8NumTileColumns <= u8MaxTileColumn) && (pInitParams->u8NumTileRows <= HEVC_NUM_MAX_TILE_ROW) && | ||
134 | pInitParamsG12->bHasSubsetParams; | ||
135 | diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h | ||
136 | old mode 100644 | ||
137 | new mode 100755 | ||
138 | index 88f37f2..4af87aa | ||
139 | --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h | ||
140 | +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_g12_X.h | ||
141 | @@ -118,11 +118,8 @@ public: | ||
142 | |||
143 | m_osInterface = osInterface; | ||
144 | if (m_numVdbox > 1 | ||
145 | -#if (_DEBUG || _RELEASE_INTERNAL) | ||
146 | && m_osInterface != nullptr | ||
147 | - && m_osInterface->bHcpDecScalabilityMode | ||
148 | -#endif | ||
149 | - ) | ||
150 | + && m_osInterface->bHcpDecScalabilityMode) | ||
151 | { | ||
152 | m_scalabilitySupported = true; | ||
153 | } | ||
154 | diff --git a/media_driver/linux/common/os/mos_os_specific.c b/media_driver/linux/common/os/mos_os_specific.c | ||
155 | old mode 100644 | ||
156 | new mode 100755 | ||
157 | index b07739a..610f2ae | ||
158 | --- a/media_driver/linux/common/os/mos_os_specific.c | ||
159 | +++ b/media_driver/linux/common/os/mos_os_specific.c | ||
160 | @@ -7286,7 +7286,6 @@ static MOS_STATUS Mos_Specific_InitInterface_Ve( | ||
161 | osInterface->bGucSubmission = true; | ||
162 | } | ||
163 | |||
164 | -#if (_DEBUG || _RELEASE_INTERNAL) | ||
165 | //Read Scalable/Legacy Decode mode on Gen11+ | ||
166 | //1:by default for scalable decode mode | ||
167 | //0:for legacy decode mode | ||
168 | @@ -7304,6 +7303,7 @@ static MOS_STATUS Mos_Specific_InitInterface_Ve( | ||
169 | osInterface->bHcpDecScalabilityMode = MOS_SCALABILITY_ENABLE_MODE_USER_FORCE; | ||
170 | } | ||
171 | |||
172 | +#if (_DEBUG || _RELEASE_INTERNAL) | ||
173 | osInterface->frameSplit = false; | ||
174 | MOS_ZeroMemory(&userFeatureData, sizeof(userFeatureData)); | ||
175 | MOS_UserFeature_ReadValue_ID( | ||
176 | -- | ||
177 | 2.7.4 | ||
178 | |||
diff --git a/recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch b/recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch deleted file mode 100644 index ec1dfe56..00000000 --- a/recipes-multimedia/libva/files/0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From c7a9e55eb20cbaf12326bdffb57f881febe1e9c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jay Yang <jay.yang@intel.com> | ||
3 | Date: Fri, 2 Jul 2021 10:02:51 +0000 | ||
4 | Subject: [PATCH] [VP] Fix 2pass CSC PROCAMP not work issue | ||
5 | |||
6 | Enable PROCAMP when 2pass CSC is also enabled. | ||
7 | Fixes: #1138 | ||
8 | Signed off by: jay.yang@intel.com | ||
9 | |||
10 | This patch was importaed from iHD media-driver git server | ||
11 | (https://github.com/intel/media-driver.git) as of commit id | ||
12 | 06905e60e8aacc86828e79b1431188ba6ed46268 | ||
13 | |||
14 | Upstream-status: Backport | ||
15 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
16 | --- | ||
17 | media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp | ||
21 | index edea839e..20634286 100644 | ||
22 | --- a/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp | ||
23 | +++ b/media_driver/agnostic/common/vp/hal/vphal_render_vebox_base.cpp | ||
24 | @@ -2502,6 +2502,7 @@ void VPHAL_VEBOX_STATE::VeboxSetRenderingFlags( | ||
25 | pSrc->ColorSpace != pRenderTarget->ColorSpace); | ||
26 | |||
27 | pRenderData->bProcamp = ((IS_VPHAL_OUTPUT_PIPE_VEBOX(pRenderData) || | ||
28 | + pRenderData->b2PassesCSC || | ||
29 | IS_VPHAL_OUTPUT_PIPE_SFC(pRenderData)) && | ||
30 | pSrc->pProcampParams && | ||
31 | pSrc->pProcampParams->bEnabled); | ||
32 | -- | ||
33 | 2.17.1 | ||
34 | |||
diff --git a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb b/recipes-multimedia/libva/intel-media-driver_21.3.5.bb index fed52120..b7b5727b 100644 --- a/recipes-multimedia/libva/intel-media-driver_21.2.3.bb +++ b/recipes-multimedia/libva/intel-media-driver_21.3.5.bb | |||
@@ -19,11 +19,9 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
19 | DEPENDS += "libva gmmlib" | 19 | DEPENDS += "libva gmmlib" |
20 | 20 | ||
21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ | 21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ |
22 | file://0001-VP-Fix-2pass-CSC-PROCAMP-not-work-issue.patch \ | ||
23 | file://0001-Expose-the-reg-to-disable-scalability.patch \ | ||
24 | " | 22 | " |
25 | 23 | ||
26 | SRCREV = "008fb3b400dd906276f999eeaef3f49d52fd3d05" | 24 | SRCREV = "ec4dc5d653733c21f8bf390794674052b5abdb09" |
27 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
28 | 26 | ||
29 | COMPATIBLE_HOST:x86-x32 = "null" | 27 | COMPATIBLE_HOST:x86-x32 = "null" |