Patchwork [meta-fsl-arm,V2] libfslvpuwrap_1.0.46: fix IOGetVirtMem calls

login
register
mail settings
Submitter Eric Nelson
Date June 28, 2014, 5:17 p.m.
Message ID <1403975852-28924-1-git-send-email-eric.nelson@boundarydevices.com>
Download mbox | patch
Permalink /patch/74451/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Eric Nelson - June 28, 2014, 5:17 p.m.
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
V2 adds Upstream-Status

 ...-fix-tests-of-return-value-from-IOGetVirt.patch | 41 ++++++++++++++++++++++
 .../libfslvpuwrap/libfslvpuwrap_1.0.46.bb          |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
Otavio Salvador - June 28, 2014, 5:27 p.m.
Hello Eric,

On Sat, Jun 28, 2014 at 2:17 PM, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
...
> +Subject: [PATCH] vpu_wrapper: fix tests of return value from IOGetVirtMem
> +
> +IOGetVirtMem() returns a pointer or specifically -1 (MAP_FAILED)
> +in the case of failure.

Please extend the commit log with this info. This is much better to
have it in commit log instead of forcing people to find out what 'fix
calls' means ;)
Eric Nelson - June 28, 2014, 5:46 p.m.
On 06/28/2014 10:27 AM, Otavio Salvador wrote:
> Hello Eric,
> 
> On Sat, Jun 28, 2014 at 2:17 PM, Eric Nelson
> <eric.nelson@boundarydevices.com> wrote:
>> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ...
>> +Subject: [PATCH] vpu_wrapper: fix tests of return value from IOGetVirtMem
>> +
>> +IOGetVirtMem() returns a pointer or specifically -1 (MAP_FAILED)
>> +in the case of failure.
> 
> Please extend the commit log with this info. This is much better to
> have it in commit log instead of forcing people to find out what 'fix
> calls' means ;)
> 

Okay.

I started to do that, but it felt redundant-redundant...

Patch

diff --git a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
new file mode 100644
index 0000000..ccd2d9e
--- /dev/null
+++ b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap/0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch
@@ -0,0 +1,41 @@ 
+From 7ca66c10c05168c7d342df7c7a70d4a1ae0629f7 Mon Sep 17 00:00:00 2001
+From: Eric Nelson <eric.nelson@boundarydevices.com>
+Date: Sat, 28 Jun 2014 09:45:09 -0700
+Subject: [PATCH] vpu_wrapper: fix tests of return value from IOGetVirtMem
+
+IOGetVirtMem() returns a pointer or specifically -1 (MAP_FAILED)
+in the case of failure.
+
+Upstream-Status: Pending
+
+Signed-off-by: Laci Tele <laci@boundarydevices.com>
+Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
+---
+ vpu_wrapper.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vpu_wrapper.c b/vpu_wrapper.c
+index 9249174..148c5df 100755
+--- a/vpu_wrapper.c
++++ b/vpu_wrapper.c
+@@ -6653,7 +6653,7 @@ VpuDecRetCode VPU_DecGetMem(VpuMemDesc* pInOutMem)
+ 		return VPU_DEC_RET_FAILURE;
+ 	}
+ 	ret=IOGetVirtMem(&buff);
+-	if(ret==0) //if(ret!=RETCODE_SUCCESS)
++	if(ret == -1) //if(ret==MAP_FAILED)
+ 	{
+ 		VPU_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,ret);
+ 		return VPU_DEC_RET_FAILURE;
+@@ -8277,7 +8277,7 @@ VpuEncRetCode VPU_EncGetMem(VpuMemDesc* pInOutMem)
+ 		return VPU_ENC_RET_FAILURE;
+ 	}
+ 	ret=IOGetVirtMem(&buff);
+-	if(ret==0) //if(ret!=RETCODE_SUCCESS)
++	if(ret == -1) //if(ret==MAP_FAILED)
+ 	{
+ 		VPU_ENC_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,(UINT32)ret);
+ 		return VPU_ENC_RET_FAILURE;
+-- 
+1.9.1
+
diff --git a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb
index e4970e2..8cc1523 100644
--- a/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb
+++ b/recipes-multimedia/libfslvpuwrap/libfslvpuwrap_1.0.46.bb
@@ -10,6 +10,8 @@  SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 SRC_URI[md5sum] = "1f50110cb6de8ebf767fb9c5f8baf20d"
 SRC_URI[sha256sum] = "7fc1258de338339d19a1a35167393fdc4d773682dfd9b951b197403a075f85fd"
 
+SRC_URI_append = " file://0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch"
+
 inherit fsl-eula-unpack autotools pkgconfig
 
 do_install_append() {