[PATCH v4 1/9] drm/connector: hdmi: accept NULL for Audio Infoframe

[Dmitry Baryshkov]

Allow passing NULL as audio infoframe as a way to disable Audio
Infoframe generation.

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/display/drm_hdmi_state_helper.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c 
b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
index ce96837eea65..5356723d21f5 100644
--- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c
@@ -681,7 +681,7 @@ 
EXPORT_SYMBOL(drm_atomic_helper_connector_hdmi_update_infoframes);
 /**
  * drm_atomic_helper_connector_hdmi_update_audio_infoframe - Update the Audio 
Infoframe
  * @connector: A pointer to the HDMI connector
- * @frame: A pointer to the audio infoframe to write
+ * @frame: A pointer to the audio infoframe to write or NULL to disable 
sending the frame
  *
  * This function is meant for HDMI connector drivers to update their
  * audio infoframe. It will typically be used in one of the ALSA hooks
@@ -704,10 +704,16 @@ 
drm_atomic_helper_connector_hdmi_update_audio_infoframe(struct drm_connector *co
 
        mutex_lock(&connector->hdmi.infoframes.lock);
 
-       memcpy(&infoframe->data, frame, sizeof(infoframe->data));
-       infoframe->set = true;
+       if (frame) {
+               memcpy(&infoframe->data, frame, sizeof(infoframe->data));
+               infoframe->set = true;
+
+               ret = write_infoframe(connector, infoframe);
+       } else {
+               infoframe->set = false;
 
-       ret = write_infoframe(connector, infoframe);
+               ret = clear_infoframe(connector, infoframe);
+       }
 
        mutex_unlock(&connector->hdmi.infoframes.lock);
 

-- 
2.39.2