Attachment 115434 Details for Bug 90059 – drm/i915/hdmi: fix vlv infoframe port check

[patch] drm/i915/hdmi: fix vlv infoframe port check

0001-drm-i915-hdmi-fix-vlv-infoframe-port-check.patch (text/plain), 1.46 KB, created by Jani Nikula on 2015-04-29 11:28:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jani Nikula

Created: 2015-04-29 11:28:35 UTC

Size: 1.46 KB

patch

obsolete

>From 56c3826b6c11e0be3268a319edb29368fc444893 Mon Sep 17 00:00:00 2001
>From: Jani Nikula <jani.nikula@intel.com>
>Date: Wed, 29 Apr 2015 14:19:32 +0300
>Subject: [PATCH] drm/i915/hdmi: fix vlv infoframe port check
>Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
>Cc: Jani Nikula <jani.nikula@intel.com>
>
>Due to missing shifting, the vlv infoframe port check only works for
>port A. Fix it. Broken since introduction in
>
>commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
>Author: Jesse Barnes <jbarnes@virtuousgeek.org>
>Date:   Wed Apr 15 16:52:29 2015 -0700
>
>    drm/i915/vlv: check port in infoframe_enabled v2
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90059
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>---
> drivers/gpu/drm/i915/intel_hdmi.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>index e63f0b9260e9..7774ca2b9bdf 100644
>--- a/drivers/gpu/drm/i915/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c
>@@ -327,9 +327,8 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder)
> 	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> 	int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);
> 	u32 val = I915_READ(reg);
>-	u32 port = intel_dig_port->port;
> 
>-	if (port == (val & VIDEO_DIP_PORT_MASK))
>+	if (VIDEO_DIP_PORT(intel_dig_port->port) == (val & VIDEO_DIP_PORT_MASK))
> 		return val & VIDEO_DIP_ENABLE;
> 
> 	return false;
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 90059: 115139 | 115434

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.