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

Commit 89a35ecd authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915/g4x: fix g4x infoframe readout 



Need to check the port too.

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

drivers/gpu/drm/i915/intel_hdmi.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -170,9 +170,13 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder) 
{

{

	struct drm_device *dev = encoder->dev;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);

	u32 val = I915_READ(VIDEO_DIP_CTL);

	u32 val = I915_READ(VIDEO_DIP_CTL);





	if (VIDEO_DIP_PORT(intel_dig_port->port) == (val & VIDEO_DIP_PORT_MASK))

		return val & VIDEO_DIP_ENABLE;

		return val & VIDEO_DIP_ENABLE;



	return false;

}

}





static void ibx_write_infoframe(struct drm_encoder *encoder,

static void ibx_write_infoframe(struct drm_encoder *encoder,