| Message ID | 1440708972-17112-18-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2015-08-27 17:56 GMT-03:00 <ville.syrjala@linux.intel.com>: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Pass the correct hpd[] array to intel_get_hpd_pins() on pre-g4x > platforms. > > This got broken in the following commit: > commit fd63e2a972c670887e5e8a08440111d3812c0996 > Author: Imre Deak <imre.deak@intel.com> > Date: Tue Jul 21 15:32:44 2015 -0700 > > drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins The good & old "copy, paste, then adjust only one of the two variable names" error. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > > Cc: Imre Deak <imre.deak@intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > 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 1a29dfd..9866739 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1644,7 +1644,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); > } > -- > 2.4.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 7281
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 253/253 253/253
SNB 248/248 248/248
IVB 281/281 281/281
BYT -1 234/234 233/234
HSW 317/317 317/317
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
On Sat, 29 Aug 2015, Paulo Zanoni <przanoni@gmail.com> wrote: > 2015-08-27 17:56 GMT-03:00 <ville.syrjala@linux.intel.com>: >> From: Ville Syrjälä <ville.syrjala@linux.intel.com> >> >> Pass the correct hpd[] array to intel_get_hpd_pins() on pre-g4x >> platforms. >> >> This got broken in the following commit: >> commit fd63e2a972c670887e5e8a08440111d3812c0996 >> Author: Imre Deak <imre.deak@intel.com> >> Date: Tue Jul 21 15:32:44 2015 -0700 >> >> drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins > > The good & old "copy, paste, then adjust only one of the two variable > names" error. > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Pushed this one patch to drm-intel-next-fixes, thanks for the patch and review. I took the liberty of adding Reviewed-by also from Egbert and Daniel, as Egbert submitted an identical patch [1] which Daniel reviewed. Patch selection was purely on a first come first applied basis. BR, Jani. [1] http://mid.gmane.org/1441138895-23732-4-git-send-email-eich@suse.de > >> >> Cc: Imre Deak <imre.deak@intel.com> >> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> >> --- >> 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 1a29dfd..9866739 100644 >> --- a/drivers/gpu/drm/i915/i915_irq.c >> +++ b/drivers/gpu/drm/i915/i915_irq.c >> @@ -1644,7 +1644,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); >> } >> -- >> 2.4.6 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Paulo Zanoni > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 1a29dfd..9866739 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1644,7 +1644,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); }