All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.3.0
@ 2024-07-25 21:28 Bernd Kuhls
  2024-07-25 21:28 ` [Buildroot] [PATCH 2/2] package/intel-vpl-gpu-rt: " Bernd Kuhls
  2024-07-26  6:43 ` [Buildroot] [PATCH 1/2] package/intel-mediadriver: " Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2024-07-25 21:28 UTC (permalink / raw)
  To: buildroot; +Cc: Louis-Paul Cordier

Added upstream fix for build issues with GCC 14.x.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../0001-Refactor-for-build-issue.patch       | 142 ++++++++++++++++++
 .../intel-mediadriver/intel-mediadriver.hash  |   2 +-
 .../intel-mediadriver/intel-mediadriver.mk    |   2 +-
 3 files changed, 144 insertions(+), 2 deletions(-)
 create mode 100644 package/intel-mediadriver/0001-Refactor-for-build-issue.patch

diff --git a/package/intel-mediadriver/0001-Refactor-for-build-issue.patch b/package/intel-mediadriver/0001-Refactor-for-build-issue.patch
new file mode 100644
index 0000000000..5badc985cc
--- /dev/null
+++ b/package/intel-mediadriver/0001-Refactor-for-build-issue.patch
@@ -0,0 +1,142 @@
+From 47bae3c809c9f5b11793b76b5edfd7704adb4080 Mon Sep 17 00:00:00 2001
+From: Chen_Ke <ke3.chen@intel.com>
+Date: Fri, 12 Jul 2024 11:42:04 +0800
+Subject: [PATCH] [VP] Refactor for build issue
+
+Refactor for build issue: Avoid storing the address of local variable
+
+Upstream: https://github.com/intel/media-driver/commit/47bae3c809c9f5b11793b76b5edfd7704adb4080
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ media_common/agnostic/common/hw/mhw_render.h      |  1 +
+ media_common/agnostic/common/hw/mhw_state_heap.h  |  2 --
+ .../agnostic/common/hw/mhw_render_cmdpar.h        |  1 +
+ .../shared/packet/media_render_cmd_packet.cpp     |  4 ++--
+ .../shared/packet/media_render_cmd_packet.h       |  4 ++--
+ .../common/vp/hal/packet/vp_render_kernel_obj.cpp | 15 +++++----------
+ .../common/vp/hal/packet/vp_render_kernel_obj.h   |  3 ++-
+ 7 files changed, 13 insertions(+), 17 deletions(-)
+
+diff --git a/media_common/agnostic/common/hw/mhw_render.h b/media_common/agnostic/common/hw/mhw_render.h
+index b551ab1337..36c895c299 100644
+--- a/media_common/agnostic/common/hw/mhw_render.h
++++ b/media_common/agnostic/common/hw/mhw_render.h
+@@ -312,6 +312,7 @@ typedef struct _MHW_GPGPU_WALKER_PARAMS
+ 
+     bool                       hasBarrier;
+     PMHW_INLINE_DATA_PARAMS    inlineDataParamBase;
++    uint32_t                   inlineDataParamSize;
+ 
+ } MHW_GPGPU_WALKER_PARAMS, *PMHW_GPGPU_WALKER_PARAMS;
+ 
+diff --git a/media_common/agnostic/common/hw/mhw_state_heap.h b/media_common/agnostic/common/hw/mhw_state_heap.h
+index 49add60823..2f9afff0af 100644
+--- a/media_common/agnostic/common/hw/mhw_state_heap.h
++++ b/media_common/agnostic/common/hw/mhw_state_heap.h
+@@ -83,8 +83,6 @@ typedef struct MHW_BLOCK_MANAGER *PMHW_BLOCK_MANAGER;
+ 
+ #define MHW_INVALID_SYNC_TAG            0xFFFFFFFF
+ 
+-#define MAX_INLINE_DATA_PARAMS          32
+-
+ enum MW_RENDER_ENGINE_ADDRESS_SHIFT
+ {
+     MHW_STATE_HEAP_SURFACE_STATE_SHIFT = 0
+diff --git a/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h b/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h
+index 4c01d351ce..a8004bbbb9 100644
+--- a/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h
++++ b/media_softlet/agnostic/common/hw/mhw_render_cmdpar.h
+@@ -65,6 +65,7 @@ struct MHW_HEAPS_RESOURCE
+ {
+     PMOS_RESOURCE          presInstructionBuffer = nullptr;
+     PMHW_INLINE_DATA_PARAMS inlineDataParamsBase   = nullptr;
++    uint32_t                inlineDataParamSize   = 0;
+ };
+ 
+ enum MHW_VFE_SLICE_DISABLE
+diff --git a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp
+index dc9d6896ba..c18cbf4b4f 100644
+--- a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp
++++ b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.cpp
+@@ -1264,8 +1264,8 @@ MOS_STATUS RenderCmdPacket::PrepareComputeWalkerParams(KERNEL_WALKER_PARAMS para
+ 
+     gpgpuWalker.SLMSize           = params.slmSize;
+     gpgpuWalker.hasBarrier        = params.hasBarrier;
+-    gpgpuWalker.inlineDataParamBase   = params.inlineDataParams;
+-
++    gpgpuWalker.inlineDataParamBase   = params.inlineDataParamBase;
++    gpgpuWalker.inlineDataParamSize = params.inlineDataParamSize;
+     return MOS_STATUS_SUCCESS;
+ }
+ 
+diff --git a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h
+index 89ac89d9a5..7e6b0aa8a1 100644
+--- a/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h
++++ b/media_softlet/agnostic/common/shared/packet/media_render_cmd_packet.h
+@@ -120,8 +120,8 @@ typedef struct _KERNEL_WALKER_PARAMS
+ 
+     bool                                hasBarrier;
+     uint32_t                            slmSize;
+-    MHW_INLINE_DATA_PARAMS              inlineDataParams[MAX_INLINE_DATA_PARAMS];
+-    uint32_t                            inlineDataParamNum;
++    PMHW_INLINE_DATA_PARAMS             inlineDataParamBase;
++    uint32_t                            inlineDataParamSize;
+ }KERNEL_WALKER_PARAMS, * PKERNEL_WALKER_PARAMS;
+ 
+ typedef struct _KERNEL_PACKET_RENDER_DATA
+diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp
+index d6630cbd5f..dbd5b12d1d 100644
+--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp
++++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.cpp
+@@ -740,7 +740,7 @@ void VpRenderKernelObj::DumpSurface(VP_SURFACE* pSurface, PCCHAR fileName)
+ #endif
+ }
+ 
+-MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KERNEL_WALKER_PARAMS &walkerParam, KRN_ARG args, RENDERHAL_INTERFACE *renderhal)
++MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KRN_ARG args, RENDERHAL_INTERFACE *renderhal)
+ {
+     VP_FUNC_CALL();
+     MHW_INLINE_DATA_PARAMS inlineDataPar = {};
+@@ -762,15 +762,10 @@ MOS_STATUS VpRenderKernelObj::SetInlineDataParameter(KERNEL_WALKER_PARAMS &walke
+     {
+         inlineDataPar.isPtrType = false;
+     }
+-    if (walkerParam.inlineDataParamNum < MAX_INLINE_DATA_PARAMS)
+-    {
+-        walkerParam.inlineDataParams[walkerParam.inlineDataParamNum] = inlineDataPar;
+-        walkerParam.inlineDataParamNum++;
+-    }
+-    else
+-    {
+-        VP_RENDER_ASSERTMESSAGE("Exceed max inline data params!");
+-    }
++
++    // walkerParam.inlineDataParamBase will add m_inlineDataParams.data() in each kernel
++    // walkerParam.inlineDataParamSize will add m_inlineDataParams.size() in each kernel
++    m_inlineDataParams.push_back(inlineDataPar);
+ 
+     return MOS_STATUS_SUCCESS;
+ }
+\ No newline at end of file
+diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h
+index 8b9abf9dca..8d095730cd 100644
+--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h
++++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_kernel_obj.h
+@@ -537,7 +537,7 @@ class VpRenderKernelObj
+ 
+     virtual MOS_STATUS InitRenderHalSurfaceCMF(MOS_SURFACE* src, PRENDERHAL_SURFACE renderHalSurface);
+ 
+-    virtual MOS_STATUS SetInlineDataParameter(KERNEL_WALKER_PARAMS &walkerParam, KRN_ARG args, RENDERHAL_INTERFACE *renderhal);
++    virtual MOS_STATUS SetInlineDataParameter(KRN_ARG args, RENDERHAL_INTERFACE *renderhal);
+ 
+     virtual MOS_STATUS UpdateBindlessSurfaceResource(SurfaceType surf, std::set<uint32_t> surfStateOffset)
+     {
+@@ -617,6 +617,7 @@ class VpRenderKernelObj
+     bool                                                    m_useIndependentSamplerGroup = false; //true means multi kernels has their own stand alone sampler states group. only can be true when m_isAdvKernel is true.
+ 
+     std::shared_ptr<mhw::vebox::Itf>                        m_veboxItf = nullptr;
++    std ::vector<MHW_INLINE_DATA_PARAMS>                    m_inlineDataParams = {};
+ 
+ MEDIA_CLASS_DEFINE_END(vp__VpRenderKernelObj)
+ };
diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash
index 89aaab8721..4fa24fba7a 100644
--- a/package/intel-mediadriver/intel-mediadriver.hash
+++ b/package/intel-mediadriver/intel-mediadriver.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  dec2210c1f824a721e4ea6f66f5899e300801b3e7fae232d3f8a94db38c2edd1  intel-media-24.2.5.tar.gz
+sha256  b6728607e4d05739bce27124605993011b468781043ce34bb1a51919196f2d15  intel-media-24.3.0.tar.gz
 sha256  74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3  LICENSE.md
diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk
index 84b29c1f9a..9a52002672 100644
--- a/package/intel-mediadriver/intel-mediadriver.mk
+++ b/package/intel-mediadriver/intel-mediadriver.mk
@@ -6,7 +6,7 @@
 
 # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack
 
-INTEL_MEDIADRIVER_VERSION = 24.2.5
+INTEL_MEDIADRIVER_VERSION = 24.3.0
 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive
 INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz
 INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] package/intel-vpl-gpu-rt: bump version to 24.3.0
  2024-07-25 21:28 [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.3.0 Bernd Kuhls
@ 2024-07-25 21:28 ` Bernd Kuhls
  2024-07-26  6:43 ` [Buildroot] [PATCH 1/2] package/intel-mediadriver: " Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Bernd Kuhls @ 2024-07-25 21:28 UTC (permalink / raw)
  To: buildroot; +Cc: Louis-Paul Cordier

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash | 2 +-
 package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash
index 9c9f6e720d..2b42c7b050 100644
--- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash
+++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  ccb76812642d84d4d8a56d28df60ef6d450cbb09969a59ee6c4a819098617b5d  intel-vpl-gpu-rt-24.2.5.tar.gz
+sha256  02b01dd73f7c5a4a46860ec01470b484286709cc13f9333a34a089d7e457295e  intel-vpl-gpu-rt-24.3.0.tar.gz
 sha256  c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297  LICENSE
diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk
index a4daa8d29c..1566b87b49 100644
--- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk
+++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-INTEL_VPL_GPU_RT_VERSION = 24.2.5
+INTEL_VPL_GPU_RT_VERSION = 24.3.0
 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION))
 INTEL_VPL_GPU_RT_LICENSE = MIT
 INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.3.0
  2024-07-25 21:28 [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.3.0 Bernd Kuhls
  2024-07-25 21:28 ` [Buildroot] [PATCH 2/2] package/intel-vpl-gpu-rt: " Bernd Kuhls
@ 2024-07-26  6:43 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-26  6:43 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: Louis-Paul Cordier, buildroot

On Thu, 25 Jul 2024 23:28:03 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Added upstream fix for build issues with GCC 14.x.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .../0001-Refactor-for-build-issue.patch       | 142 ++++++++++++++++++
>  .../intel-mediadriver/intel-mediadriver.hash  |   2 +-
>  .../intel-mediadriver/intel-mediadriver.mk    |   2 +-
>  3 files changed, 144 insertions(+), 2 deletions(-)
>  create mode 100644 package/intel-mediadriver/0001-Refactor-for-build-issue.patch

Both applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-26  6:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-25 21:28 [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.3.0 Bernd Kuhls
2024-07-25 21:28 ` [Buildroot] [PATCH 2/2] package/intel-vpl-gpu-rt: " Bernd Kuhls
2024-07-26  6:43 ` [Buildroot] [PATCH 1/2] package/intel-mediadriver: " Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.