[media] au0828: disable tuner links and cache tuner/decoder
For au0828_enable_source() to work, the tuner links should be
disabled and the tuner/decoder should be cached at au0828 struct.
While here, put dev->decoder cache together with dev->tuner, as
it makes easier to drop both latter if/when we move the enable
routines to the V4L2 core.
Fixes: 9822f4173f
('[media] au0828: use v4l2_mc_create_media_graph()')
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Reviewed-by: Shuah Khan <shuahkh@osg.samsung.com>
Tested-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
parent
f55532a0c0
commit
2e208c64e3
|
@ -228,10 +228,6 @@ void au0828_card_analog_fe_setup(struct au0828_dev *dev)
|
|||
"au8522", 0x8e >> 1, NULL);
|
||||
if (sd == NULL)
|
||||
pr_err("analog subdev registration failed\n");
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER
|
||||
if (sd)
|
||||
dev->decoder = &sd->entity;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Setup tuners */
|
||||
|
|
|
@ -456,7 +456,8 @@ static int au0828_media_device_register(struct au0828_dev *dev,
|
|||
{
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER
|
||||
int ret;
|
||||
struct media_entity *entity, *demod = NULL, *tuner = NULL;
|
||||
struct media_entity *entity, *demod = NULL;
|
||||
struct media_link *link;
|
||||
|
||||
if (!dev->media_dev)
|
||||
return 0;
|
||||
|
@ -482,26 +483,37 @@ static int au0828_media_device_register(struct au0828_dev *dev,
|
|||
}
|
||||
|
||||
/*
|
||||
* Find tuner and demod to disable the link between
|
||||
* the two to avoid disable step when tuner is requested
|
||||
* by video or audio. Note that this step can't be done
|
||||
* until dvb graph is created during dvb register.
|
||||
* Find tuner, decoder and demod.
|
||||
*
|
||||
* The tuner and decoder should be cached, as they'll be used by
|
||||
* au0828_enable_source.
|
||||
*
|
||||
* It also needs to disable the link between tuner and
|
||||
* decoder/demod, to avoid disable step when tuner is requested
|
||||
* by video or audio. Note that this step can't be done until dvb
|
||||
* graph is created during dvb register.
|
||||
*/
|
||||
media_device_for_each_entity(entity, dev->media_dev) {
|
||||
if (entity->function == MEDIA_ENT_F_DTV_DEMOD)
|
||||
switch (entity->function) {
|
||||
case MEDIA_ENT_F_TUNER:
|
||||
dev->tuner = entity;
|
||||
break;
|
||||
case MEDIA_ENT_F_ATV_DECODER:
|
||||
dev->decoder = entity;
|
||||
break;
|
||||
case MEDIA_ENT_F_DTV_DEMOD:
|
||||
demod = entity;
|
||||
else if (entity->function == MEDIA_ENT_F_TUNER)
|
||||
tuner = entity;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Disable link between tuner and demod */
|
||||
if (tuner && demod) {
|
||||
struct media_link *link;
|
||||
|
||||
list_for_each_entry(link, &demod->links, list) {
|
||||
if (link->sink->entity == demod &&
|
||||
link->source->entity == tuner) {
|
||||
/* Disable link between tuner->demod and/or tuner->decoder */
|
||||
if (dev->tuner) {
|
||||
list_for_each_entry(link, &dev->tuner->links, list) {
|
||||
if (demod && link->sink->entity == demod)
|
||||
media_entity_setup_link(link, 0);
|
||||
if (dev->decoder && link->sink->entity == dev->decoder)
|
||||
media_entity_setup_link(link, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue