On Tue, 10 Feb 2015, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > 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@xxxxxxxx> > Date: Fri Jan 23 06:00:31 2015 +0100 > > drm/i915: Use symbolic irqreturn for ->hpd_pulse > > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Pushed to drm-intel-next-fixes, thanks for the patch and review. BR, Jani. > --- > Jani, I decided against the goto out solution because it would have looked like > ret = IRQ_HANDLED; > goto out; > which seemed a bit silly. > > drivers/gpu/drm/i915/intel_dp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 33b1b82..cc711ac 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4499,7 +4499,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", > -- > 2.0.5 > -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx