AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Revert "[media] af9015: limit I2C access to keep FW happy"

Browse Source 
This reverts commit ff83bd82cb.

As requested by Antti:
From a talk with him at #linuxtv irc, he strong feeling that some apps
like MythTV will do a lot a lot of I2C I/O and now it adds locks,
with utimatelly means more delays. This could cause bad effects.

There is a new patch for 3.3 that re-writes af9013 in order to limit
I2C I/O. and thus those patches could be nice to have together
because those user who has has problems are most likely MythTV users.

So, let's revert this commit for now.

Requested-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2011-12-12 16:02:15 -02:00
parent 393a23fc93
commit 4b5d8da88e
2 changed files with 0 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
drivers/media/dvb/dvb-usb/af9015.c
View File

@ -1093,80 +1093,9 @@ static int af9015_rc_query(struct dvb_usb_device *d)
return ret;
}
/* override demod callbacks for resource locking */
static int af9015_af9013_set_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
{
int ret;
struct dvb_usb_adapter *adap = fe->dvb->priv;
struct af9015_state *priv = adap->dev->priv;
if (mutex_lock_interruptible(&adap->dev->usb_mutex))
return -EAGAIN;
ret = priv->set_frontend[adap->id](fe, params);
mutex_unlock(&adap->dev->usb_mutex);
return ret;
}
/* override demod callbacks for resource locking */
static int af9015_af9013_read_status(struct dvb_frontend *fe,
fe_status_t *status)
{
int ret;
struct dvb_usb_adapter *adap = fe->dvb->priv;
struct af9015_state *priv = adap->dev->priv;
if (mutex_lock_interruptible(&adap->dev->usb_mutex))
return -EAGAIN;
ret = priv->read_status[adap->id](fe, status);
mutex_unlock(&adap->dev->usb_mutex);
return ret;
}
/* override demod callbacks for resource locking */
static int af9015_af9013_init(struct dvb_frontend *fe)
{
int ret;
struct dvb_usb_adapter *adap = fe->dvb->priv;
struct af9015_state *priv = adap->dev->priv;
if (mutex_lock_interruptible(&adap->dev->usb_mutex))
return -EAGAIN;
ret = priv->init[adap->id](fe);
mutex_unlock(&adap->dev->usb_mutex);
return ret;
}
/* override demod callbacks for resource locking */
static int af9015_af9013_sleep(struct dvb_frontend *fe)
{
int ret;
struct dvb_usb_adapter *adap = fe->dvb->priv;
struct af9015_state *priv = adap->dev->priv;
if (mutex_lock_interruptible(&adap->dev->usb_mutex))
return -EAGAIN;
ret = priv->init[adap->id](fe);
mutex_unlock(&adap->dev->usb_mutex);
return ret;
}
static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
{
int ret;
struct af9015_state *state = adap->dev->priv;
if (adap->id == 1) {
/* copy firmware to 2nd demodulator */
@ -1187,32 +1116,6 @@ static int af9015_af9013_frontend_attach(struct dvb_usb_adapter *adap)
adap->fe_adap[0].fe = dvb_attach(af9013_attach, &af9015_af9013_config[adap->id],
&adap->dev->i2c_adap);
/*
* AF9015 firmware does not like if it gets interrupted by I2C adapter
* request on some critical phases. During normal operation I2C adapter
* is used only 2nd demodulator and tuner on dual tuner devices.
* Override demodulator callbacks and use mutex for limit access to
* those "critical" paths to keep AF9015 happy.
* Note: we abuse unused usb_mutex here.
*/
if (adap->fe_adap[0].fe) {
state->set_frontend[adap->id] =
adap->fe_adap[0].fe->ops.set_frontend;
adap->fe_adap[0].fe->ops.set_frontend =
af9015_af9013_set_frontend;
state->read_status[adap->id] =
adap->fe_adap[0].fe->ops.read_status;
adap->fe_adap[0].fe->ops.read_status =
af9015_af9013_read_status;
state->init[adap->id] = adap->fe_adap[0].fe->ops.init;
adap->fe_adap[0].fe->ops.init = af9015_af9013_init;
state->sleep[adap->id] = adap->fe_adap[0].fe->ops.sleep;
adap->fe_adap[0].fe->ops.sleep = af9015_af9013_sleep;
}
return adap->fe_adap[0].fe == NULL ? -ENODEV : 0;
}

7
drivers/media/dvb/dvb-usb/af9015.h
View File

@ -102,13 +102,6 @@ struct af9015_state {
u8 rc_repeat;
u32 rc_keycode;
u8 rc_last[4];
/* for demod callback override */
int (*set_frontend[2]) (struct dvb_frontend *fe,
struct dvb_frontend_parameters *params);
int (*read_status[2]) (struct dvb_frontend *fe, fe_status_t *status);
int (*init[2]) (struct dvb_frontend *fe);
int (*sleep[2]) (struct dvb_frontend *fe);
};
struct af9015_config {