diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-02-10 13:11:46 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-02-11 13:09:51 +0100 |
| commit | a8b3d52f8bc24b1c1bf7711bcf3e21fe0aaa752c (patch) | |
| tree | a6eff6c43b4df0ce320f66259266b516f4a92091 /drivers/gpu | |
| parent | drm/i915: Correct the base value while updating LP_OUTPUT_HOLD in MIPI_PORT_CTRL (diff) | |
| download | linux-a8b3d52f8bc24b1c1bf7711bcf3e21fe0aaa752c.tar.xz linux-a8b3d52f8bc24b1c1bf7711bcf3e21fe0aaa752c.zip | |
drm/i915: Really ignore long HPD pulses on eDP
Return IRQ_HANDLED from intel_dp_hpd_pulse() to properly
ignore the long HPD pulse on eDP to avoid the never ending
VDD off->HPD->VDD on->VDD off->HPD... cycle.
This fixes a regression intoduced by
commit b2c5c181ed18490648a02f8c7d562a3b9e8b96de
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri Jan 23 06:00:31 2015 +0100
drm/i915: Use symbolic irqreturn for ->hpd_pulse
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index d4c82d776fba..a74aaf9242b9 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4431,7 +4431,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) */ DRM_DEBUG_KMS("ignoring long hpd on eDP port %c\n", port_name(intel_dig_port->port)); - return false; + return IRQ_HANDLED; } DRM_DEBUG_KMS("got hpd irq on port %c - %s\n", |