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

media: rockchip: isp1: clear unready subdevice when kernel boot complete

Browse Source 
Change-Id: I497719e6e8f2ef25a9d6402c16733bf4318d06d7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
This commit is contained in:
Hu Kejun
2019-04-20 16:03:22 +08:00
committed by Tao Huang
parent f8b513bdb4
commit deb72b1b15
4 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/rockchip/isp1/dev.c
View File

@@ -76,6 +76,9 @@ static char rkisp1_version[RKISP_VERNO_LEN];
module_param_string(version, rkisp1_version, RKISP_VERNO_LEN, 0444);
MODULE_PARM_DESC(version, "version number");
static DEFINE_MUTEX(rkisp1_dev_mutex);
static LIST_HEAD(rkisp1_device_list);
/**************************** pipeline operations *****************************/
static int __isp_pipeline_prepare(struct rkisp1_pipeline *p,
@@ -1081,6 +1084,10 @@ static int rkisp1_plat_probe(struct platform_device *pdev)
writel(0, isp_dev->base_addr + CIF_ISP_CSI0_MASK2);
writel(0, isp_dev->base_addr + CIF_ISP_CSI0_MASK3);
}
mutex_lock(&rkisp1_dev_mutex);
list_add_tail(&isp_dev->list, &rkisp1_device_list);
mutex_unlock(&rkisp1_dev_mutex);
return 0;
err_runtime_disable:
@@ -1131,6 +1138,19 @@ static int __maybe_unused rkisp1_runtime_resume(struct device *dev)
return 0;
}
static int __init rkisp1_clr_unready_dev(void)
{
struct rkisp1_device *isp_dev;
mutex_lock(&rkisp1_dev_mutex);
list_for_each_entry(isp_dev, &rkisp1_device_list, list)
v4l2_async_notifier_clr_unready_dev(&isp_dev->notifier);
mutex_unlock(&rkisp1_dev_mutex);
return 0;
}
late_initcall_sync(rkisp1_clr_unready_dev);
static const struct dev_pm_ops rkisp1_plat_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
pm_runtime_force_resume)

1
drivers/media/platform/rockchip/isp1/dev.h
View File

@@ -119,6 +119,7 @@ struct rkisp1_sensor_info {
* @params_vdev: ISP input parameters device
*/
struct rkisp1_device {
struct list_head list;
struct regmap *grf;
void __iomem *base_addr;
int irq;

52
drivers/media/v4l2-core/v4l2-async.c
View File

@@ -456,6 +456,58 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
}
EXPORT_SYMBOL(v4l2_async_notifier_register);
static int __v4l2_async_notifier_clr_unready_dev(
struct v4l2_async_notifier *notifier)
{
struct v4l2_subdev *sd, *tmp;
int clr_num = 0;
list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {
struct v4l2_async_notifier *subdev_notifier =
v4l2_async_find_subdev_notifier(sd);
if (subdev_notifier)
clr_num += __v4l2_async_notifier_clr_unready_dev(
subdev_notifier);
}
list_for_each_entry_safe(sd, tmp, &notifier->waiting, async_list) {
list_del_init(&sd->async_list);
sd->asd = NULL;
sd->dev = NULL;
clr_num++;
}
return clr_num;
}
int v4l2_async_notifier_clr_unready_dev(struct v4l2_async_notifier *notifier)
{
int ret = 0;
int clr_num = 0;
mutex_lock(&list_lock);
while (notifier->parent)
notifier = notifier->parent;
if (!notifier->v4l2_dev)
goto out;
clr_num = __v4l2_async_notifier_clr_unready_dev(notifier);
dev_info(notifier->v4l2_dev->dev,
"clear unready subdev num: %d\n", clr_num);
if (clr_num > 0)
ret = v4l2_async_notifier_try_complete(notifier);
out:
mutex_unlock(&list_lock);
return ret;
}
EXPORT_SYMBOL(v4l2_async_notifier_clr_unready_dev);
int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
struct v4l2_async_notifier *notifier)
{

8
include/media/v4l2-async.h
View File

@@ -163,6 +163,14 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
struct v4l2_async_notifier *notifier);
/**
* v4l2_async_notifier_clr_unready_dev - remove unready subdevice
*
* @notifier: pointer to &struct v4l2_async_notifier
*/
int v4l2_async_notifier_clr_unready_dev(struct v4l2_async_notifier *notifier);
/**
* v4l2_async_notifier_unregister - unregisters a subdevice asynchronous notifier
*