From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org. Ville Syrjälä"
<ville.syrjala@linux.intel.com>, "Dave Airlie" <airlied@linux.ie>
Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 1 May 2013 10:08:40 +0200 [thread overview]
Message-ID: <CAKMK7uE8M3gCbwmuxBrh0StqyRd0hyX+7YgZhUg-PcX8uJg+5Q@mail.gmail.com> (raw)
In-Reply-To: <20130501143734.5305cf8e4cef42c19a1bd5ce@canb.auug.org.au>
On Wed, May 1, 2013 at 6:37 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel tree got a conflict in
> drivers/gpu/drm/i915/i915_reg.h between commit a65851af5938 ("drm/i915:
> Make data/link N value power of two") from the drm tree and commit
> 72419203cab9 ("drm/i915: hw state readout support for fdi m/n") from the
> drm-intel tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
-Daniel
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/gpu/drm/i915/i915_reg.h
> index 83f9c26,b5d87bd..0000000
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@@ -2652,11 -2774,11 +2774,12 @@@
> #define _PIPEB_GMCH_DATA_M 0x71050
>
> /* Transfer unit size for display port - 1, default is 0x3f (for TU size 64) */
> -#define PIPE_GMCH_DATA_M_TU_SIZE_MASK (0x3f << 25)
> -#define PIPE_GMCH_DATA_M_TU_SIZE_SHIFT 25
> +#define TU_SIZE(x) (((x)-1) << 25) /* default size 64 */
> +#define TU_SIZE_MASK (0x3f << 25)
> + #define TU_SIZE_SHIFT 25
>
> -#define PIPE_GMCH_DATA_M_MASK (0xffffff)
> +#define DATA_LINK_M_N_MASK (0xffffff)
> +#define DATA_LINK_N_MAX (0x800000)
>
> #define _PIPEA_GMCH_DATA_N 0x70054
> #define _PIPEB_GMCH_DATA_N 0x71054
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2013-05-01 8:08 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 4:37 linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2013-05-01 8:08 ` Daniel Vetter [this message]
2013-06-18 3:04 Stephen Rothwell
2013-06-18 3:04 ` Stephen Rothwell
2013-08-29 4:09 Stephen Rothwell
2013-08-29 4:09 ` Stephen Rothwell
2013-11-07 2:37 Stephen Rothwell
2013-11-07 2:37 ` Stephen Rothwell
2014-01-22 3:04 Stephen Rothwell
2014-01-22 3:04 ` Stephen Rothwell
2014-01-22 10:06 ` Daniel Vetter
2014-01-23 1:21 ` Olof Johansson
2014-01-23 1:21 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
2014-01-22 3:09 Stephen Rothwell
2014-01-22 3:09 ` Stephen Rothwell
2014-04-03 1:00 Stephen Rothwell
2014-04-03 1:00 ` Stephen Rothwell
2014-07-23 3:06 Stephen Rothwell
2014-07-23 3:06 ` Stephen Rothwell
2014-07-23 5:09 ` Daniel Vetter
2014-07-23 5:09 ` Daniel Vetter
2014-07-23 3:18 Stephen Rothwell
2014-07-23 3:18 ` Stephen Rothwell
2016-09-07 3:59 Stephen Rothwell
2017-05-19 2:04 Stephen Rothwell
2019-01-17 1:59 Stephen Rothwell
2019-01-17 1:59 ` Stephen Rothwell
2019-02-06 0:42 Stephen Rothwell
2019-08-22 3:15 Stephen Rothwell
2020-07-14 2:59 Stephen Rothwell
2020-07-14 2:59 ` Stephen Rothwell
2021-01-25 0:46 Stephen Rothwell
2021-01-25 0:46 ` Stephen Rothwell
2021-03-17 3:08 Stephen Rothwell
2021-03-17 3:08 ` Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 12:14 ` Thomas Zimmermann
2021-04-01 2:13 Stephen Rothwell
2021-04-01 2:13 ` Stephen Rothwell
2021-08-12 1:28 Stephen Rothwell
2022-02-09 0:55 Stephen Rothwell
2022-02-09 0:55 ` Stephen Rothwell
2022-02-11 2:06 Stephen Rothwell
2022-02-11 2:06 ` Stephen Rothwell
2022-09-12 1:46 Stephen Rothwell
2022-09-12 1:46 ` Stephen Rothwell
2022-09-13 2:19 Stephen Rothwell
2022-09-13 2:19 ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2023-01-24 23:42 ` Stephen Rothwell
2023-05-30 1:57 Stephen Rothwell
2023-05-30 1:57 ` Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-05-30 1:59 Stephen Rothwell
2023-05-30 1:59 ` Stephen Rothwell
2023-10-03 0:09 Stephen Rothwell
2023-10-03 0:09 ` Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
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=CAKMK7uE8M3gCbwmuxBrh0StqyRd0hyX+7YgZhUg-PcX8uJg+5Q@mail.gmail.com \
--to=daniel.vetter@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=ville.syrjala@linux.intel.com \
/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.