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

Commit 4d688a2a authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Get rid of dpms handling. 



This is now done completely atomically.
Keep connectors_active for now, but make it mirror crtc_state->active.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4d20cd86

drivers/gpu/drm/i915/intel_crt.c

+1 −48
Original line number Diff line number Diff line
@@ -236,53 +236,6 @@ static void intel_enable_crt(struct intel_encoder *encoder) 
	intel_crt_set_dpms(encoder, crt->connector->base.dpms);

}



/* Special dpms function to support cloning between dvo/sdvo/crt. */

static int intel_crt_dpms(struct drm_connector *connector, int mode)

{

	struct drm_device *dev = connector->dev;

	struct intel_encoder *encoder = intel_attached_encoder(connector);

	struct drm_crtc *crtc;

	int old_dpms;



	/* PCH platforms and VLV only support on/off. */

	if (INTEL_INFO(dev)->gen >= 5 && mode != DRM_MODE_DPMS_ON)

		mode = DRM_MODE_DPMS_OFF;



	if (mode == connector->dpms)

		return 0;



	old_dpms = connector->dpms;

	connector->dpms = mode;



	/* Only need to change hw state when actually enabled */

	crtc = encoder->base.crtc;

	if (!crtc) {

		encoder->connectors_active = false;

		return 0;

	}



	/* We need the pipe to run for anything but OFF. */

	if (mode == DRM_MODE_DPMS_OFF)

		encoder->connectors_active = false;

	else

		encoder->connectors_active = true;



	/* We call connector dpms manually below in case pipe dpms doesn't

	 * change due to cloning. */

	if (mode < old_dpms) {

		/* From off to on, enable the pipe first. */

		intel_crtc_update_dpms(crtc);



		intel_crt_set_dpms(encoder, mode);

	} else {

		intel_crt_set_dpms(encoder, mode);



		intel_crtc_update_dpms(crtc);

	}



	return 0;

}



static enum drm_mode_status

intel_crt_mode_valid(struct drm_connector *connector,

		     struct drm_display_mode *mode)
@@ -798,7 +751,7 @@ static void intel_crt_reset(struct drm_connector *connector) 


static const struct drm_connector_funcs intel_crt_connector_funcs = {

	.reset = intel_crt_reset,

	.dpms = intel_crt_dpms,

	.dpms = drm_atomic_helper_connector_dpms,

	.detect = intel_crt_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = intel_crt_destroy,

drivers/gpu/drm/i915/intel_display.c

+2 −97
Original line number Diff line number Diff line
@@ -6273,67 +6273,6 @@ int intel_display_suspend(struct drm_device *dev) 
	return ret;

}



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

int intel_crtc_control(struct drm_crtc *crtc, bool enable)

{

	struct drm_device *dev = crtc->dev;

	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);

	struct intel_crtc_state *pipe_config;

	struct drm_atomic_state *state;

	int ret;



	if (enable == intel_crtc->active)

		return 0;



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

		return 0;



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

	if (WARN_ON(!ctx))

		return -EIO;

	lockdep_assert_held(&ctx->ww_ctx);



	state = drm_atomic_state_alloc(dev);

	if (WARN_ON(!state))

		return -ENOMEM;



	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 = drm_atomic_commit(state);

	if (!ret)

		return ret;



err:

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

	drm_atomic_state_free(state);

	return ret;

}



/**

 * Sets the power management mode of the pipe and plane.

 */

void intel_crtc_update_dpms(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct intel_encoder *intel_encoder;

	bool enable = false;



	for_each_encoder_on_crtc(dev, crtc, intel_encoder)

		enable |= intel_encoder->connectors_active;



	intel_crtc_control(crtc, enable);

}



void intel_encoder_destroy(struct drm_encoder *encoder)

{

	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
@@ -6342,22 +6281,6 @@ void intel_encoder_destroy(struct drm_encoder *encoder) 
	kfree(intel_encoder);

}



/* Simple dpms helper for encoders with just one connector, no cloning and only

 * one kind of off state. It clamps all !ON modes to fully OFF and changes the

 * state of the entire output pipe. */

static void intel_encoder_dpms(struct intel_encoder *encoder, int mode)

{

	if (mode == DRM_MODE_DPMS_ON) {

		encoder->connectors_active = true;



		intel_crtc_update_dpms(encoder->base.crtc);

	} else {

		encoder->connectors_active = false;



		intel_crtc_update_dpms(encoder->base.crtc);

	}

}



/* Cross check the actual hw state with our own modeset state tracking (and it's

 * internal consistency). */

static void intel_connector_check_state(struct intel_connector *connector)
@@ -6390,6 +6313,8 @@ static void intel_connector_check_state(struct intel_connector *connector) 
		I915_STATE_WARN(conn_state->crtc != encoder->crtc,

			"attached encoder crtc differs from connector crtc\n");

	} else {

		I915_STATE_WARN(crtc && crtc->state->active,

			"attached crtc is active, but connector isn't\n");

		I915_STATE_WARN(!crtc && connector->base.state->best_encoder,

			"best encoder set without crtc!\n");

	}
@@ -6423,26 +6348,6 @@ struct intel_connector *intel_connector_alloc(void) 
	return connector;

}



/* Even simpler default implementation, if there's really no special case to

 * consider. */

int intel_connector_dpms(struct drm_connector *connector, int mode)

{

	/* All the simple cases only support two dpms states. */

	if (mode != DRM_MODE_DPMS_ON)

		mode = DRM_MODE_DPMS_OFF;



	if (mode == connector->dpms)

		return 0;



	connector->dpms = mode;



	/* Only need to change hw state when actually enabled */

	if (connector->encoder)

		intel_encoder_dpms(to_intel_encoder(connector->encoder), mode);



	return 0;

}



/* Simple connector->get_hw_state implementation for encoders that support only

 * one connector and no cloning and hence the encoder state determines the state

 * of the connector. */

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -4839,7 +4839,7 @@ static void intel_dp_encoder_reset(struct drm_encoder *encoder) 
}



static const struct drm_connector_funcs intel_dp_connector_funcs = {

	.dpms = intel_connector_dpms,

	.dpms = drm_atomic_helper_connector_dpms,

	.detect = intel_dp_detect,

	.force = intel_dp_force,

	.fill_modes = drm_helper_probe_single_connector_modes,

drivers/gpu/drm/i915/intel_dp_mst.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ intel_dp_mst_connector_destroy(struct drm_connector *connector) 
}



static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {

	.dpms = intel_connector_dpms,

	.dpms = drm_atomic_helper_connector_dpms,

	.detect = intel_dp_mst_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.set_property = intel_dp_mst_set_property,

drivers/gpu/drm/i915/intel_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -992,12 +992,9 @@ 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);

int intel_display_suspend(struct drm_device *dev);

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 *);

struct intel_connector *intel_connector_alloc(void);

int intel_connector_dpms(struct drm_connector *, int mode);

bool intel_connector_get_hw_state(struct intel_connector *connector);

bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,

				struct intel_digital_port *port);