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

Commit dd75f6dd authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/lspcon: Add dp_to_lspcon helper() 



We need to get to LSPCON in the next patch, so factor out the helper for
it. While at it also remove the redundant GEN9 check.

Cc: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479755707-29596-3-git-send-email-imre.deak@intel.com
parent f2b667b6

drivers/gpu/drm/i915/intel_dp.c

+3 −4
Original line number Diff line number Diff line
@@ -4753,14 +4753,13 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp) 
void intel_dp_encoder_reset(struct drm_encoder *encoder)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->dev);

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	struct intel_lspcon *lspcon = &intel_dig_port->lspcon;

	struct intel_dp *intel_dp = &intel_dig_port->dp;

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp);



	if (!HAS_DDI(dev_priv))

		intel_dp->DP = I915_READ(intel_dp->output_reg);



	if (IS_GEN9(dev_priv) && lspcon->active)

	if (lspcon->active)

		lspcon_resume(lspcon);



	if (to_intel_encoder(encoder)->type != INTEL_OUTPUT_EDP)

drivers/gpu/drm/i915/intel_drv.h

+6 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,12 @@ dp_to_dig_port(struct intel_dp *intel_dp) 
	return container_of(intel_dp, struct intel_digital_port, dp);

}



static inline struct intel_lspcon *

dp_to_lspcon(struct intel_dp *intel_dp)

{

	return &dp_to_dig_port(intel_dp)->lspcon;

}



static inline struct intel_digital_port *

hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)

{