shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

rockchip/vcodec: seperate power-on timer for independent hw

Browse Source 
Seperate power-on timer for rkvdec and vpu when they are not
in combo mode (definitly independence).

Before this patch, h/w power off schedule will be interrupted
by the other h/w, and power off will be triggered when h/w
still running a task.

Change-Id: I29124e90afccc727d2e7a04098727aa4a2c3e8bb
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
This commit is contained in:
Alpha Lin
2016-05-06 09:18:13 +08:00
parent 9be1984799
commit 4e6f3ce852
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/rockchip/vcodec/vcodec_service.c
View File

@@ -338,6 +338,7 @@ struct vpu_subdev_data {
struct vpu_service_info {
struct wake_lock wake_lock;
struct delayed_work power_off_work;
ktime_t last; /* record previous power-on time */
/* vpu service structure global lock */
struct mutex lock;
/* link to link_reg in struct vpu_reg */
@@ -790,13 +791,12 @@ static void vpu_power_off_work(struct work_struct *work_s)
static void vpu_service_power_on(struct vpu_service_info *pservice)
{
int ret;
static ktime_t last;
ktime_t now = ktime_get();
if (ktime_to_ns(ktime_sub(now, last)) > NSEC_PER_SEC) {
if (ktime_to_ns(ktime_sub(now, pservice->last)) > NSEC_PER_SEC) {
cancel_delayed_work_sync(&pservice->power_off_work);
vpu_queue_power_off_work(pservice);
last = now;
pservice->last = now;
}
ret = atomic_add_unless(&pservice->enabled, 1, 1);
if (!ret)
@@ -2461,6 +2461,7 @@ static void vcodec_init_drvdata(struct vpu_service_info *pservice)
atomic_set(&pservice->reset_request, 0);
INIT_DELAYED_WORK(&pservice->power_off_work, vpu_power_off_work);
pservice->last.tv64 = 0;
pservice->ion_client = rockchip_ion_client_create("vpu");
if (IS_ERR(pservice->ion_client)) {