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

Commit 0f572ebe authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

drm/i915: Move VLV HDMI lane reset work around logic to intel_dpio_phy.c 



This moves the last phy specific code from the encoders to the phy
specific file.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarJim Bride <jim.bride@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461761065-21195-11-git-send-email-ander.conselvan.de.oliveira@intel.com
parent 5f68c275

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -3605,6 +3605,7 @@ void vlv_set_phy_signal_level(struct intel_encoder *encoder, 
			      u32 uniqtranscale_reg_value, u32 tx3_demph);

void vlv_phy_pre_pll_enable(struct intel_encoder *encoder);

void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder);

void vlv_phy_reset_lanes(struct intel_encoder *encoder);



int intel_gpu_freq(struct drm_i915_private *dev_priv, int val);

int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);

drivers/gpu/drm/i915/intel_dpio_phy.c

+15 −0
Original line number Diff line number Diff line
@@ -453,3 +453,18 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder) 


	mutex_unlock(&dev_priv->sb_lock);

}



void vlv_phy_reset_lanes(struct intel_encoder *encoder)

{

	struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;

	struct intel_crtc *intel_crtc =

		to_intel_crtc(encoder->base.crtc);

	enum dpio_channel port = vlv_dport_to_channel(dport);

	int pipe = intel_crtc->pipe;



	mutex_lock(&dev_priv->sb_lock);

	vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port), 0x00000000);

	vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port), 0x00e00060);

	mutex_unlock(&dev_priv->sb_lock);

}

drivers/gpu/drm/i915/intel_hdmi.c

+1 −11
Original line number Diff line number Diff line
@@ -1631,18 +1631,8 @@ static void chv_hdmi_post_pll_disable(struct intel_encoder *encoder) 


static void vlv_hdmi_post_disable(struct intel_encoder *encoder)

{

	struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;

	struct intel_crtc *intel_crtc =

		to_intel_crtc(encoder->base.crtc);

	enum dpio_channel port = vlv_dport_to_channel(dport);

	int pipe = intel_crtc->pipe;



	/* Reset lanes to avoid HDMI flicker (VLV w/a) */

	mutex_lock(&dev_priv->sb_lock);

	vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW0(port), 0x00000000);

	vlv_dpio_write(dev_priv, pipe, VLV_PCS_DW1(port), 0x00e00060);

	mutex_unlock(&dev_priv->sb_lock);

	vlv_phy_reset_lanes(encoder);

}



static void chv_hdmi_post_disable(struct intel_encoder *encoder)