github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

CHROMIUM: [media] rk3288-vpu: Add suspend/resume handlers

Browse Source 
Currently the driver does not implement suspend and resume PM ops.
However when system is entering suspend, the driver should prevent
submitting further runs to the hardware and wait for current run to be
finished. To resume playback after leaving sleep state, next run, if
available, must be submitted to the hardware.

This patch adds proper suspend and resume callbacks to handle this.

BUG=chrome-os-partner:38565
TEST=suspend and resume veyron_jerry several times with video playing

Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/263662
Reviewed-by: Pawel Osciak <posciak@chromium.org>

Change-Id: Id07b7d681ef78655879ce77c9705b1c25231df9d
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
This commit is contained in:
Tomasz Figa 2015-04-02 14:03:26 +09:00 committed by Huang, Tao
parent 0f090e2b2b
commit f76d4881d1
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/media/platform/rk3288-vpu/rk3288_vpu.c
View File

@ -102,7 +102,8 @@ static void rk3288_vpu_try_run(struct rk3288_vpu_dev *dev)
spin_lock_irqsave(&dev->irqlock, flags);
if (list_empty(&dev->ready_ctxs))
if (list_empty(&dev->ready_ctxs) ||
test_bit(VPU_SUSPENDED, &dev->state))
/* Nothing to do. */
goto out;
@ -716,6 +717,32 @@ static const struct of_device_id of_rk3288_vpu_match[] = {
MODULE_DEVICE_TABLE(of, of_rk3288_vpu_match);
#endif
#ifdef CONFIG_PM_SLEEP
static int rk3288_vpu_suspend(struct device *dev)
{
struct rk3288_vpu_dev *vpu = dev_get_drvdata(dev);
set_bit(VPU_SUSPENDED, &vpu->state);
wait_event(vpu->run_wq, vpu->current_ctx == NULL);
return 0;
}
static int rk3288_vpu_resume(struct device *dev)
{
struct rk3288_vpu_dev *vpu = dev_get_drvdata(dev);
clear_bit(VPU_SUSPENDED, &vpu->state);
rk3288_vpu_try_run(vpu);
return 0;
}
#endif
static const struct dev_pm_ops rk3288_vpu_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(rk3288_vpu_suspend, rk3288_vpu_resume)
};
static struct platform_driver rk3288_vpu_driver = {
.probe = rk3288_vpu_probe,
.remove = rk3288_vpu_remove,
@ -724,6 +751,7 @@ static struct platform_driver rk3288_vpu_driver = {
.name = RK3288_VPU_NAME,
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(of_rk3288_vpu_match),
.pm = &rk3288_vpu_pm_ops,
},
};
module_platform_driver(rk3288_vpu_driver);

3
drivers/media/platform/rk3288-vpu/rk3288_vpu_common.h
View File

@ -121,9 +121,12 @@ struct rk3288_vpu_buf {
* enum rk3288_vpu_state - bitwise flags indicating hardware state.
* @VPU_RUNNING: The hardware has been programmed for operation
* and is running at the moment.
* @VPU_SUSPENDED: System is entering sleep state and no more runs
* should be executed on hardware.
*/
enum rk3288_vpu_state {
VPU_RUNNING = BIT(0),
VPU_SUSPENDED = BIT(1),
};
/**