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

Commit 55ae26b7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2014-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

two more fixes, both regressions.

* tag 'drm-intel-fixes-2014-03-19' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Disable stolen memory when DMAR is active
  Revert "drm/i915: don't touch the VDD when disabling the panel"
parents 27410e82 0f4706d2

drivers/gpu/drm/i915/i915_gem_stolen.c

+7 −0
Original line number Diff line number Diff line
@@ -214,6 +214,13 @@ int i915_gem_init_stolen(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	int bios_reserved = 0;



#ifdef CONFIG_INTEL_IOMMU

	if (intel_iommu_gfx_mapped) {

		DRM_INFO("DMAR active, disabling use of stolen memory\n");

		return 0;

	}

#endif



	if (dev_priv->gtt.stolen_size == 0)

		return 0;

drivers/gpu/drm/i915/intel_ddi.c

+1 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder) 
	if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);

		ironlake_edp_panel_vdd_on(intel_dp);

		ironlake_edp_panel_off(intel_dp);

	}

drivers/gpu/drm/i915/intel_dp.c

+9 −1
Original line number Diff line number Diff line
@@ -1249,17 +1249,24 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp) 


	DRM_DEBUG_KMS("Turn eDP power off\n");



	WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");



	pp = ironlake_get_pp_control(intel_dp);

	/* We need to switch off panel power _and_ force vdd, for otherwise some

	 * panels get very unhappy and cease to work. */

	pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_BLC_ENABLE);

	pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET | EDP_BLC_ENABLE);



	pp_ctrl_reg = _pp_ctrl_reg(intel_dp);



	I915_WRITE(pp_ctrl_reg, pp);

	POSTING_READ(pp_ctrl_reg);



	intel_dp->want_panel_vdd = false;



	ironlake_wait_panel_off(intel_dp);



	/* We got a reference when we enabled the VDD. */

	intel_runtime_pm_put(dev_priv);

}



void ironlake_edp_backlight_on(struct intel_dp *intel_dp)
@@ -1784,6 +1791,7 @@ static void intel_disable_dp(struct intel_encoder *encoder) 


	/* Make sure the panel is off before trying to change the mode. But also

	 * ensure that we have vdd while we switch off the panel. */

	ironlake_edp_panel_vdd_on(intel_dp);

	ironlake_edp_backlight_off(intel_dp);

	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);

	ironlake_edp_panel_off(intel_dp);