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

Commit 043e9bda authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Convert resume to atomic. 

Instead of all the ad-hoc updating, duplicate the old state first
before reading out the hw state, then restore it.

intel_display_resume is a new function that duplicates the sw state,
then reads out the hw state, and commits the old state.

intel_display_setup_hw_state now only reads out the atomic state.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90396


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5c1e3426

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ static int i915_drm_resume(struct drm_device *dev) 
	spin_unlock_irq(&dev_priv->irq_lock);



	drm_modeset_lock_all(dev);

	intel_modeset_setup_hw_state(dev, true);

	intel_display_resume(dev);

	drm_modeset_unlock_all(dev);



	intel_dp_mst_resume(dev);

drivers/gpu/drm/i915/i915_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -3277,8 +3277,7 @@ extern void intel_modeset_gem_init(struct drm_device *dev); 
extern void intel_modeset_cleanup(struct drm_device *dev);

extern void intel_connector_unregister(struct intel_connector *);

extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);

extern void intel_modeset_setup_hw_state(struct drm_device *dev,

					 bool force_restore);

extern void intel_display_resume(struct drm_device *dev);

extern void i915_redisable_vga(struct drm_device *dev);

extern void i915_redisable_vga_power_on(struct drm_device *dev);

extern bool ironlake_set_drps(struct drm_device *dev, u8 val);

drivers/gpu/drm/i915/intel_display.c

+57 −20
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static void skl_init_scalers(struct drm_device *dev, struct intel_crtc *intel_cr 
	struct intel_crtc_state *crtc_state);

static int i9xx_get_refclk(const struct intel_crtc_state *crtc_state,

			   int num_connectors);

static void intel_modeset_setup_hw_state(struct drm_device *dev);



static struct intel_encoder *intel_find_encoder(struct intel_connector *connector, int pipe)

{
@@ -3251,7 +3252,7 @@ void intel_finish_reset(struct drm_device *dev) 
		dev_priv->display.hpd_irq_setup(dev);

	spin_unlock_irq(&dev_priv->irq_lock);



	intel_modeset_setup_hw_state(dev, true);

	intel_display_resume(dev);



	intel_hpd_init(dev_priv);
@@ -15157,7 +15158,7 @@ void intel_modeset_init(struct drm_device *dev) 
	intel_fbc_disable(dev_priv);



	drm_modeset_lock_all(dev);

	intel_modeset_setup_hw_state(dev, false);

	intel_modeset_setup_hw_state(dev);

	drm_modeset_unlock_all(dev);



	for_each_intel_crtc(dev, crtc) {
@@ -15554,10 +15555,11 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
	}

}



/* Scan out the current hw modeset state, sanitizes it and maps it into the drm

 * and i915 state tracking structures. */

void intel_modeset_setup_hw_state(struct drm_device *dev,

				  bool force_restore)

/* Scan out the current hw modeset state,

 * and sanitizes it to the current state

 */

static void

intel_modeset_setup_hw_state(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe pipe;
@@ -15600,24 +15602,59 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, 
	else if (HAS_PCH_SPLIT(dev))

		ilk_wm_get_hw_state(dev);



	if (force_restore) {

		i915_redisable_vga(dev);

	intel_modeset_update_staged_output_state(dev);

}



		/*

		 * We need to use raw interfaces for restoring state to avoid

		 * checking (bogus) intermediate states.

		 */

		for_each_pipe(dev_priv, pipe) {

			struct drm_crtc *crtc =

				dev_priv->pipe_to_crtc_mapping[pipe];

void intel_display_resume(struct drm_device *dev)

{

	struct drm_atomic_state *state = drm_atomic_state_alloc(dev);

	struct intel_connector *conn;

	struct intel_plane *plane;

	struct drm_crtc *crtc;

	int ret;



	if (!state)

		return;



	state->acquire_ctx = dev->mode_config.acquire_ctx;



	/* preserve complete old state, including dpll */

	intel_atomic_get_shared_dpll_state(state);



	for_each_crtc(dev, crtc) {

		struct drm_crtc_state *crtc_state =

			drm_atomic_get_crtc_state(state, crtc);



		ret = PTR_ERR_OR_ZERO(crtc_state);

		if (ret)

			goto err;



			intel_crtc_restore_mode(crtc);

		/* force a restore */

		crtc_state->mode_changed = true;

	}

	} else {

		intel_modeset_update_staged_output_state(dev);



	for_each_intel_plane(dev, plane) {

		ret = PTR_ERR_OR_ZERO(drm_atomic_get_plane_state(state, &plane->base));

		if (ret)

			goto err;

	}



	intel_modeset_check_state(dev);

	for_each_intel_connector(dev, conn) {

		ret = PTR_ERR_OR_ZERO(drm_atomic_get_connector_state(state, &conn->base));

		if (ret)

			goto err;

	}



	intel_modeset_setup_hw_state(dev);



	i915_redisable_vga(dev);

	ret = intel_set_mode(state);

	if (!ret)

		return;



err:

	DRM_ERROR("Restoring old state failed with %i\n", ret);

	drm_atomic_state_free(state);

}



void intel_modeset_gem_init(struct drm_device *dev)

drivers/gpu/drm/i915/intel_lvds.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, 
	 */

	if (!HAS_PCH_SPLIT(dev)) {

		drm_modeset_lock_all(dev);

		intel_modeset_setup_hw_state(dev, true);

		intel_display_resume(dev);

		drm_modeset_unlock_all(dev);

	}