From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dave Airlie <airlied@redhat.com>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Andi Shyti <andi.shyti@linux.intel.com>,
Fei Yang <fei.yang@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matt Roper <matthew.d.roper@intel.com>
Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Tue, 30 May 2023 12:10:39 +1000 [thread overview]
Message-ID: <20230530121039.6a2037c9@canb.auug.org.au> (raw)
In-Reply-To: <20230530115752.14f0f1b5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
Hi all,
On Tue, 30 May 2023 11:57:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> @@@ -920,33 -587,8 +640,9 @@@ static const struct intel_device_info j
> #define GEN12_FEATURES \
> GEN11_FEATURES, \
> GEN(12), \
> - .display.abox_mask = GENMASK(2, 1), \
> - .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \
> - .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \
> - BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \
> - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \
> - .display.pipe_offsets = { \
> - [TRANSCODER_A] = PIPE_A_OFFSET, \
> - [TRANSCODER_B] = PIPE_B_OFFSET, \
> - [TRANSCODER_C] = PIPE_C_OFFSET, \
> - [TRANSCODER_D] = PIPE_D_OFFSET, \
> - [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \
> - [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \
> - }, \
> - .display.trans_offsets = { \
> - [TRANSCODER_A] = TRANSCODER_A_OFFSET, \
> - [TRANSCODER_B] = TRANSCODER_B_OFFSET, \
> - [TRANSCODER_C] = TRANSCODER_C_OFFSET, \
> - [TRANSCODER_D] = TRANSCODER_D_OFFSET, \
> - [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \
> - [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \
> - }, \
> - TGL_CURSOR_OFFSETS, \
> - TGL_CACHELEVEL, \
> ++ .max_pat_index = 3 \
I fixed the above up to have a ',' after the '3'
> .has_global_mocs = 1, \
> - .has_pxp = 1, \
> - .display.has_dsb = 1, \
> - .max_pat_index = 3
> + .has_pxp = 1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-05-30 2:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 1:57 linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-03 0:09 Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
2023-05-30 1:59 Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2022-09-13 2:19 Stephen Rothwell
2022-09-12 1:46 Stephen Rothwell
2022-02-11 2:06 Stephen Rothwell
2022-02-09 0:55 Stephen Rothwell
2021-08-12 1:28 Stephen Rothwell
2021-04-01 2:13 Stephen Rothwell
2021-03-17 3:08 Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 12:14 ` Thomas Zimmermann
2021-01-25 0:46 Stephen Rothwell
2020-07-14 2:59 Stephen Rothwell
2019-08-22 3:15 Stephen Rothwell
2019-02-06 0:42 Stephen Rothwell
2019-01-17 1:59 Stephen Rothwell
2017-05-19 2:04 Stephen Rothwell
2016-09-07 3:59 Stephen Rothwell
2014-07-23 3:18 Stephen Rothwell
2014-07-23 3:06 Stephen Rothwell
2014-07-23 5:09 ` Daniel Vetter
2014-04-03 1:00 Stephen Rothwell
2014-01-22 3:09 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 21:10 ` Olof Johansson
2013-11-07 2:37 Stephen Rothwell
2013-08-29 4:09 Stephen Rothwell
2013-06-18 3:04 Stephen Rothwell
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=20230530121039.6a2037c9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@redhat.com \
--cc=andi.shyti@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=fei.yang@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew.d.roper@intel.com \
--cc=rodrigo.vivi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).