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

Commit ba2cb64b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm intel fixes from Dave Airlie:
 "Two intel stable fixes, that should be it from me for this round"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: Unlock panel even when LVDS is disabled
  drm/i915: More cautious with pch fifo underruns
parents 56c67ce1 3e3282c0

drivers/gpu/drm/i915/intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -4325,7 +4325,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) 
		ironlake_fdi_disable(crtc);



		ironlake_disable_pch_transcoder(dev_priv, pipe);

		intel_set_pch_fifo_underrun_reporting(dev, pipe, true);



		if (HAS_PCH_CPT(dev)) {

			/* disable TRANS_DP_CTL */
@@ -4389,7 +4388,6 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) 


	if (intel_crtc->config.has_pch_encoder) {

		lpt_disable_pch_transcoder(dev_priv);

		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, true);

		intel_ddi_fdi_disable(crtc);

	}

drivers/gpu/drm/i915/intel_lvds.c

+11 −11
Original line number Diff line number Diff line
@@ -899,6 +899,17 @@ void intel_lvds_init(struct drm_device *dev) 
	int pipe;

	u8 pin;



	/*

	 * Unlock registers and just leave them unlocked. Do this before

	 * checking quirk lists to avoid bogus WARNINGs.

	 */

	if (HAS_PCH_SPLIT(dev)) {

		I915_WRITE(PCH_PP_CONTROL,

			   I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS);

	} else {

		I915_WRITE(PP_CONTROL,

			   I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS);

	}

	if (!intel_lvds_supported(dev))

		return;
@@ -1097,17 +1108,6 @@ void intel_lvds_init(struct drm_device *dev) 
	lvds_encoder->a3_power = I915_READ(lvds_encoder->reg) &

				 LVDS_A3_POWER_MASK;



	/*

	 * Unlock registers and just

	 * leave them unlocked

	 */

	if (HAS_PCH_SPLIT(dev)) {

		I915_WRITE(PCH_PP_CONTROL,

			   I915_READ(PCH_PP_CONTROL) | PANEL_UNLOCK_REGS);

	} else {

		I915_WRITE(PP_CONTROL,

			   I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS);

	}

	lvds_connector->lid_notifier.notifier_call = intel_lid_notify;

	if (acpi_lid_notifier_register(&lvds_connector->lid_notifier)) {

		DRM_DEBUG_KMS("lid notifier registration failed\n");