TESTONLY: disable vcodec part temporally, fix insmod/rmmod ... [chromiumos/third_party/kernel : chromeos-3.14]

[Chen Herman (Gerrit)]

Chen Herman has uploaded a new change for review.

https://chromium-review.googlesource.com/228750

Change subject: TESTONLY: disable vcodec part temporally, fix insmod/rmmod
test faiure for test rest flow
......................................................................

TESTONLY: disable vcodec part temporally, fix insmod/rmmod test faiure for
test rest flow

Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Signed-off-by: Herman Chen <herma...@rock-chips.com>
---
M drivers/media/platform/rk3288-vpu/rk3288_vpu.c
1 file changed, 13 insertions(+), 16 deletions(-)



diff --git a/drivers/media/platform/rk3288-vpu/rk3288_vpu.c
b/drivers/media/platform/rk3288-vpu/rk3288_vpu.c
index 2e43059..d59861c 100755
--- a/drivers/media/platform/rk3288-vpu/rk3288_vpu.c
+++ b/drivers/media/platform/rk3288-vpu/rk3288_vpu.c
@@ -43,8 +43,8 @@
int ret = 0;

vpu_debug_enter();
- if (mutex_lock_interruptible(&dev->vpu_mutex))
- return -ERESTARTSYS;
+ mutex_lock(&dev->vpu_mutex);
+
/* Allocate memory for context */
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx) {
@@ -256,7 +256,7 @@
{
struct rk3288_vpu_dev *dev = NULL;
struct video_device *vfd;
- int ret;
+ int ret = 0;

vpu_debug_enter();

@@ -275,7 +275,7 @@
mutex_init(&dev->vpu_mutex);
mutex_lock(&dev->vpu_mutex);

- ret = vcodec_hw_probe(pdev);
+ //ret = vcodec_hw_probe(pdev);
if (ret) {
dev_err(&pdev->dev, "vcodec_hw_probe failed\n");
goto err_hw_probe;
@@ -309,17 +309,18 @@
vfd->vfl_dir = VFL_DIR_M2M;
snprintf(vfd->name, sizeof(vfd->name), "%s", RK3288_VPU_ENC_NAME);
dev->vfd_enc = vfd;
+
+ v4l2_info(&dev->v4l2_dev,
+ "encoder registered as /dev/video%d\n", vfd->num);
+ video_set_drvdata(vfd, dev);
+ platform_set_drvdata(pdev, dev);
+
ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
if (ret) {
v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
video_device_release(vfd);
goto err_enc_reg;
}
-
- v4l2_info(&dev->v4l2_dev,
- "encoder registered as /dev/video%d\n", vfd->num);
- video_set_drvdata(vfd, dev);
- platform_set_drvdata(pdev, dev);

mutex_unlock(&dev->vpu_mutex);
v4l2_info(&dev->v4l2_dev, "Rockchip v4l2 devices register success\n");
@@ -348,17 +349,13 @@
vpu_debug_enter();
v4l2_info(&dev->v4l2_dev, "Removing %s\n", pdev->name);

- mutex_lock(&dev->vpu_mutex);
+ //vcodec_hw_remove(pdev);
+ vb2_dma_contig_cleanup_ctx(dev->alloc_ctx);

video_unregister_device(dev->vfd_enc);
- video_device_release(dev->vfd_enc);
v4l2_device_unregister(&dev->v4l2_dev);

- vb2_dma_contig_cleanup_ctx(dev->alloc_ctx);
- vcodec_hw_remove(pdev);
-
- mutex_unlock(&dev->vpu_mutex);
- devm_kfree(&pdev->dev, dev);
+ vpu_debug_leave();

return 0;
}

--
To view, visit https://chromium-review.googlesource.com/228750
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Gerrit-PatchSet: 1
Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: chromeos-3.14
Gerrit-Owner: Chen Herman <herma...@rock-chips.com>

[Chen Herman (Gerrit)]

Chen Herman has uploaded a new patch set (#2).

Change subject: TESTONLY: disable vcodec part temporally, fix insmod/rmmod
test faiure for test rest flow
......................................................................

TESTONLY: disable vcodec part temporally, fix insmod/rmmod test faiure for
test rest flow

Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Signed-off-by: Herman Chen <herma...@rock-chips.com>
---

M arch/arm/boot/dts/rk3288.dtsi
M drivers/media/platform/rk3288-vpu/rk3288_vpu.c
2 files changed, 15 insertions(+), 18 deletions(-)

--
To view, visit https://chromium-review.googlesource.com/228750
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Gerrit-PatchSet: 2

[Chen Herman (Gerrit)]

Chen Herman has uploaded a new patch set (#3).

Change subject: TESTONLY: disable vcodec part temporally, fix insmod/rmmod

test faiure for test rest flow fix alignment and coding style

......................................................................

TESTONLY: disable vcodec part temporally, fix insmod/rmmod test faiure for
test rest flow

fix alignment and coding style

Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Signed-off-by: Herman Chen <herma...@rock-chips.com>
---

M arch/arm/boot/dts/rk3288.dtsi
M drivers/media/platform/rk3288-vpu/rk3288_vpu.c
M drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.c
3 files changed, 181 insertions(+), 191 deletions(-)

--
To view, visit https://chromium-review.googlesource.com/228750
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Gerrit-PatchSet: 3

[Chen Herman (Gerrit)]

Chen Herman has uploaded a new patch set (#4).

Change subject: fix memory issue on open/close
......................................................................

fix memory issue on open/close

Change-Id: Ic04c9dcdbb68e2c2d8eb491cc82239ce1fe8599a
Signed-off-by: Herman Chen <herma...@rock-chips.com>

TESTONLY: fix insmod/rmmod test faiure for test rest flow

disable vcodec part temporally

fix alignment and coding style

Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Signed-off-by: Herman Chen <herma...@rock-chips.com>
---

M arch/arm/boot/dts/rk3288.dtsi
M drivers/media/platform/rk3288-vpu/rk3288_vpu.c
M drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.c

M drivers/media/platform/rk3288-vpu/vpu/vcodec_service.c
4 files changed, 197 insertions(+), 197 deletions(-)

--
To view, visit https://chromium-review.googlesource.com/228750
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Gerrit-PatchSet: 4

[Tomasz Figa (Gerrit)]

Tomasz Figa has abandoned this change.

Change subject: fix memory issue on open/close
......................................................................

Abandoned

--
To view, visit https://chromium-review.googlesource.com/228750
To unsubscribe, visit https://chromium-review.googlesource.com/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I1b1b6fb8e5de5b017ef977844cda69404108dce3
Gerrit-PatchSet: 4

Gerrit-Project: chromiumos/third_party/kernel
Gerrit-Branch: chromeos-3.14
Gerrit-Owner: Chen Herman <herma...@rock-chips.com>

Gerrit-Reviewer: Jeffy Chen <jeffy...@rock-chips.com>
Gerrit-Reviewer: Pawel Osciak <pos...@chromium.org>
Gerrit-Reviewer: Tomasz Figa <tf...@chromium.org>