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

Commit 19d8fe15 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915/dp: implement get_hw_state 



Also add some macros to make the pipe computation a bit easier.

v2: I've mixed up the CPT and !CPT PORT_TO_PIPE macro variants ...

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

drivers/gpu/drm/i915/i915_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -4029,6 +4029,8 @@ 
#define  PORT_TRANS_C_SEL_CPT	(2<<29)

#define  PORT_TRANS_SEL_MASK	(3<<29)

#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 TRANS_DP_CTL_A		0xe0300

#define TRANS_DP_CTL_B		0xe1300

drivers/gpu/drm/i915/intel_dp.c

+50 −0
Original line number Diff line number Diff line
@@ -1250,6 +1250,54 @@ static void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode) 
	}

}



static bool intel_dp_get_hw_state(struct intel_encoder *encoder,

				  enum pipe *pipe)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

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

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 tmp = I915_READ(intel_dp->output_reg);



	if (!(tmp & DP_PORT_EN))

		return false;



	if (is_cpu_edp(intel_dp) && IS_GEN7(dev)) {

		*pipe = PORT_TO_PIPE_CPT(tmp);

	} else if (!HAS_PCH_CPT(dev) || is_cpu_edp(intel_dp)) {

		*pipe = PORT_TO_PIPE(tmp);

	} else {

		u32 trans_sel;

		u32 trans_dp;

		int i;



		switch (intel_dp->output_reg) {

		case PCH_DP_B:

			trans_sel = TRANS_DP_PORT_SEL_B;

			break;

		case PCH_DP_C:

			trans_sel = TRANS_DP_PORT_SEL_C;

			break;

		case PCH_DP_D:

			trans_sel = TRANS_DP_PORT_SEL_D;

			break;

		default:

			return true;

		}



		for_each_pipe(i) {

			trans_dp = I915_READ(TRANS_DP_CTL(i));

			if ((trans_dp & TRANS_DP_PORT_SEL_MASK) == trans_sel) {

				*pipe = i;

				return true;

			}

		}

	}



	DRM_DEBUG_KMS("No pipe for dp port 0x%x found\n", intel_dp->output_reg);



	return true;

}



static void intel_disable_dp(struct intel_encoder *encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
@@ -2486,6 +2534,8 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) 


	intel_encoder->enable = intel_enable_dp;

	intel_encoder->disable = intel_disable_dp;

	intel_encoder->get_hw_state = intel_dp_get_hw_state;

	intel_connector->get_hw_state = intel_connector_get_hw_state;



	/* Set up the DDC bus. */

	switch (port) {