Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Gary Bisson <gary.bisson@boundarydevices.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 05/13] imx-vpu: bump version to 5.4.27
Date: Wed, 20 May 2015 12:12:16 +0200	[thread overview]
Message-ID: <1432116744-25760-6-git-send-email-gary.bisson@boundarydevices.com> (raw)
In-Reply-To: <1432116744-25760-1-git-send-email-gary.bisson@boundarydevices.com>

- imx-vpu version changed to internal version
- VPU share memory file open fixes
- Upgrade ion usage
- Remove obey-variables patch -now included in release

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Hi all,

This patch is based on the Yocto equivalent:
https://github.com/Freescale/meta-fsl-arm/commit/db343da3e4eb2afa6a72f7526751bb8d8ba287e1

The IOGetVirtMem return value patch has now been included into the upstream
package.

This package has been implicitely tested through gstreamer as the plugins
rely on it for vpu decoding:
# gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm
# gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \
  matroskademux ! imxvpudec ! imxipuvideosink

Regards,
Gary
---
 .../0001-vpu-io-fix-IOSystemInit-failure.patch     | 32 ------------
 ...-lib-fix-IOGetVirtMem-return-value-checks.patch | 59 ----------------------
 package/freescale-imx/imx-vpu/imx-vpu.mk           |  2 +-
 3 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
 delete mode 100644 package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch

diff --git a/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
deleted file mode 100644
index ed93193..0000000
--- a/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-[PATCH] vpu-io: fix IOSystemInit failure
-
-When using a kernel where user/kernel split is 3G/1G, the address
-returned by IOGetVirtMem() can appear to be a negative int.
-
-IOSystemInit() incorrectly checks the return value of IOGetVirtMem().
-IOGetVirtMem() returns -1 on error (and not MAP_FAILED, nor any other
-negative value.)
-
-Fix that by correctly checking against -1 (and not MAP_FAILED!)
-
-Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
-[yann.morin.1998 at free.fr: expand the commit log]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- vpu/vpu_io.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vpu/vpu_io.c b/vpu/vpu_io.c
-index 8cbb571..14759da 100644
---- a/vpu/vpu_io.c
-+++ b/vpu/vpu_io.c
-@@ -265,7 +265,7 @@ int IOSystemInit(void *callback)
- 		goto err;
- 	}
- 
--	if (IOGetVirtMem(&bit_work_addr) <= 0)
-+	if (IOGetVirtMem(&bit_work_addr) == -1)
- 		goto err;
- #endif
- 	UnlockVpu(vpu_semap);
-
diff --git a/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch b/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
deleted file mode 100644
index 583a508..0000000
--- a/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-[PATCH] vpu-lib: fix IOGetVirtMem return value checks
-
-When using a kernel where user/kernel split is 3G/1G, the address
-returned by IOGetVirtMem() can appear to be a negative int.
-
-IOSystemInit() incorrectly checks the return value of IOGetVirtMem().
-IOGetVirtMem() returns -1 on error (and not MAP_FAILED, nor any other
-negative value.)
-
-Fix that by correctly checking against -1 (and not MAP_FAILED!)
-
-Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
-[yann.morin.1998 at free.fr: expand the commit log]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- vpu/vpu_lib.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/vpu/vpu_lib.c b/vpu/vpu_lib.c
-index 1fb731b..7a7f42d 100644
---- a/vpu/vpu_lib.c
-+++ b/vpu/vpu_lib.c
-@@ -1764,7 +1764,7 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param)
- 				err_msg("Unable to obtain physical mem\n");
- 				return RETCODE_FAILURE;
- 			}
--			if (IOGetVirtMem(&pEncInfo->picParaBaseMem) <= 0) {
-+			if (IOGetVirtMem(&pEncInfo->picParaBaseMem) == -1) {
- 				IOFreePhyMem(&pEncInfo->picParaBaseMem);
- 				pEncInfo->picParaBaseMem.phy_addr = 0;
- 				err_msg("Unable to obtain virtual mem\n");
-@@ -2982,7 +2982,7 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info)
- 			UnlockVpu(vpu_semap);
- 			return RETCODE_FAILURE;
- 		}
--		if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+		if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
- 			IOFreePhyMem(&pDecInfo->userDataBufMem);
- 			pDecInfo->userDataBufMem.phy_addr = 0;
- 			err_msg("Unable to obtain virtual mem\n");
-@@ -4017,7 +4017,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
- 				UnlockVpu(vpu_semap);
- 				return RETCODE_FAILURE;
- 			}
--			if (IOGetVirtMem(&pDecInfo->picParaBaseMem) <= 0) {
-+			if (IOGetVirtMem(&pDecInfo->picParaBaseMem) == -1) {
- 				IOFreePhyMem(&pDecInfo->picParaBaseMem);
- 				pDecInfo->picParaBaseMem.phy_addr = 0;
- 				err_msg("Unable to obtain virtual mem\n");
-@@ -4057,7 +4057,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param)
- 			UnlockVpu(vpu_semap);
- 			return RETCODE_FAILURE;
- 		}
--		if (IOGetVirtMem(&pDecInfo->userDataBufMem) <= 0) {
-+		if (IOGetVirtMem(&pDecInfo->userDataBufMem) == -1) {
- 			IOFreePhyMem(&pDecInfo->userDataBufMem);
- 			pDecInfo->userDataBufMem.phy_addr = 0;
- 			err_msg("Unable to obtain virtual mem\n");
-
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
index ab3634d..4c4a031 100644
--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_VPU_VERSION = 5.4.27
 IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
 IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
 
-- 
2.1.4

  parent reply	other threads:[~2015-05-20 10:12 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20 10:12 [Buildroot] [PATCH 00/13] Update Freescale packages to 3.10.53-1.1.0_GA Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 01/13] libfslvpuwrap: bump version to 1.0.57 Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 02/13] libfslcodec: bump version to 4.0.2 Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 03/13] libfslparser: " Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 04/13] gst-fsl-plugins: " Gary Bisson
2015-05-20 10:12 ` Gary Bisson [this message]
2015-05-20 10:12 ` [Buildroot] [PATCH 06/13] freescale-imx: bump to 3.10.53-1.1.0 GA release Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 07/13] gpu-viv-bin-mx6q: bump to 5.0.11.p4.1 Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 08/13] gpu-viv-bin-mx6q: rename package to imx-gpu-viv Gary Bisson
2015-05-21  9:34   ` Thomas Petazzoni
2015-05-21 12:13     ` Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 09/13] xdriver_xf86-video-imx-viv: bump to version 3.10.53-1.1.0 GA Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 10/13] nitrogen6x_defconfig: bump version to 3.10.53_1.1.1_ga Gary Bisson
2015-05-20 10:12 ` [Buildroot] [PATCH 11/13] board/boundarydevices: update 6x_bootscript Gary Bisson
2015-05-21 17:05   ` Thomas Petazzoni
2015-05-22  7:57     ` Gary Bisson
2015-05-22  8:07       ` Thomas Petazzoni
2015-05-20 10:12 ` [Buildroot] [PATCH 12/13] freescale_imx6*_defconfig: bump version to 3.10.53-1.1.0 GA Gary Bisson
2015-05-21  9:10   ` [Buildroot] [PATCH] imx6sabre: refresh u-boot patch Vincent Stehlé
2015-07-11 11:30     ` Thomas Petazzoni
2015-05-20 10:12 ` [Buildroot] [PATCH 13/13] qmx6_defconfig: bump version to 3.10.53_1.1.0 Gary Bisson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432116744-25760-6-git-send-email-gary.bisson@boundarydevices.com \
    --to=gary.bisson@boundarydevices.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox