Commit 85c63628 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Abhinav Kumar
Browse files

drm/msm/dp: unregister audio driver during unbind 



while binding the code always registers a audio driver, however there
is no corresponding unregistration done in unbind. This leads to multiple
redundant audio platform devices if dp_display_bind and dp_display_unbind
happens multiple times during startup. On X13s platform this resulted in
6 to 9 audio codec device instead of just 3 codec devices for 3 dp ports.

Fix this by unregistering codecs on unbind.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Fixes: d13e36d7 ("drm/msm/dp: add audio support for Display Port on MSM")
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/533324/
Link: https://lore.kernel.org/r/20230421145657.12186-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
parent 16eb51ab

drivers/gpu/drm/msm/dp/dp_audio.c

+12 −0
Original line number Diff line number Diff line
@@ -593,6 +593,18 @@ static struct hdmi_codec_pdata codec_data = { 
	.i2s = 1,

};



void dp_unregister_audio_driver(struct device *dev, struct dp_audio *dp_audio)

{

	struct dp_audio_private *audio_priv;



	audio_priv = container_of(dp_audio, struct dp_audio_private, dp_audio);



	if (audio_priv->audio_pdev) {

		platform_device_unregister(audio_priv->audio_pdev);

		audio_priv->audio_pdev = NULL;

	}

}



int dp_register_audio_driver(struct device *dev,

		struct dp_audio *dp_audio)

{

drivers/gpu/drm/msm/dp/dp_audio.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ struct dp_audio *dp_audio_get(struct platform_device *pdev, 
int dp_register_audio_driver(struct device *dev,

		struct dp_audio *dp_audio);



void dp_unregister_audio_driver(struct device *dev, struct dp_audio *dp_audio);



/**

 * dp_audio_put()

 *

drivers/gpu/drm/msm/dp/dp_display.c

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ static void dp_display_unbind(struct device *dev, struct device *master, 
	kthread_stop(dp->ev_tsk);



	dp_power_client_deinit(dp->power);

	dp_unregister_audio_driver(dev, dp->audio);

	dp_aux_unregister(dp->aux);

	dp->drm_dev = NULL;

	dp->aux->drm_dev = NULL;