Hi,
On Tue, Jan 28, 2020 at 04:06:42PM +0200, Stefan Mavrodiev wrote:
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c index 68d4644ac2dc..4cd35c97c503 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -23,6 +23,8 @@ #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
+#include <sound/soc.h>
#include "sun4i_backend.h" #include "sun4i_crtc.h" #include "sun4i_drv.h" @@ -87,6 +89,10 @@ static void sun4i_hdmi_disable(struct drm_encoder *encoder)
DRM_DEBUG_DRIVER("Disabling the HDMI Output\n");
+#ifdef CONFIG_DRM_SUN4I_HDMI_AUDIO
- sun4i_hdmi_audio_destroy(hdmi);
+#endif
- val = readl(hdmi->base + SUN4I_HDMI_VID_CTRL_REG); val &= ~SUN4I_HDMI_VID_CTRL_ENABLE; writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG);
@@ -114,6 +120,11 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder) val |= SUN4I_HDMI_VID_CTRL_HDMI_MODE;
writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG);
+#ifdef CONFIG_DRM_SUN4I_HDMI_AUDIO
- if (hdmi->hdmi_audio && sun4i_hdmi_audio_create(hdmi))
DRM_ERROR("Couldn't create the HDMI audio adapter\n");+#endif
I really don't think we should be creating / removing the audio card at enable / disable time.
To fix the drvdata pointer, you just need to use the card pointer in the unbind, and that's it.
Maxime