From patchwork Wed May 20 10:12:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 474334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 9B706140293 for ; Wed, 20 May 2015 20:13:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CF300335B7; Wed, 20 May 2015 10:13:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HYMQ1YDvf8+T; Wed, 20 May 2015 10:13:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6EE54335EA; Wed, 20 May 2015 10:12:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 79E0E1C2351 for ; Wed, 20 May 2015 10:12:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 748F791AB1 for ; Wed, 20 May 2015 10:12:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id THYRSXFI-dPp for ; Wed, 20 May 2015 10:12:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 79F8491AAB for ; Wed, 20 May 2015 10:12:46 +0000 (UTC) Received: by wgjc11 with SMTP id c11so47426615wgj.0 for ; Wed, 20 May 2015 03:12:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P+na4qTjmoFQdhjvW24Ui1sYGvhm+FYVK1BokQfaxR8=; b=MgS05+K9LnPS2VmBW3uBbIZqY+AvW/GC+tdmx/Jbju5DYJlpmdtD3IMb5yRDlly1VH ZzUFZ0ktrkUoAFrr16aElMOQIB0WlKODKFgwNQpJZVZo9d7ln4ZB5zA0ee6eWg2g/ZNf gUd8Wv3JY9iaOGg+K00Ti4T4VEnNDNcQaF3JHT/8tyTTl0B5DfqyDz6ICpzW4JK5sovf WX2v/lwF7QCoHfBhzLYkVYpCKD2iH/089jShjZK4QXRrbkn5iQBb49mfWqAAsgFYHPcn 2G/7b9VnBR5a4onI0Mo8UhwynPdNb+89cvwq8vf6a8qVqgO4HT2dMNVT++NM6FmbHPyo aaLw== X-Gm-Message-State: ALoCoQkGfPpFvvo6zPE/aDnqMp80MImsfNwPUW6X5y4+qjFk2ngOOgSoerajkKiA9XixJ0ruB3mg X-Received: by 10.180.99.2 with SMTP id em2mr15994671wib.59.1432116764943; Wed, 20 May 2015 03:12:44 -0700 (PDT) Received: from t450s.lan (89-92-157-132.hfc.dyn.abo.bbox.fr. [89.92.157.132]) by mx.google.com with ESMTPSA id di9sm2628198wib.16.2015.05.20.03.12.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 May 2015 03:12:44 -0700 (PDT) From: Gary Bisson To: buildroot@busybox.net Date: Wed, 20 May 2015 12:12:16 +0200 Message-Id: <1432116744-25760-6-git-send-email-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432116744-25760-1-git-send-email-gary.bisson@boundarydevices.com> References: <1432116744-25760-1-git-send-email-gary.bisson@boundarydevices.com> Cc: thomas.petazzoni@free-electrons.com, jezz@sysmic.org, luca@lucaceresoli.net Subject: [Buildroot] [PATCH 05/13] imx-vpu: bump version to 5.4.27 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - 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 --- 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 -[yann.morin.1998@free.fr: expand the commit log] -Signed-off-by: "Yann E. MORIN" ---- - 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 -[yann.morin.1998@free.fr: expand the commit log] -Signed-off-by: "Yann E. MORIN" ---- - 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