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

Commit 3e6e6395 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: mask the video DIP port select 



Should prevent bugs when changing the port.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1d4f85ac

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1700,6 +1700,7 @@ 
#define   VIDEO_DIP_ENABLE		(1 << 31)

#define   VIDEO_DIP_ENABLE		(1 << 31)

#define   VIDEO_DIP_PORT_B		(1 << 29)

#define   VIDEO_DIP_PORT_B		(1 << 29)

#define   VIDEO_DIP_PORT_C		(2 << 29)

#define   VIDEO_DIP_PORT_C		(2 << 29)

#define   VIDEO_DIP_PORT_MASK		(3 << 29)

#define   VIDEO_DIP_ENABLE_AVI		(1 << 21)

#define   VIDEO_DIP_ENABLE_AVI		(1 << 21)

#define   VIDEO_DIP_ENABLE_VENDOR	(2 << 21)

#define   VIDEO_DIP_ENABLE_VENDOR	(2 << 21)

#define   VIDEO_DIP_ENABLE_SPD		(8 << 21)

#define   VIDEO_DIP_ENABLE_SPD		(8 << 21)

drivers/gpu/drm/i915/intel_hdmi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -125,6 +125,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder, 








	/* XXX first guess at handling video port, is this corrent? */

	/* XXX first guess at handling video port, is this corrent? */

	val &= ~VIDEO_DIP_PORT_MASK;

	if (intel_hdmi->sdvox_reg == SDVOB)

	if (intel_hdmi->sdvox_reg == SDVOB)

		val |= VIDEO_DIP_PORT_B;

		val |= VIDEO_DIP_PORT_B;

	else if (intel_hdmi->sdvox_reg == SDVOC)

	else if (intel_hdmi->sdvox_reg == SDVOC)