drm: bridge: adv7511: Add set_jack handler
Subsystems (3)
PATCH 1/1 drm: bridge: adv7511: Add set_jack handler
With commit 55c5cc63ab, the hdmi_codec_set_jack() will report unsupport failure if set_jack handler is missing. Add set_jack handler to resolve this failure.
--- .../gpu/drm/bridge/adv7511/adv7511_audio.c | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +20 -7
@@ -217,22 +217,35 @@ static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component,return -EINVAL ; } +static int adv7511_hdmi_i2s_hook_plugged_cb (struct device *dev,void *data, +hdmi_codec_plugged_cb fn, +struct device *codec_dev) +{ +struct adv7511 *adv7511 = data; +bool plugged = adv7511->connector.status == connector_status_connected; + +fn (codec_dev, plugged); +return 0 ; +} +static const struct hdmi_codec_ops adv7511_codec_ops = { .hw_params = adv7511_hdmi_hw_params, .audio_shutdown = audio_shutdown, .audio_startup = audio_startup, .get_dai_id = adv7511_hdmi_i2s_get_dai_id, -}; - -static const struct hdmi_codec_pdata codec_data = { - .ops = &adv7511_codec_ops, - .max_i2s_channels =2 , - .i2s =1 , - .spdif =1 , + .hook_plugged_cb = adv7511_hdmi_i2s_hook_plugged_cb, };int adv7511_audio_init (struct device *dev,struct adv7511 *adv7511) { +struct hdmi_codec_pdata codec_data = { + .ops = &adv7511_codec_ops, + .max_i2s_channels =2 , + .i2s =1 , + .spdif =1 , + .data = adv7511, + }; + adv7511->audio_pdev = platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
Signature · 1 line
2.25.1
Quoted 10 lines · Jun Nie <[email protected]> 于2021年1月19日周二 下午12:42写道:
With commit
55c5cc63ab, thehdmi_codec_set_jack()will report unsupport failure ifset_jackhandler is missing. Addset_jackhandler to resolve this failure.Signed-off-by Jun Nie <[email protected]>--- .../gpu/drm/bridge/adv7511/adv7511_audio.c | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-)
Does anyone have comments on this patch?
Thanks!
Jun
W dniu 19.01.2021 o 05:41, Jun Nie pisze:
Quoted 14 lines
With commit
55c5cc63ab, thehdmi_codec_set_jack()will report unsupport failure ifset_jackhandler is missing. Addset_jackhandler to resolve this failure.Signed-off-by Jun Nie <[email protected]>--- .../gpu/drm/bridge/adv7511/adv7511_audio.c | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-)drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +0
-0
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component, · line 225
Quoted 9 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +6
-0@@ -217,22 +217,35 @@ static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component,return -EINVAL ; } +static int adv7511_hdmi_i2s_hook_plugged_cb (struct device *dev,void *data, +hdmi_codec_plugged_cb fn, +struct device *codec_dev) +{ +struct adv7511 *adv7511 = data; +bool plugged = adv7511->connector.status == connector_status_connected;
Maybe some locking, to protect access to adv7511->connector.status.
Quoted 13 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +5
-3+ +fn (codec_dev, plugged); +return 0 ; +} +static const struct hdmi_codec_ops adv7511_codec_ops = { .hw_params = adv7511_hdmi_hw_params, .audio_shutdown = audio_shutdown, .audio_startup = audio_startup, .get_dai_id = adv7511_hdmi_i2s_get_dai_id, -}; - -static const struct hdmi_codec_pdata codec_data = {
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component, · line 241
Quoted 10 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +2
-4- .ops = &adv7511_codec_ops, - .max_i2s_channels = 2, - .i2s = 1, - .spdif = 1, + .hook_plugged_cb = adv7511_hdmi_i2s_hook_plugged_cb, };int adv7511_audio_init (struct device *dev,struct adv7511 *adv7511) { +struct hdmi_codec_pdata codec_data = {
I think const modifier should be OK here.
Regards
Andrzej
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component, · line 251
Quoted 10 lines
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c +7
-0+ .ops = &adv7511_codec_ops, + .max_i2s_channels = 2, + .i2s = 1, + .spdif = 1, + .data = adv7511, + }; + adv7511->audio_pdev = platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel