All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: Dexuan Cui <dexuan.cui@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h
Date: Wed, 05 Dec 2012 14:17:44 +0000	[thread overview]
Message-ID: <275ffc$7nbo12@fmsmga002.fm.intel.com> (raw)
In-Reply-To: <1354716877-26712-1-git-send-email-dexuan.cui@intel.com>

On Wed,  5 Dec 2012 22:14:37 +0800, Dexuan Cui <dexuan.cui@intel.com> wrote:
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 97fbd9d..b29970a 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1895,9 +1895,7 @@
>  #define   PFIT_HORIZ_SCALE_MASK			0x0000fff0
>  /* Pre-965 */
>  #define		PFIT_VERT_SCALE_SHIFT		20
> -#define		PFIT_VERT_SCALE_MASK		0xfff00000
>  #define		PFIT_HORIZ_SCALE_SHIFT		4
> -#define		PFIT_HORIZ_SCALE_MASK		0x0000fff0

Deleted the wrong pair here.

>  /* 965+ */
>  #define		PFIT_VERT_SCALE_SHIFT_965	16
>  #define		PFIT_VERT_SCALE_MASK_965	0x1fff0000
> @@ -3815,7 +3813,6 @@
>  #define  TRANS_FSYNC_DELAY_HB2  (1<<27)
>  #define  TRANS_FSYNC_DELAY_HB3  (2<<27)
>  #define  TRANS_FSYNC_DELAY_HB4  (3<<27)
> -#define  TRANS_DP_AUDIO_ONLY    (1<<26)
>  #define  TRANS_DP_VIDEO_AUDIO   (0<<26)
And kill its inverse: TRANS_DP_VIDEO_AUDIO
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

  reply	other threads:[~2012-12-05 14:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-05 14:14 [PATCH 1/1] drm/i915: Remove 3 duplicate register #defines in i915_reg.h Dexuan Cui
2012-12-05 14:17 ` Chris Wilson [this message]
2012-12-05 14:34   ` Cui, Dexuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='275ffc$7nbo12@fmsmga002.fm.intel.com' \
    --to=chris@chris-wilson.co.uk \
    --cc=dexuan.cui@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.