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

Commit 4ac41f47 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915/sdvo: implement get_hw_state 



SDVO is the first real special case - we support multiple outputs on
the same encoder and the encoder dpms state isn't the same as when
just disabling the outputs when the encoder is cloned.

Hence we need a real connector get_hw_state function which inquires
the sdvo encoder about its active outputs.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e403fc94

drivers/gpu/drm/i915/intel_sdvo.c

+46 −0
Original line number Diff line number Diff line
@@ -628,6 +628,14 @@ static bool intel_sdvo_set_active_outputs(struct intel_sdvo *intel_sdvo, 
				    &outputs, sizeof(outputs));

}



static bool intel_sdvo_get_active_outputs(struct intel_sdvo *intel_sdvo,

					  u16 *outputs)

{

	return intel_sdvo_get_value(intel_sdvo,

				    SDVO_CMD_GET_ACTIVE_OUTPUTS,

				    outputs, sizeof(*outputs));

}



static bool intel_sdvo_set_encoder_power_state(struct intel_sdvo *intel_sdvo,

					       int mode)

{
@@ -1142,6 +1150,42 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, 
	intel_sdvo_write_sdvox(intel_sdvo, sdvox);

}



static bool intel_sdvo_connector_get_hw_state(struct intel_connector *connector)

{

	struct intel_sdvo_connector *intel_sdvo_connector =

		to_intel_sdvo_connector(&connector->base);

	struct intel_sdvo *intel_sdvo = intel_attached_sdvo(&connector->base);

	u16 active_outputs;



	intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs);



	if (active_outputs & intel_sdvo_connector->output_flag)

		return true;

	else

		return false;

}



static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder,

				    enum pipe *pipe)

{

	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_sdvo *intel_sdvo = to_intel_sdvo(&encoder->base);

	u32 tmp;



	tmp = I915_READ(intel_sdvo->sdvo_reg);



	if (!(tmp & SDVO_ENABLE))

		return false;



	if (HAS_PCH_CPT(dev))

		*pipe = PORT_TO_PIPE_CPT(tmp);

	else

		*pipe = PORT_TO_PIPE(tmp);



	return true;

}



static void intel_disable_sdvo(struct intel_encoder *encoder)

{

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
@@ -2066,6 +2110,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, 
	connector->base.base.interlace_allowed = 1;

	connector->base.base.doublescan_allowed = 0;

	connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;

	connector->base.get_hw_state = intel_sdvo_connector_get_hw_state;



	intel_connector_attach_encoder(&connector->base, &encoder->base);

	drm_sysfs_connector_add(&connector->base.base);
@@ -2619,6 +2664,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 


	intel_encoder->disable = intel_disable_sdvo;

	intel_encoder->enable = intel_enable_sdvo;

	intel_encoder->get_hw_state = intel_sdvo_get_hw_state;



	/* In default case sdvo lvds is false */

	if (!intel_sdvo_get_capabilities(intel_sdvo, &intel_sdvo->caps))