Patch "ASoC: qcom: lpass-cpu: mark HDMI TX registers as volatile" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ASoC: qcom: lpass-cpu: mark HDMI TX registers as volatile

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     asoc-qcom-lpass-cpu-mark-hdmi-tx-registers-as-volati.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7b3c0b14f735aad0d64ca40987cdf86fd98bd282
Author: Srinivasa Rao Mandadapu <quic_srivasam@xxxxxxxxxxx>
Date:   Thu Oct 13 10:38:31 2022 +0530

    ASoC: qcom: lpass-cpu: mark HDMI TX registers as volatile
    
    [ Upstream commit c9a3545b1d771fb7b06a487796c40288c02c41c5 ]
    
    Update HDMI volatile registers list as DMA, Channel Selection registers,
    vbit control registers are being reflected by hardware DP port
    disconnection.
    
    This update is required to fix no display and no sound issue observed
    after reconnecting TAMA/SANWA DP cables.
    Once DP cable is unplugged, DMA control registers are being reset by
    hardware, however at second plugin, new dma control values does not
    updated to the dma hardware registers since new register value and
    cached values at the time of first plugin are same.
    
    Fixes: 7cb37b7bd0d3 ("ASoC: qcom: Add support for lpass hdmi driver")
    
    Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@xxxxxxxxxxx>
    Reported-by: Kuogee Hsieh <quic_khsieh@xxxxxxxxxxx>
    Link: https://lore.kernel.org/r/1665637711-13300-1-git-send-email-quic_srivasam@xxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
index 8a56f38dc7e8..99a3b4428591 100644
--- a/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -782,10 +782,18 @@ static bool lpass_hdmi_regmap_volatile(struct device *dev, unsigned int reg)
 		return true;
 	if (reg == LPASS_HDMI_TX_LEGACY_ADDR(v))
 		return true;
+	if (reg == LPASS_HDMI_TX_VBIT_CTL_ADDR(v))
+		return true;
 
 	for (i = 0; i < v->hdmi_rdma_channels; ++i) {
 		if (reg == LPAIF_HDMI_RDMACURR_REG(v, i))
 			return true;
+		if (reg == LPASS_HDMI_TX_DMA_ADDR(v, i))
+			return true;
+		if (reg == LPASS_HDMI_TX_CH_LSB_ADDR(v, i))
+			return true;
+		if (reg == LPASS_HDMI_TX_CH_MSB_ADDR(v, i))
+			return true;
 	}
 	return false;
 }