| Message ID | 1357830166-18049-2-git-send-email-eich@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 10, 2013 at 10:02:39AM -0500, Egbert Eich wrote: > This variable is only used locally in the irq postinstall > functions for ivybridge and ironlake. > > Signed-off-by: Egbert Eich <eich@suse.de> Applied to dinq with a minor conflict resolved, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/i915_irq.c | 10 ++++++---- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index ed30595..eeaf2a8 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -665,7 +665,6 @@ typedef struct drm_i915_private { > u32 pipestat[2]; > u32 irq_mask; > u32 gt_irq_mask; > - u32 pch_irq_mask; > > u32 hotplug_supported_mask; > struct work_struct hotplug_work; > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 2220dec..bb5e6d8 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1857,6 +1857,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) > DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE; > u32 render_irqs; > u32 hotplug_mask; > + u32 pch_irq_mask; > > dev_priv->irq_mask = ~display_mask; > > @@ -1897,10 +1898,10 @@ static int ironlake_irq_postinstall(struct drm_device *dev) > SDE_AUX_MASK); > } > > - dev_priv->pch_irq_mask = ~hotplug_mask; > + pch_irq_mask = ~hotplug_mask; > > I915_WRITE(SDEIIR, I915_READ(SDEIIR)); > - I915_WRITE(SDEIMR, dev_priv->pch_irq_mask); > + I915_WRITE(SDEIMR, pch_irq_mask); > I915_WRITE(SDEIER, hotplug_mask); > POSTING_READ(SDEIER); > > @@ -1927,6 +1928,7 @@ static int ivybridge_irq_postinstall(struct drm_device *dev) > DE_PLANEA_FLIP_DONE_IVB; > u32 render_irqs; > u32 hotplug_mask; > + u32 pch_irq_mask; > > dev_priv->irq_mask = ~display_mask; > > @@ -1954,10 +1956,10 @@ static int ivybridge_irq_postinstall(struct drm_device *dev) > SDE_PORTB_HOTPLUG_CPT | > SDE_PORTC_HOTPLUG_CPT | > SDE_PORTD_HOTPLUG_CPT); > - dev_priv->pch_irq_mask = ~hotplug_mask; > + pch_irq_mask = ~hotplug_mask; > > I915_WRITE(SDEIIR, I915_READ(SDEIIR)); > - I915_WRITE(SDEIMR, dev_priv->pch_irq_mask); > + I915_WRITE(SDEIMR, pch_irq_mask); > I915_WRITE(SDEIER, hotplug_mask); > POSTING_READ(SDEIER); > > -- > 1.7.7 > > _______________________________________________ > 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_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ed30595..eeaf2a8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -665,7 +665,6 @@ typedef struct drm_i915_private { u32 pipestat[2]; u32 irq_mask; u32 gt_irq_mask; - u32 pch_irq_mask; u32 hotplug_supported_mask; struct work_struct hotplug_work; diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2220dec..bb5e6d8 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1857,6 +1857,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE; u32 render_irqs; u32 hotplug_mask; + u32 pch_irq_mask; dev_priv->irq_mask = ~display_mask; @@ -1897,10 +1898,10 @@ static int ironlake_irq_postinstall(struct drm_device *dev) SDE_AUX_MASK); } - dev_priv->pch_irq_mask = ~hotplug_mask; + pch_irq_mask = ~hotplug_mask; I915_WRITE(SDEIIR, I915_READ(SDEIIR)); - I915_WRITE(SDEIMR, dev_priv->pch_irq_mask); + I915_WRITE(SDEIMR, pch_irq_mask); I915_WRITE(SDEIER, hotplug_mask); POSTING_READ(SDEIER); @@ -1927,6 +1928,7 @@ static int ivybridge_irq_postinstall(struct drm_device *dev) DE_PLANEA_FLIP_DONE_IVB; u32 render_irqs; u32 hotplug_mask; + u32 pch_irq_mask; dev_priv->irq_mask = ~display_mask; @@ -1954,10 +1956,10 @@ static int ivybridge_irq_postinstall(struct drm_device *dev) SDE_PORTB_HOTPLUG_CPT | SDE_PORTC_HOTPLUG_CPT | SDE_PORTD_HOTPLUG_CPT); - dev_priv->pch_irq_mask = ~hotplug_mask; + pch_irq_mask = ~hotplug_mask; I915_WRITE(SDEIIR, I915_READ(SDEIIR)); - I915_WRITE(SDEIMR, dev_priv->pch_irq_mask); + I915_WRITE(SDEIMR, pch_irq_mask); I915_WRITE(SDEIER, hotplug_mask); POSTING_READ(SDEIER);
This variable is only used locally in the irq postinstall functions for ivybridge and ironlake. Signed-off-by: Egbert Eich <eich@suse.de> --- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_irq.c | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-)