[PATCH] drm/i915/display: Enable Display Audio WA
Uma Shankar
uma.shankar at intel.com
Thu Apr 2 11:19:22 UTC 2020
Enable Display Audio WA #1406928334 for 4k+VDSC usecase.
Signed-off-by: Uma Shankar <uma.shankar at intel.com>
---
drivers/gpu/drm/i915/display/intel_audio.c | 103 +++++++++++++++++++++
drivers/gpu/drm/i915/i915_reg.h | 16 ++++
2 files changed, 119 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 19bf206037c2..55563ce0fa72 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -504,6 +504,105 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder,
mutex_unlock(&dev_priv->av_mutex);
}
+static void enable_audio_dsc_wa(struct intel_encoder *encoder,
+ const struct intel_crtc_state *crtc_state)
+{
+ struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+ struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+ enum pipe pipe = crtc->pipe;
+ u32 link_clks_available, link_clks_required, link_clk;
+ u32 tu_data, tu_line, link_clks_active;
+ u32 hblank_rise, hblank_early_prog, samples_room;
+ u32 h_active, h_total, hblank_delta, pixel_clk, v_total, lanes;
+ u32 vdsc_bpp, fec_coeff, refresh_rate, cdclk;
+ u32 val;
+ u32 rounding_factor = 100000;
+
+ val = intel_de_read(dev_priv, AUD_CONFIG_BE);
+
+ if (INTEL_GEN(dev_priv) == 11)
+ val |= HBLANK_EARLY_ENABLE_ICL(pipe);
+ else if (INTEL_GEN(dev_priv) >= 12)
+ val |= HBLANK_EARLY_ENABLE_TGL(pipe);
+
+ if (crtc_state->dsc.compression_enable &&
+ (crtc_state->hw.adjusted_mode.hdisplay >= 3840 &&
+ crtc_state->hw.adjusted_mode.vdisplay >= 2160)) {
+ h_active = crtc_state->hw.adjusted_mode.hdisplay;
+ h_total = crtc_state->hw.adjusted_mode.htotal;
+ v_total = crtc_state->hw.adjusted_mode.vtotal;
+ hblank_rise = crtc_state->hw.adjusted_mode.hsync_start;
+ pixel_clk = crtc_state->hw.adjusted_mode.clock;
+ link_clk = crtc_state->port_clock;
+ lanes = crtc_state->lane_count;
+ vdsc_bpp = crtc_state->pipe_bpp;
+ refresh_rate = crtc_state->hw.adjusted_mode.vrefresh;
+ cdclk = dev_priv->cdclk.hw.cdclk;
+ /* Actual value of fec= 0.972261, rounded up to 1 */
+ fec_coeff = 1;
+
+ link_clks_available = rounddown(((((h_total - h_active) *
+ ((link_clk * rounding_factor) /
+ pixel_clk)) /
+ rounding_factor) - 28), 1);
+
+ link_clks_required = roundup((192000 /
+ (refresh_rate * v_total)), 1) *
+ ((48 / lanes) + 2);
+
+ if (link_clks_available > link_clks_required)
+ hblank_delta = 32;
+ else
+ hblank_delta = roundup((((((5 * rounding_factor) /
+ link_clk) + ((5 *
+ rounding_factor) / cdclk)) *
+ pixel_clk) / rounding_factor),
+ 1);
+
+ tu_data = (pixel_clk * vdsc_bpp * 8) / (link_clk *
+ lanes * fec_coeff);
+ tu_line = ((h_active * link_clk * fec_coeff) /
+ (64 * pixel_clk));
+ link_clks_active = (tu_line - 1) * 64 + tu_data;
+ hblank_rise = ((link_clks_active + 6 *
+ roundup((link_clks_active / 250), 1) + 4) *
+ ((pixel_clk * rounding_factor) /
+ link_clk)) / rounding_factor;
+
+ hblank_early_prog = roundup(((h_active - hblank_rise +
+ hblank_delta)), 1);
+
+ if (hblank_early_prog < 32) {
+ val &= ~HBLANK_START_COUNT_MASK(pipe);
+ val |= HBLANK_START_COUNT(HBLANK_START_COUNT_32, pipe);
+ } else if (hblank_early_prog < 64) {
+ val &= ~HBLANK_START_COUNT_MASK(pipe);
+ val |= HBLANK_START_COUNT(HBLANK_START_COUNT_64, pipe);
+ } else if (hblank_early_prog < 96) {
+ val &= ~HBLANK_START_COUNT_MASK(pipe);
+ val |= HBLANK_START_COUNT(HBLANK_START_COUNT_96, pipe);
+ } else {
+ val &= ~HBLANK_START_COUNT_MASK(pipe);
+ val |= HBLANK_START_COUNT(HBLANK_START_COUNT_128, pipe);
+ }
+
+ samples_room = rounddown((((((h_total - h_active) *
+ ((link_clk * rounding_factor) /
+ pixel_clk)) / rounding_factor) - 12) /
+ ((48 / lanes) + 2)), 1);
+
+ if (samples_room < 3) {
+ val &= ~NUMBER_SAMPLES_PER_LINE_MASK(pipe);
+ val |= NUMBER_SAMPLES_PER_LINE(samples_room, pipe);
+ } else {
+ val &= ~NUMBER_SAMPLES_PER_LINE_MASK(pipe);
+ val |= NUMBER_SAMPLES_PER_LINE(0x0, pipe);
+ }
+ }
+
+ intel_de_write(dev_priv, AUD_CONFIG_BE, val);
+}
+
static void hsw_audio_codec_enable(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
@@ -521,6 +620,10 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,
mutex_lock(&dev_priv->av_mutex);
+ /* Enable Audio WA for 4k DSC usecases */
+ if (encoder->type == INTEL_OUTPUT_DP)
+ enable_audio_dsc_wa(encoder, crtc_state);
+
/* Enable audio presence detect, invalidate ELD */
tmp = intel_de_read(dev_priv, HSW_AUD_PIN_ELD_CP_VLD);
tmp |= AUDIO_OUTPUT_ENABLE(cpu_transcoder);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 80cf02a6eec1..0f8e0bb7aae9 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -9298,6 +9298,22 @@ enum {
#define AUD_PIN_BUF_CTL _MMIO(0x48414)
#define AUD_PIN_BUF_ENABLE REG_BIT(31)
+/* Display Audio Config Reg */
+#define AUD_CONFIG_BE _MMIO(0x65ef0)
+#define HBLANK_EARLY_ENABLE_ICL(pipe) (0x1 << (20 - (pipe)))
+#define HBLANK_EARLY_ENABLE_TGL(pipe) (0x1 << (24 + (pipe)))
+#define HBLANK_START_COUNT_MASK(pipe) (0x7 << (3 + ((pipe) * 6)))
+#define HBLANK_START_COUNT(val, pipe) (((val) & 0x7) << (3 + ((pipe)) * 6))
+#define NUMBER_SAMPLES_PER_LINE_MASK(pipe) (0x3 << ((pipe) * 6))
+#define NUMBER_SAMPLES_PER_LINE(val, pipe) (((val) & 0x3) << ((pipe) * 6))
+
+#define HBLANK_START_COUNT_8 0x0
+#define HBLANK_START_COUNT_16 0x1
+#define HBLANK_START_COUNT_32 0x2
+#define HBLANK_START_COUNT_64 0x3
+#define HBLANK_START_COUNT_96 0x4
+#define HBLANK_START_COUNT_128 0x5
+
/*
* HSW - ICL power wells
*
--
2.22.0
More information about the Intel-gfx-trybot
mailing list