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

Commit 5da76e94 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: Implement intel_crtc_control using atomic state, v4 



Assume the callers lock everything with drm_modeset_lock_all.

This change had to be done after converting suspend/resume to
use atomic_state so the atomic state is preserved, otherwise
all transitional state is erased.

Now all callers of .crtc_enable and .crtc_disable go through
atomic modeset! :-D

Changes since v1:
- Only check for crtc_state->active in valleyview_modeset_global_pipes.
- Only check for crtc_state->active in modeset_update_crtc_power_domains.
Changes since v2:
- Rework on top of the changed patch order.
Changes since v3:
- Rename intel_crtc_toggle in description to *_control
- Change return value to int.
- Do not add plane state, should be done implicitly already.

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 37ade417

drivers/gpu/drm/i915/intel_display.c

+32 −21
Original line number Diff line number Diff line
@@ -6238,38 +6238,49 @@ void intel_display_suspend(struct drm_device *dev) 
}



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

void intel_crtc_control(struct drm_crtc *crtc, bool enable)

int intel_crtc_control(struct drm_crtc *crtc, bool enable)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_mode_config *config = &dev->mode_config;

	struct drm_modeset_acquire_ctx *ctx = config->acquire_ctx;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	enum intel_display_power_domain domain;

	unsigned long domains;

	struct intel_crtc_state *pipe_config;

	struct drm_atomic_state *state;

	int ret;



	if (enable == intel_crtc->active)

		return;

		return 0;



	if (enable && !crtc->state->enable)

		return;

		return 0;



	crtc->state->active = enable;

	if (enable) {

		domains = get_crtc_power_domains(crtc);

		for_each_power_domain(domain, domains)

			intel_display_power_get(dev_priv, domain);

		intel_crtc->enabled_power_domains = domains;

	/* this function should be called with drm_modeset_lock_all for now */

	if (WARN_ON(!ctx))

		return -EIO;

	lockdep_assert_held(&ctx->ww_ctx);



		dev_priv->display.crtc_enable(crtc);

		intel_crtc_enable_planes(crtc);

	} else {

		intel_crtc_disable_planes(crtc);

		dev_priv->display.crtc_disable(crtc);

	state = drm_atomic_state_alloc(dev);

	if (WARN_ON(!state))

		return -ENOMEM;



		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;

	state->acquire_ctx = ctx;

	state->allow_modeset = true;



	pipe_config = intel_atomic_get_crtc_state(state, intel_crtc);

	if (IS_ERR(pipe_config)) {

		ret = PTR_ERR(pipe_config);

		goto err;

	}

	pipe_config->base.active = enable;



	ret = intel_set_mode(state);

	if (!ret)

		return ret;



err:

	DRM_ERROR("Updating crtc active failed with %i\n", ret);

	drm_atomic_state_free(state);

	return ret;

}



/**

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ 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);

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

void intel_crtc_update_dpms(struct drm_crtc *crtc);

void intel_encoder_destroy(struct drm_encoder *encoder);

int intel_connector_init(struct intel_connector *);