| Message ID | 1364395631-27934-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 27, 2013 at 03:47:11PM +0100, Daniel Vetter wrote: > Noticed while reviewing the hotplug irq setup code. Just looks better. > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> What about the activation period? Do we want to leave it alone on non g4x platforms, or should it also get cleared? > --- > drivers/gpu/drm/i915/i915_irq.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index c697580..be2d6dd 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -2776,6 +2776,7 @@ static void i915_hpd_irq_setup(struct drm_device *dev) > */ > if (IS_G4X(dev)) > hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64; > + hotplug_en &= ~CRT_HOTPLUG_VOLTAGE_COMPARE_MASK; > hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50; > > /* Ignore TV since it's buggy */ > -- > 1.7.11.7 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, Mar 27, 2013 at 05:02:43PM +0200, Ville Syrjälä wrote: > On Wed, Mar 27, 2013 at 03:47:11PM +0100, Daniel Vetter wrote: > > Noticed while reviewing the hotplug irq setup code. Just looks better. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Queued for -next, thanks for the review. > What about the activation period? Do we want to leave it alone on non > g4x platforms, or should it also get cleared? The activation period is just one bit, so setting it will dtrt. And there are other values to tune the crt hotplug detection, so I've figured I'll leave things as-is otherwise. The lack of proper masking just annoyed my OCD a bit ;-) -Daniel
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index c697580..be2d6dd 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2776,6 +2776,7 @@ static void i915_hpd_irq_setup(struct drm_device *dev) */ if (IS_G4X(dev)) hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64; + hotplug_en &= ~CRT_HOTPLUG_VOLTAGE_COMPARE_MASK; hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50; /* Ignore TV since it's buggy */
Noticed while reviewing the hotplug irq setup code. Just looks better. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/i915_irq.c | 1 + 1 file changed, 1 insertion(+)