On ke, 2015-09-02 at 14:00 +0200, Daniel Vetter wrote: > On Tue, Sep 01, 2015 at 10:21:34PM +0200, Egbert Eich wrote: > > This copy-and-past error was introduced in: > > > > commit fd63e2a972c670887e5e8a08440111d3812c0996 > > Author: Imre Deak <imre.deak@xxxxxxxxx> > > Date: Tue Jul 21 15:32:44 2015 -0700 > > > > drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins > > > > Signed-off-by: Egbert Eich <eich@xxxxxxx> > > I recommend to cc: the authors/reviewers of the patch which broke things > so they have a better chance to spot your patch and make amends by quickly > reviewing your fix. Anyway Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> Thanks for catching this. Ville also noticed it and has sent already a fix for it: http://lists.freedesktop.org/archives/intel-gfx/2015-August/074676.html --Imre > > Jani, this all seems to be for you. > -Daniel > > --- > > drivers/gpu/drm/i915/i915_irq.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > > index 8485bea..ad99dae 100644 > > --- a/drivers/gpu/drm/i915/i915_irq.c > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > @@ -1559,7 +1559,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev) > > u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915; > > > > intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, > > - hotplug_trigger, hpd_status_g4x, > > + hotplug_trigger, hpd_status_i915, > > i9xx_port_hotplug_long_detect); > > intel_hpd_irq_handler(dev, pin_mask, long_mask); > > } > > -- > > 1.8.4.5 > > > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
