Merge tag 'drm-intel-fixes-2020-09-10' of... (7bf23bfb) · Commits · 戴 / test

Merge tag 'drm-intel-fixes-2020-09-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes drm/i915 fixes for v5.9-rc5: - Fix regression leading to audio probe failure Signed-off-by:

Dave Airlie <airlied@redhat.com> From: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/875z8m2hss.fsf@intel.com

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

+4 −6

Original line number	Diff line number	Diff line
		@@ -14956,12 +14956,6 @@ static int intel_atomic_check(struct drm_device *dev,
		if (dev_priv->wm.distrust_bios_wm)
		any_ms = true;

		if (any_ms) {
		ret = intel_modeset_checks(state);
		if (ret)
		goto fail;
		}

		intel_fbc_choose_crtc(dev_priv, state);
		ret = calc_watermark_data(state);
		if (ret)
		@@ -14976,6 +14970,10 @@ static int intel_atomic_check(struct drm_device *dev,
		goto fail;

		if (any_ms) {
		ret = intel_modeset_checks(state);
		if (ret)
		goto fail;

		ret = intel_modeset_calc_cdclk(state);
		if (ret)
		return ret;

Admin message