| Message ID | 1354366429-2324-3-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 1 Dec 2012 13:53:41 +0100 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > This is for legacy legacy stuff, and checking with the leftover > pipe from the previous loop is propably not what we want. Since > pipe == 2 after the loop ... > > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/i915_irq.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index ff78818..2028137 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -533,7 +533,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) > unsigned long irqflags; > int pipe; > u32 pipe_stats[I915_MAX_PIPES]; > - bool blc_event; > > atomic_inc(&dev_priv->irq_received); > > @@ -590,9 +589,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) > I915_READ(PORT_HOTPLUG_STAT); > } > > - if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS) > - blc_event = true; > - > if (pm_iir & GEN6_PM_DEFERRED_EVENTS) > gen6_queue_rps_work(dev_priv, pm_iir); > I think this is ok; I don't think hotkeys will be handled this way on VLV platforms. And if it is, the check will need to be in the per pipe loop anyway! Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
On Sat, 2012-12-01 at 13:53 +0100, Daniel Vetter wrote: > This is for legacy legacy stuff, and checking with the leftover > pipe from the previous loop is propably not what we want. Since > pipe == 2 after the loop ... This doesn't seem to match the change, blc_event is simply never used here. > > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/i915_irq.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index ff78818..2028137 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -533,7 +533,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) > unsigned long irqflags; > int pipe; > u32 pipe_stats[I915_MAX_PIPES]; > - bool blc_event; > > atomic_inc(&dev_priv->irq_received); > > @@ -590,9 +589,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) > I915_READ(PORT_HOTPLUG_STAT); > } > > - if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS) > - blc_event = true; > - > if (pm_iir & GEN6_PM_DEFERRED_EVENTS) > gen6_queue_rps_work(dev_priv, pm_iir); >
On Tue, Dec 4, 2012 at 3:37 PM, Imre Deak <imre.deak@intel.com> wrote: > On Sat, 2012-12-01 at 13:53 +0100, Daniel Vetter wrote: >> This is for legacy legacy stuff, and checking with the leftover >> pipe from the previous loop is propably not what we want. Since >> pipe == 2 after the loop ... > > This doesn't seem to match the change, blc_event is simply never used > here. Oops, indeed. Somehow I've thought there's the function call right there. Will adjust the commit message a bit when applying. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ff78818..2028137 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -533,7 +533,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) unsigned long irqflags; int pipe; u32 pipe_stats[I915_MAX_PIPES]; - bool blc_event; atomic_inc(&dev_priv->irq_received); @@ -590,9 +589,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) I915_READ(PORT_HOTPLUG_STAT); } - if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS) - blc_event = true; - if (pm_iir & GEN6_PM_DEFERRED_EVENTS) gen6_queue_rps_work(dev_priv, pm_iir);
This is for legacy legacy stuff, and checking with the leftover pipe from the previous loop is propably not what we want. Since pipe == 2 after the loop ... Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/i915_irq.c | 4 ---- 1 file changed, 4 deletions(-)