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

Commit b76cf76b authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: rearrange vlv hdmi enable and pre_enable callbacks 



VLV wants encoder enabling before the pipe is up. This is currently
achieved through calling the ->enable callback early, right after the
->pre_enable callback, in valleyview_crtc_enable(). This loses both the
distinction between ->pre_enable and ->enable on VLV and the possibility
to use a hook at the end of the modeset sequence.

Rearrange the HDMI callbacks to make it possible to move ->enable call
later. Basically do everything in ->pre_enable on VLV, and make ->enable
a NOP.

There should be no functional changes.

v2: Rebase.

v3: Explain why this is needed in the commit message (Chris).

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ab1f90f9

drivers/gpu/drm/i915/intel_hdmi.c

+11 −9
Original line number Diff line number Diff line
@@ -718,14 +718,10 @@ static void intel_enable_hdmi(struct intel_encoder *encoder) 
		I915_WRITE(intel_hdmi->hdmi_reg, temp);

		POSTING_READ(intel_hdmi->hdmi_reg);

	}



	if (IS_VALLEYVIEW(dev)) {

		struct intel_digital_port *dport =

			enc_to_dig_port(&encoder->base);

		int channel = vlv_dport_to_channel(dport);



		vlv_wait_port_ready(dev_priv, channel);

}



static void vlv_enable_hdmi(struct intel_encoder *encoder)

{

}



static void intel_disable_hdmi(struct intel_encoder *encoder)
@@ -1051,6 +1047,10 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder) 
	vlv_dpio_write(dev_priv, DPIO_PCS_CLOCKBUF8(port),

			 0x00400888);

	mutex_unlock(&dev_priv->dpio_lock);



	intel_enable_hdmi(encoder);



	vlv_wait_port_ready(dev_priv, port);

}



static void intel_hdmi_pre_pll_enable(struct intel_encoder *encoder)
@@ -1231,14 +1231,16 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port) 


	intel_encoder->compute_config = intel_hdmi_compute_config;

	intel_encoder->mode_set = intel_hdmi_mode_set;

	intel_encoder->enable = intel_enable_hdmi;

	intel_encoder->disable = intel_disable_hdmi;

	intel_encoder->get_hw_state = intel_hdmi_get_hw_state;

	intel_encoder->get_config = intel_hdmi_get_config;

	if (IS_VALLEYVIEW(dev)) {

		intel_encoder->pre_enable = intel_hdmi_pre_enable;

		intel_encoder->pre_pll_enable = intel_hdmi_pre_pll_enable;

		intel_encoder->pre_enable = intel_hdmi_pre_enable;

		intel_encoder->enable = vlv_enable_hdmi;

		intel_encoder->post_disable = intel_hdmi_post_disable;

	} else {

		intel_encoder->enable = intel_enable_hdmi;

	}



	intel_encoder->type = INTEL_OUTPUT_HDMI;