From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/8] drm/i915: Remove pch_rq_mask from struct drm_i915_private. Date: Fri, 11 Jan 2013 21:13:18 +0100 Message-ID: <20130111201318.GJ5737@phenom.ffwll.local> References: <1357830166-18049-1-git-send-email-eich@suse.de> <1357830166-18049-2-git-send-email-eich@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 5665A4374A for ; Fri, 11 Jan 2013 12:11:20 -0800 (PST) Received: by mail-wi0-f181.google.com with SMTP id hq4so86567wib.14 for ; Fri, 11 Jan 2013 12:11:19 -0800 (PST) Content-Disposition: inline In-Reply-To: <1357830166-18049-2-git-send-email-eich@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Egbert Eich Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, Chris Wilson , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org 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 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 -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch