openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cec: add cec_adapter to cec_notifier_cec_adap_unregister() 

It is possible for one HDMI connector to have multiple CEC adapters. The
typical real-world scenario is that where one adapter is used when the
device is in standby, and one that's better/smarter when the device is
powered up.

The cec-notifier changes were made with that in mind, but I missed that in
order to support this you need to tell cec_notifier_cec_adap_unregister()
which adapter you are unregistering from the notifier.

Add this additional argument. It is currently unused, but once all drivers
use this, the CEC core will be adapted for these use-cases.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/e9fc8740-6be6-43a7-beee-ce2d7b54936e@xs4all.nl
This commit is contained in:
Hans Verkuil 2019-10-04 13:04:24 +02:00
parent 8393135091
commit 10d8f308ba
11 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
View File

@ -285,7 +285,7 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev)
ret = cec_register_adapter(cec->adap, pdev->dev.parent); ret = cec_register_adapter(cec->adap, pdev->dev.parent);
if (ret < 0) { if (ret < 0) {
cec_notifier_cec_adap_unregister(cec->notify); cec_notifier_cec_adap_unregister(cec->notify, cec->adap);
return ret; return ret;
} }
@ -302,7 +302,7 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev)
{ {
struct dw_hdmi_cec *cec = platform_get_drvdata(pdev); struct dw_hdmi_cec *cec = platform_get_drvdata(pdev);
cec_notifier_cec_adap_unregister(cec->notify); cec_notifier_cec_adap_unregister(cec->notify, cec->adap);
cec_unregister_adapter(cec->adap); cec_unregister_adapter(cec->adap);
return 0; return 0;

4
drivers/gpu/drm/i2c/tda9950.c
View File

@ -465,7 +465,7 @@ static int tda9950_probe(struct i2c_client *client,
ret = cec_register_adapter(priv->adap, priv->hdmi); ret = cec_register_adapter(priv->adap, priv->hdmi);
if (ret < 0) { if (ret < 0) {
cec_notifier_cec_adap_unregister(priv->notify); cec_notifier_cec_adap_unregister(priv->notify, priv->adap);
return ret; return ret;
} }
@ -482,7 +482,7 @@ static int tda9950_remove(struct i2c_client *client)
{ {
struct tda9950_priv *priv = i2c_get_clientdata(client); struct tda9950_priv *priv = i2c_get_clientdata(client);
cec_notifier_cec_adap_unregister(priv->notify); cec_notifier_cec_adap_unregister(priv->notify, priv->adap);
cec_unregister_adapter(priv->adap); cec_unregister_adapter(priv->adap);
return 0; return 0;

5
drivers/media/cec/cec-notifier.c
View File

@ -153,13 +153,14 @@ cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name,
} }
EXPORT_SYMBOL_GPL(cec_notifier_cec_adap_register); EXPORT_SYMBOL_GPL(cec_notifier_cec_adap_register);
void cec_notifier_cec_adap_unregister(struct cec_notifier *n) void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
struct cec_adapter *adap)
{ {
if (!n) if (!n)
return; return;
mutex_lock(&n->lock); mutex_lock(&n->lock);
n->cec_adap->notifier = NULL; adap->notifier = NULL;
n->cec_adap = NULL; n->cec_adap = NULL;
n->callback = NULL; n->callback = NULL;
mutex_unlock(&n->lock); mutex_unlock(&n->lock);

6
drivers/media/platform/cros-ec-cec/cros-ec-cec.c
View File

@ -314,7 +314,8 @@ static int cros_ec_cec_probe(struct platform_device *pdev)
return 0; return 0;
out_probe_notify: out_probe_notify:
cec_notifier_cec_adap_unregister(cros_ec_cec->notify); cec_notifier_cec_adap_unregister(cros_ec_cec->notify,
cros_ec_cec->adap);
out_probe_adapter: out_probe_adapter:
cec_delete_adapter(cros_ec_cec->adap); cec_delete_adapter(cros_ec_cec->adap);
return ret; return ret;
@ -335,7 +336,8 @@ static int cros_ec_cec_remove(struct platform_device *pdev)
return ret; return ret;
} }
cec_notifier_cec_adap_unregister(cros_ec_cec->notify); cec_notifier_cec_adap_unregister(cros_ec_cec->notify,
cros_ec_cec->adap);
cec_unregister_adapter(cros_ec_cec->adap); cec_unregister_adapter(cros_ec_cec->adap);
return 0; return 0;

4
drivers/media/platform/meson/ao-cec-g12a.c
View File

@ -736,7 +736,7 @@ static int meson_ao_cec_g12a_probe(struct platform_device *pdev)
clk_disable_unprepare(ao_cec->core); clk_disable_unprepare(ao_cec->core);
out_probe_notify: out_probe_notify:
cec_notifier_cec_adap_unregister(ao_cec->notify); cec_notifier_cec_adap_unregister(ao_cec->notify, ao_cec->adap);
out_probe_adapter: out_probe_adapter:
cec_delete_adapter(ao_cec->adap); cec_delete_adapter(ao_cec->adap);
@ -752,7 +752,7 @@ static int meson_ao_cec_g12a_remove(struct platform_device *pdev)
clk_disable_unprepare(ao_cec->core); clk_disable_unprepare(ao_cec->core);
cec_notifier_cec_adap_unregister(ao_cec->notify); cec_notifier_cec_adap_unregister(ao_cec->notify, ao_cec->adap);
cec_unregister_adapter(ao_cec->adap); cec_unregister_adapter(ao_cec->adap);

4
drivers/media/platform/meson/ao-cec.c
View File

@ -688,7 +688,7 @@ static int meson_ao_cec_probe(struct platform_device *pdev)
clk_disable_unprepare(ao_cec->core); clk_disable_unprepare(ao_cec->core);
out_probe_notify: out_probe_notify:
cec_notifier_cec_adap_unregister(ao_cec->notify); cec_notifier_cec_adap_unregister(ao_cec->notify, ao_cec->adap);
out_probe_adapter: out_probe_adapter:
cec_delete_adapter(ao_cec->adap); cec_delete_adapter(ao_cec->adap);
@ -704,7 +704,7 @@ static int meson_ao_cec_remove(struct platform_device *pdev)
clk_disable_unprepare(ao_cec->core); clk_disable_unprepare(ao_cec->core);
cec_notifier_cec_adap_unregister(ao_cec->notify); cec_notifier_cec_adap_unregister(ao_cec->notify, ao_cec->adap);
cec_unregister_adapter(ao_cec->adap); cec_unregister_adapter(ao_cec->adap);
return 0; return 0;

4
drivers/media/platform/s5p-cec/s5p_cec.c
View File

@ -239,7 +239,7 @@ static int s5p_cec_probe(struct platform_device *pdev)
return 0; return 0;
err_notifier: err_notifier:
cec_notifier_cec_adap_unregister(cec->notifier); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
err_delete_adapter: err_delete_adapter:
cec_delete_adapter(cec->adap); cec_delete_adapter(cec->adap);
@ -250,7 +250,7 @@ static int s5p_cec_remove(struct platform_device *pdev)
{ {
struct s5p_cec_dev *cec = platform_get_drvdata(pdev); struct s5p_cec_dev *cec = platform_get_drvdata(pdev);
cec_notifier_cec_adap_unregister(cec->notifier); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap); cec_unregister_adapter(cec->adap);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
return 0; return 0;

4
drivers/media/platform/seco-cec/seco-cec.c
View File

@ -671,7 +671,7 @@ static int secocec_probe(struct platform_device *pdev)
return ret; return ret;
err_notifier: err_notifier:
cec_notifier_cec_adap_unregister(secocec->notifier); cec_notifier_cec_adap_unregister(secocec->notifier, secocec->cec_adap);
err_delete_adapter: err_delete_adapter:
cec_delete_adapter(secocec->cec_adap); cec_delete_adapter(secocec->cec_adap);
err: err:
@ -692,7 +692,7 @@ static int secocec_remove(struct platform_device *pdev)
dev_dbg(&pdev->dev, "IR disabled"); dev_dbg(&pdev->dev, "IR disabled");
} }
cec_notifier_cec_adap_unregister(secocec->notifier); cec_notifier_cec_adap_unregister(secocec->notifier, secocec->cec_adap);
cec_unregister_adapter(secocec->cec_adap); cec_unregister_adapter(secocec->cec_adap);
release_region(BRA_SMB_BASE_ADDR, 7); release_region(BRA_SMB_BASE_ADDR, 7);

4
drivers/media/platform/sti/cec/stih-cec.c
View File

@ -359,7 +359,7 @@ static int stih_cec_probe(struct platform_device *pdev)
return 0; return 0;
err_notifier: err_notifier:
cec_notifier_cec_adap_unregister(cec->notifier); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
err_delete_adapter: err_delete_adapter:
cec_delete_adapter(cec->adap); cec_delete_adapter(cec->adap);
@ -370,7 +370,7 @@ static int stih_cec_remove(struct platform_device *pdev)
{ {
struct stih_cec *cec = platform_get_drvdata(pdev); struct stih_cec *cec = platform_get_drvdata(pdev);
cec_notifier_cec_adap_unregister(cec->notifier); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap); cec_unregister_adapter(cec->adap);
return 0; return 0;

4
drivers/media/platform/tegra-cec/tegra_cec.c
View File

@ -409,7 +409,7 @@ static int tegra_cec_probe(struct platform_device *pdev)
return 0; return 0;
err_notifier: err_notifier:
cec_notifier_cec_adap_unregister(cec->notifier); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
err_adapter: err_adapter:
cec_delete_adapter(cec->adap); cec_delete_adapter(cec->adap);
err_clk: err_clk:
@ -423,7 +423,7 @@ static int tegra_cec_remove(struct platform_device *pdev)
clk_disable_unprepare(cec->clk); clk_disable_unprepare(cec->clk);
cec_notifier_cec_adap_unregister(cec->notifier); cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
cec_unregister_adapter(cec->adap); cec_unregister_adapter(cec->adap);
return 0; return 0;

7
include/media/cec-notifier.h
View File

@ -93,8 +93,10 @@ cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name,
* cec_notifier_cec_adap_unregister - decrease refcount and delete when the * cec_notifier_cec_adap_unregister - decrease refcount and delete when the
* refcount reaches 0. * refcount reaches 0.
* @n: notifier. If NULL, then this function does nothing. * @n: notifier. If NULL, then this function does nothing.
* @adap: the cec adapter that registered this notifier.
*/ */
void cec_notifier_cec_adap_unregister(struct cec_notifier *n); void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
struct cec_adapter *adap);
/** /**
* cec_notifier_set_phys_addr - set a new physical address. * cec_notifier_set_phys_addr - set a new physical address.
@ -160,7 +162,8 @@ cec_notifier_cec_adap_register(struct device *hdmi_dev, const char *conn_name,
return (struct cec_notifier *)0xdeadfeed; return (struct cec_notifier *)0xdeadfeed;
} }
static inline void cec_notifier_cec_adap_unregister(struct cec_notifier *n) static inline void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
struct cec_adapter *adap)
{ {
} }