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

Commit 71485e0a authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915/chv: Fix PORT_TO_PIPE for CHV 



Fix the encoder .get_config hooks to report the correct active pipe for
CHV.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAntti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 07fddb14

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -5132,6 +5132,8 @@ enum punit_power_well { 
#define  PORT_TRANS_SEL_CPT(pipe)	((pipe) << 29)

#define  PORT_TO_PIPE(val)	(((val) & (1<<30)) >> 30)

#define  PORT_TO_PIPE_CPT(val)	(((val) & PORT_TRANS_SEL_MASK) >> 29)

#define  SDVO_PORT_TO_PIPE_CHV(val)	(((val) & (3<<24)) >> 24)

#define  DP_PORT_TO_PIPE_CHV(val)	(((val) & (3<<16)) >> 16)



#define TRANS_DP_CTL_A		0xe0300

#define TRANS_DP_CTL_B		0xe1300

drivers/gpu/drm/i915/intel_dp.c

+2 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,8 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder, 


	if (port == PORT_A && IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) {

		*pipe = PORT_TO_PIPE_CPT(tmp);

	} else if (IS_CHERRYVIEW(dev)) {

		*pipe = DP_PORT_TO_PIPE_CHV(tmp);

	} else if (!HAS_PCH_CPT(dev) || port == PORT_A) {

		*pipe = PORT_TO_PIPE(tmp);

	} else {

drivers/gpu/drm/i915/intel_hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -697,6 +697,8 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, 


	if (HAS_PCH_CPT(dev))

		*pipe = PORT_TO_PIPE_CPT(tmp);

	else if (IS_CHERRYVIEW(dev))

		*pipe = SDVO_PORT_TO_PIPE_CHV(tmp);

	else

		*pipe = PORT_TO_PIPE(tmp);