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

Commit a42f704b authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Warn if a pipe is enabled with a bogus port 



If TRANS_DDI_FUNC_CTL has been wrongly programmed with an incorrect
port, we are currently trying to read PORT_CLK_SEL(port) with an
uninitialized value.

Handle that case by returning PORT_CLK_SEL_NONE and warning about it.

v2: Move the warning inside intel_ddi_get_crtc_pll (Paulo Zanoni)

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fec46b5e

drivers/gpu/drm/i915/intel_ddi.c

+11 −5
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static uint32_t intel_ddi_get_crtc_pll(struct drm_i915_private *dev_priv, 
				       enum pipe pipe)

{

	uint32_t temp, ret;

	enum port port;

	enum port port = I915_MAX_PORTS;

	enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv,

								      pipe);

	int i;
@@ -1176,10 +1176,16 @@ static uint32_t intel_ddi_get_crtc_pll(struct drm_i915_private *dev_priv, 
				port = i;

	}



	if (port == I915_MAX_PORTS) {

		WARN(1, "Pipe %c enabled on an unknown port\n",

		     pipe_name(pipe));

		ret = PORT_CLK_SEL_NONE;

	} else {

		ret = I915_READ(PORT_CLK_SEL(port));



	DRM_DEBUG_KMS("Pipe %c connected to port %c using clock 0x%08x\n",

		      pipe_name(pipe), port_name(port), ret);

		DRM_DEBUG_KMS("Pipe %c connected to port %c using clock "

			      "0x%08x\n", pipe_name(pipe), port_name(port),

			      ret);

	}



	return ret;

}