drm/i915: Fix broken transcoder err state (d54c1a51) · Commits · 戴 / test

Skip the transcoder whose pipe is disabled while initializing transcoder error state in 3 non-contiguous display pipe system. v2: - Don't skip EDP_TRANSCODER error state. [Ville] - Use a helper has_transcoder(). [Ville] v3: - Removed DSI transcoder case from has_transcoder(), and few other cosmetic changes. [Ville] Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by:

Anshuman Gupta <anshuman.gupta@intel.com> Signed-off-by:

Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200224124004.26712-4-anshuman.gupta@intel.com

drivers/gpu/drm/i915/display/intel_display.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -249,6 +249,15 @@ intel_fdi_link_freq(struct drm_i915_private *dev_priv,
		return dev_priv->fdi_pll_freq;
		}

		static bool
		has_transcoder(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder)
		{
		if (cpu_transcoder == TRANSCODER_EDP)
		return HAS_TRANSCODER_EDP(dev_priv);
		else
		return INTEL_INFO(dev_priv)->pipe_mask & BIT(cpu_transcoder);
		}

		static const struct intel_limit intel_limits_i8xx_dac = {
		.dot = { .min = 25000, .max = 350000 },
		.vco = { .min = 908000, .max = 1512000 },
		@@ -18930,7 +18939,7 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv)
		for (i = 0; i < ARRAY_SIZE(error->transcoder); i++) {
		enum transcoder cpu_transcoder = transcoders[i];

		if (!INTEL_INFO(dev_priv)->trans_offsets[cpu_transcoder])
		if (!has_transcoder(dev_priv, cpu_transcoder))
		continue;

		error->transcoder[i].available = true;

Admin message