From 82a05e9558a7cd2981d2dec2094a86f83bff1377 Mon Sep 17 00:00:00 2001 From: Lim Siew Hoon Date: Mon, 25 Oct 2021 10:23:00 +0800 Subject: intel-mediasdk: upgrade 21.2.3 -> 21.3.5 Drops patches already merged: * 0001-Add-support-of-DRM_FORMAT_NV12-for-console-mode-rend.patch * 0001-Fixed-tile-modifier-issue-for-NV12-format.patch Signed-off-by: Lim Siew Hoon Signed-off-by: Anuj Mittal --- ...Fixed-tile-modifier-issue-for-NV12-format.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 recipes-multimedia/mediasdk/files/0001-Fixed-tile-modifier-issue-for-NV12-format.patch (limited to 'recipes-multimedia/mediasdk/files/0001-Fixed-tile-modifier-issue-for-NV12-format.patch') diff --git a/recipes-multimedia/mediasdk/files/0001-Fixed-tile-modifier-issue-for-NV12-format.patch b/recipes-multimedia/mediasdk/files/0001-Fixed-tile-modifier-issue-for-NV12-format.patch deleted file mode 100644 index c249c176..00000000 --- a/recipes-multimedia/mediasdk/files/0001-Fixed-tile-modifier-issue-for-NV12-format.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3fc9fe078c850643f8070cce1d2b0307a9014523 Mon Sep 17 00:00:00 2001 -From: "Sodhi, Vunny" -Date: Fri, 13 Aug 2021 12:09:26 +0800 -Subject: [meta-intel][PATCH] Fixed tile modifier issue for NV12 format - -If we are using I915_FORMAT_MOD_Y_TILED which is needed for -NV12 format then modifiers need to be enabled which can be passed -as flags argument to ioctl. - -Upstream-Status: Submitted -https://github.com/Intel-Media-SDK/MediaSDK/pull/2755 - -Signed-off-by: Sodhi, Vunny ---- - samples/sample_common/src/vaapi_utils_drm.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/samples/sample_common/src/vaapi_utils_drm.cpp b/samples/sample_common/src/vaapi_utils_drm.cpp -index 5ad73dd..73c8bd2 100644 ---- a/samples/sample_common/src/vaapi_utils_drm.cpp -+++ b/samples/sample_common/src/vaapi_utils_drm.cpp -@@ -422,7 +422,7 @@ void* drmRenderer::acquire(mfxMemId mid) - int ret = m_drmlib.drmIoctl(m_fd, DRM_IOCTL_GEM_OPEN, &flink_open); - if (ret) return NULL; - -- uint32_t handles[4], pitches[4], offsets[4], pixel_format; -+ uint32_t handles[4], pitches[4], offsets[4], pixel_format, flags = 0; - uint64_t modifiers[4]; - - memset(&handles, 0, sizeof(handles)); -@@ -452,13 +452,14 @@ void* drmRenderer::acquire(mfxMemId mid) - pitches[1] = vmid->m_image.pitches[1]; - offsets[1] = vmid->m_image.offsets[1]; - modifiers[0] = modifiers[1] = I915_FORMAT_MOD_Y_TILED; -+ flags = 2; // DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] - } - else { - pixel_format = DRM_FORMAT_XRGB8888; - } - - ret = m_drmlib.drmModeAddFB2WithModifiers(m_fd, vmid->m_image.width, vmid->m_image.height, -- pixel_format, handles, pitches, offsets, modifiers, &fbhandle, 0); -+ pixel_format, handles, pitches, offsets, modifiers, &fbhandle, flags); - if (ret) return NULL; - - MSDK_ZERO_MEMORY(flink_close); --- -2.7.4 - -- cgit v1.2.3-54-g00ecf