Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e9748cb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2017-12-20' of... 

Merge tag 'drm-intel-fixes-2017-12-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

drm/i915 fixes for v4.15-rc5

* tag 'drm-intel-fixes-2017-12-20' of git://anongit.freedesktop.org/drm/drm-intel:
  drm/i915: Protect DDI port to DPLL map from theoretical race.
  drm/i915/lpe: Remove double-encapsulation of info string
parents 2480ee71 a4ffdc2b

drivers/gpu/drm/i915/intel_ddi.c

+4 −0
Original line number Diff line number Diff line
@@ -2128,6 +2128,8 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder, 
	if (WARN_ON(!pll))

		return;



	 mutex_lock(&dev_priv->dpll_lock);



	if (IS_CANNONLAKE(dev_priv)) {

		/* Configure DPCLKA_CFGCR0 to map the DPLL to the DDI. */

		val = I915_READ(DPCLKA_CFGCR0);
@@ -2157,6 +2159,8 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder, 
	} else if (INTEL_INFO(dev_priv)->gen < 9) {

		I915_WRITE(PORT_CLK_SEL(port), hsw_pll_to_ddi_pll_sel(pll));

	}



	mutex_unlock(&dev_priv->dpll_lock);

}



static void intel_ddi_clk_disable(struct intel_encoder *encoder)

drivers/gpu/drm/i915/intel_lpe_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static bool lpe_audio_detect(struct drm_i915_private *dev_priv) 
		};



		if (!pci_dev_present(atom_hdaudio_ids)) {

			DRM_INFO("%s\n", "HDaudio controller not detected, using LPE audio instead\n");

			DRM_INFO("HDaudio controller not detected, using LPE audio instead\n");

			lpe_present = true;

		}

	}