From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: remove duplicate register defines Date: Mon, 4 Aug 2014 10:48:02 +0200 Message-ID: <20140804084802.GT8727@phenom.ffwll.local> References: <1406920794-1958-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C9106E0BD for ; Mon, 4 Aug 2014 01:47:51 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id l18so7090734wgh.26 for ; Mon, 04 Aug 2014 01:47:49 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1406920794-1958-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, Aug 01, 2014 at 04:19:54PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > > cat i915_reg.h | sort | uniq -d | grep define > > Signed-off-by: Paulo Zanoni Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_reg.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 28e21ed..c45b679 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3755,7 +3755,6 @@ enum punit_power_well { > #define PIPE_VSYNC_INTERRUPT_STATUS (1UL<<9) > #define PIPE_DISPLAY_LINE_COMPARE_STATUS (1UL<<8) > #define PIPE_DPST_EVENT_STATUS (1UL<<7) > -#define PIPE_LEGACY_BLC_EVENT_STATUS (1UL<<6) > #define PIPE_A_PSR_STATUS_VLV (1UL<<6) > #define PIPE_LEGACY_BLC_EVENT_STATUS (1UL<<6) > #define PIPE_ODD_FIELD_INTERRUPT_STATUS (1UL<<5) > @@ -5430,7 +5429,6 @@ enum punit_power_well { > #define VLV_GTLC_ALLOWWAKEERR (1 << 1) > #define VLV_GTLC_PW_MEDIA_STATUS_MASK (1 << 5) > #define VLV_GTLC_PW_RENDER_STATUS_MASK (1 << 7) > -#define VLV_GTLC_SURVIVABILITY_REG 0x130098 > #define FORCEWAKE_MT 0xa188 /* multi-threaded */ > #define FORCEWAKE_KERNEL 0x1 > #define FORCEWAKE_USER 0x2 > -- > 2.0.1 > > _______________________________________________ > 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