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

Commit 6b72d486 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: add intel_display_suspend, v2 



This is a function used to disable all crtc's. This makes it clearer
to distinguish between when mode needs to be preserved and when
it can be trashed.

Changes since v1:
- Copy power changes from intel_crtc_control.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 69024de8

drivers/gpu/drm/i915/i915_drv.c

+1 −3
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ static int bxt_resume_prepare(struct drm_i915_private *dev_priv); 
static int i915_drm_suspend(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc;

	pci_power_t opregion_target_state;

	int error;
@@ -632,8 +631,7 @@ static int i915_drm_suspend(struct drm_device *dev) 
	 * for _thaw. Also, power gate the CRTC power wells.

	 */

	drm_modeset_lock_all(dev);

	for_each_crtc(dev, crtc)

		intel_crtc_control(crtc, false);

	intel_display_suspend(dev);

	drm_modeset_unlock_all(dev);



	intel_dp_mst_suspend(dev);

drivers/gpu/drm/i915/intel_display.c

+28 −10
Original line number Diff line number Diff line
@@ -3190,9 +3190,6 @@ void intel_crtc_reset(struct intel_crtc *crtc) 


void intel_prepare_reset(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crtc *crtc;



	/* no reset support for gen2 */

	if (IS_GEN2(dev))

		return;
@@ -3207,13 +3204,7 @@ void intel_prepare_reset(struct drm_device *dev) 
	 * Disabling the crtcs gracefully seems nicer. Also the

	 * g33 docs say we should at least disable all the planes.

	 */

	for_each_intel_crtc(dev, crtc) {

		if (!crtc->active)

			continue;



		intel_crtc_disable_planes(&crtc->base);

		dev_priv->display.crtc_disable(&crtc->base);

	}

	intel_display_suspend(dev);

}



void intel_finish_reset(struct drm_device *dev)
@@ -6278,6 +6269,33 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc) 
	mutex_unlock(&dev->struct_mutex);

}



/*

 * turn all crtc's off, but do not adjust state

 * This has to be paired with a call to intel_modeset_setup_hw_state.

 */

void intel_display_suspend(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_crtc *crtc;



	for_each_crtc(dev, crtc) {

		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

		enum intel_display_power_domain domain;

		unsigned long domains;



		if (!intel_crtc->active)

			continue;



		intel_crtc_disable_planes(crtc);

		dev_priv->display.crtc_disable(crtc);



		domains = intel_crtc->enabled_power_domains;

		for_each_power_domain(domain, domains)

			intel_display_power_put(dev_priv, domain);

		intel_crtc->enabled_power_domains = 0;

	}

}



/* Master function to enable/disable CRTC and corresponding power wells */

void intel_crtc_control(struct drm_crtc *crtc, bool enable)

{

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ int intel_pch_rawclk(struct drm_device *dev); 
void intel_mark_busy(struct drm_device *dev);

void intel_mark_idle(struct drm_device *dev);

void intel_crtc_restore_mode(struct drm_crtc *crtc);

void intel_display_suspend(struct drm_device *dev);

void intel_crtc_control(struct drm_crtc *crtc, bool enable);

void intel_crtc_reset(struct intel_crtc *crtc);

void intel_crtc_update_dpms(struct drm_crtc *crtc);