Add enable and disable callbacks to dw_hdmi_audio interface so that
dw_hdmi_audio can enable and disable the dw_hdmi audio.
Signed-off-by: Yakir Yang <ykk@xxxxxxxxxxxxxx>
---
Changes in v4:
- Rename "hdmi_audio_*" to "dw_hdmi_audio_*"
Changes in v3:
- Delete hdmi_audio_config interface and modify audio clock control functions
Changes in v2:
- Add audio config interfaces to dw_hdmi driver
drivers/gpu/drm/bridge/dw_hdmi.c | 62 ++++++++++++++++++++++++++++++++++++----
1 file changed, 56 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 16b8098..54185e2 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -16,6 +16,7 @@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/hdmi.h>
+#include <linux/mutex.h>
#include <linux/of_device.h>
#include <drm/drm_of.h>
@@ -147,6 +148,11 @@ struct dw_hdmi {
void __iomem *regs;
unsigned int sample_rate;
+
+ /* this audio mutex works for audio clock control */
+ struct mutex audio_mutex;
+ bool audio_enable;
+
int ratio;
void (*write)(struct dw_hdmi *hdmi, u8 val, int offset);
@@ -1245,6 +1251,53 @@ static void dw_hdmi_phy_disable(struct dw_hdmi *hdmi)
hdmi->phy_enabled = false;
}
+static void dw_dw_hdmi_audio_clk_enable(struct dw_hdmi *hdmi)
+{
+ hdmi_modb(hdmi, 0, HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS);
+}
+
+static void dw_dw_hdmi_audio_clk_disable(struct dw_hdmi *hdmi)
+{
+ hdmi_modb(hdmi, HDMI_MC_CLKDIS_AUDCLK_DISABLE,
+ HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS);
+}
+
+static void dw_hdmi_audio_restore(struct dw_hdmi *hdmi)
+{
+ mutex_lock(&hdmi->audio_mutex);
+
+ if (hdmi->audio_enable)
+ dw_dw_hdmi_audio_clk_enable(hdmi);
+ else
+ dw_dw_hdmi_audio_clk_disable(hdmi);
+
+ mutex_unlock(&hdmi->audio_mutex);
+}
+
+static void dw_hdmi_audio_enable(struct dw_hdmi *hdmi)
+{
+ mutex_lock(&hdmi->audio_mutex);
+
+ if (!hdmi->audio_enable) {
+ hdmi->audio_enable = true;
+ dw_dw_hdmi_audio_clk_enable(hdmi);
+ }
+
+ mutex_unlock(&hdmi->audio_mutex);
+}
+
+static void dw_hdmi_audio_disable(struct dw_hdmi *hdmi)
+{
+ mutex_lock(&hdmi->audio_mutex);
+
+ if (hdmi->audio_enable) {
+ hdmi->audio_enable = false;
+ dw_dw_hdmi_audio_clk_disable(hdmi);
+ }
+
+ mutex_unlock(&hdmi->audio_mutex);
+}
+
/* HDMI Initialization Step B.4 */
static void dw_hdmi_enable_video_path(struct dw_hdmi *hdmi)
{
@@ -1275,11 +1328,6 @@ static void dw_hdmi_enable_video_path(struct dw_hdmi *hdmi)
}
}
-static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi)
-{
- hdmi_modb(hdmi, 0, HDMI_MC_CLKDIS_AUDCLK_DISABLE, HDMI_MC_CLKDIS);
-}
-
/* Workaround to clear the overflow condition */
static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)
{
@@ -1375,7 +1423,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
/* HDMI Initialization Step E - Configure audio */
hdmi_clk_regenerator_update_pixel_clock(hdmi);
- hdmi_enable_audio_clk(hdmi);
+ dw_hdmi_audio_restore(hdmi);
/* HDMI Initialization Step F - Configure AVI InfoFrame */
hdmi_config_AVI(hdmi);
@@ -1770,6 +1818,8 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
hdmi->sample_rate = 48000;
hdmi->ratio = 100;
hdmi->encoder = encoder;
+ hdmi->audio_enable = false;
+ mutex_init(&hdmi->audio_mutex);
of_property_read_u32(np, "reg-io-width", &val);
--
2.1.2
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
