shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/bridge: synopsys: dw-hdmi-qp: Fix PKTSCHED register access error

Browse Source 
ACR located at Packet Scheduler which belongs to VIDQPCLK domain.
So, the related clk should be enabled before register access.

Actually, There are three CLK domain (AUDCLK, VIDQPCLK, LINKQPCLK)
related to Audio. So, do check clk status before config audio.

Maybe the better way should be spliting hdmi regmap into several parts
which managed by related clk domain in future.

e.g.

  devm_regmap_init_mmio_clk(dev, "aud", regs, AUD_REGBANK);
  devm_regmap_init_mmio_clk(dev, "vidqp", regs, VIDQP_REGBANK);
  devm_regmap_init_mmio_clk(dev, "linkqp", regs, LINKQP_REGBANK);
  ...

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib497d92a73d99d9f38c4617f615f02c705b82ae7
This commit is contained in:
Sugar Zhang
2021-12-02 16:29:38 +08:00
committed by Tao Huang
parent 4799914074
commit ae7682acd6
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp-i2s-audio.c
View File

@@ -42,6 +42,13 @@ static inline void hdmi_mod(struct dw_hdmi_qp_i2s_audio_data *audio,
return audio->mod(hdmi, data, mask, reg);
}
static inline bool is_dw_hdmi_qp_clk_off(struct dw_hdmi_qp_i2s_audio_data *audio)
{
u32 sta = hdmi_read(audio, CMU_STATUS);
return (sta & (AUDCLK_OFF | LINKQPCLK_OFF | VIDQPCLK_OFF));
}
static int dw_hdmi_qp_i2s_hw_params(struct device *dev, void *data,
struct hdmi_codec_daifmt *fmt,
struct hdmi_codec_params *hparms)
@@ -50,6 +57,9 @@ static int dw_hdmi_qp_i2s_hw_params(struct device *dev, void *data,
struct dw_hdmi_qp *hdmi = audio->hdmi;
u32 conf0 = 0;
if (is_dw_hdmi_qp_clk_off(audio))
return 0;
if (fmt->bit_clk_master | fmt->frame_clk_master) {
dev_err(dev, "unsupported clock settings\n");
return -EINVAL;
@@ -131,6 +141,9 @@ static int dw_hdmi_qp_i2s_audio_startup(struct device *dev, void *data)
struct dw_hdmi_qp_i2s_audio_data *audio = data;
struct dw_hdmi_qp *hdmi = audio->hdmi;
if (is_dw_hdmi_qp_clk_off(audio))
return 0;
dw_hdmi_qp_audio_enable(hdmi);
return 0;
@@ -141,6 +154,9 @@ static void dw_hdmi_qp_i2s_audio_shutdown(struct device *dev, void *data)
struct dw_hdmi_qp_i2s_audio_data *audio = data;
struct dw_hdmi_qp *hdmi = audio->hdmi;
if (is_dw_hdmi_qp_clk_off(audio))
return;
dw_hdmi_qp_audio_disable(hdmi);
}

5
drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
View File

@@ -37,6 +37,11 @@
#define CMU_CONFIG2 0xa8
#define CMU_CONFIG3 0xac
#define CMU_STATUS 0xb0
#define EARC_BPCLK_OFF BIT(9)
#define AUDCLK_OFF BIT(7)
#define LINKQPCLK_OFF BIT(5)
#define VIDQPCLK_OFF BIT(3)
#define IPI_CLK_OFF BIT(1)
#define CMU_IPI_CLK_FREQ 0xb4
#define CMU_VIDQPCLK_FREQ 0xb8
#define CMU_LINKQPCLK_FREQ 0xbc