Attachment 106729 Details for Bug 83175 – drm/i915: fix short vs. long hpd detection

[patch] drm/i915: fix short vs. long hpd detection

0001-drm-i915-fix-short-vs.-long-hpd-detection.patch (text/plain), 2.24 KB, created by Jani Nikula on 2014-09-23 11:36:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jani Nikula

Created: 2014-09-23 11:36:14 UTC

Size: 2.24 KB

patch

obsolete

>From f832fdc3547f43373eee3efeaf2f0f9c720f1bc8 Mon Sep 17 00:00:00 2001
>From: Jani Nikula <jani.nikula@intel.com>
>Date: Tue, 23 Sep 2014 14:30:25 +0300
>Subject: [PATCH] drm/i915: fix short vs. long hpd detection
>Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
>Cc: Jani Nikula <jani.nikula@intel.com>
>
>Fix short vs. long hpd detection for non-g4x and non-pch split
>platforms.
>
>Broken since introduction in
>commit 13cf550448b58abf8f44f5d6a560f2d20871c965
>Author: Dave Airlie <airlied@redhat.com>
>Date:   Wed Jun 18 11:29:35 2014 +1000
>
>    drm/i915: rework digital port IRQ handling (v2)
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83175
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>---
> drivers/gpu/drm/i915/i915_irq.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index a08cdc62f841..6c6fdb97d800 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1708,7 +1708,7 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev,
> #define HPD_STORM_DETECT_PERIOD 1000
> #define HPD_STORM_THRESHOLD 5
> 
>-static int ilk_port_to_hotplug_shift(enum port port)
>+static int pch_port_to_hotplug_shift(enum port port)
> {
> 	switch (port) {
> 	case PORT_A:
>@@ -1724,7 +1724,7 @@ static int ilk_port_to_hotplug_shift(enum port port)
> 	}
> }
> 
>-static int g4x_port_to_hotplug_shift(enum port port)
>+static int i915_port_to_hotplug_shift(enum port port)
> {
> 	switch (port) {
> 	case PORT_A:
>@@ -1782,12 +1782,12 @@ static inline void intel_hpd_irq_handler(struct drm_device *dev,
> 		if (port && dev_priv->hpd_irq_port[port]) {
> 			bool long_hpd;
> 
>-			if (IS_G4X(dev)) {
>-				dig_shift = g4x_port_to_hotplug_shift(port);
>-				long_hpd = (hotplug_trigger >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
>-			} else {
>-				dig_shift = ilk_port_to_hotplug_shift(port);
>+			if (HAS_PCH_SPLIT(dev)) {
>+				dig_shift = pch_port_to_hotplug_shift(port);
> 				long_hpd = (dig_hotplug_reg >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
>+			} else {
>+				dig_shift = i915_port_to_hotplug_shift(port);
>+				long_hpd = (hotplug_trigger >> dig_shift) & PORTB_HOTPLUG_LONG_DETECT;
> 			}
> 
> 			DRM_DEBUG_DRIVER("digital hpd port %c - %s\n",
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 83175: 106642 | 106643 | 106644 | 106645 | 106646 | 106647 | 106648 | 106650 | 106651 | 106652 | 106729 | 107653

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.