From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: "José Roberto de Souza" <jose.souza@intel.com>,
"Juha-Pekka Heikkilä" <juha-pekka.heikkila@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>,
"Stanislav Lisovskiy" <stanislav.lisovskiy@intel.com>
Subject: linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
Date: Wed, 24 Nov 2021 11:09:57 +1100 [thread overview]
Message-ID: <20211124110957.18dea3f2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
Hi all,
Today's linux-next merge of the drm-intel-gt tree got a conflict in:
drivers/gpu/drm/i915/i915_pci.c
between commit:
3c542cfa8266 ("drm/i915/dg2: Tile 4 plane format support")
from the drm-intel tree and commit:
a5b7ef27da60 ("drm/i915: Add struct to hold IP version")
from the drm-intel-gt tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 69b8029da6b6,5e6795853dc3..000000000000
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1042,9 -1030,8 +1042,9 @@@ static const struct intel_device_info d
XE_HPM_FEATURES,
XE_LPD_FEATURES,
DGFX_FEATURES,
- .graphics_rel = 55,
- .media_rel = 55,
+ .graphics.rel = 55,
+ .media.rel = 55,
+ .has_4tile = 1,
PLATFORM(INTEL_DG2),
.platform_engine_mask =
BIT(RCS0) | BIT(BCS0) |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"José Roberto de Souza" <jose.souza@intel.com>,
"Stanislav Lisovskiy" <stanislav.lisovskiy@intel.com>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Juha-Pekka Heikkilä" <juha-pekka.heikkila@intel.com>
Subject: linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
Date: Wed, 24 Nov 2021 11:09:57 +1100 [thread overview]
Message-ID: <20211124110957.18dea3f2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
Hi all,
Today's linux-next merge of the drm-intel-gt tree got a conflict in:
drivers/gpu/drm/i915/i915_pci.c
between commit:
3c542cfa8266 ("drm/i915/dg2: Tile 4 plane format support")
from the drm-intel tree and commit:
a5b7ef27da60 ("drm/i915: Add struct to hold IP version")
from the drm-intel-gt tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 69b8029da6b6,5e6795853dc3..000000000000
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1042,9 -1030,8 +1042,9 @@@ static const struct intel_device_info d
XE_HPM_FEATURES,
XE_LPD_FEATURES,
DGFX_FEATURES,
- .graphics_rel = 55,
- .media_rel = 55,
+ .graphics.rel = 55,
+ .media.rel = 55,
+ .has_4tile = 1,
PLATFORM(INTEL_DG2),
.platform_engine_mask =
BIT(RCS0) | BIT(BCS0) |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Juha-Pekka Heikkilä" <juha-pekka.heikkila@intel.com>
Subject: [Intel-gfx] linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
Date: Wed, 24 Nov 2021 11:09:57 +1100 [thread overview]
Message-ID: <20211124110957.18dea3f2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
Hi all,
Today's linux-next merge of the drm-intel-gt tree got a conflict in:
drivers/gpu/drm/i915/i915_pci.c
between commit:
3c542cfa8266 ("drm/i915/dg2: Tile 4 plane format support")
from the drm-intel tree and commit:
a5b7ef27da60 ("drm/i915: Add struct to hold IP version")
from the drm-intel-gt tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_pci.c
index 69b8029da6b6,5e6795853dc3..000000000000
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1042,9 -1030,8 +1042,9 @@@ static const struct intel_device_info d
XE_HPM_FEATURES,
XE_LPD_FEATURES,
DGFX_FEATURES,
- .graphics_rel = 55,
- .media_rel = 55,
+ .graphics.rel = 55,
+ .media.rel = 55,
+ .has_4tile = 1,
PLATFORM(INTEL_DG2),
.platform_engine_mask =
BIT(RCS0) | BIT(BCS0) |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-11-24 0:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 0:09 Stephen Rothwell [this message]
2021-11-24 0:09 ` [Intel-gfx] linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree Stephen Rothwell
2021-11-24 0:09 ` Stephen Rothwell
2021-12-02 0:30 Stephen Rothwell
2021-12-02 0:30 ` Stephen Rothwell
2021-12-14 13:23 broonie
2022-01-24 23:07 Stephen Rothwell
2022-01-24 23:07 ` Stephen Rothwell
2022-02-03 0:14 Stephen Rothwell
2022-02-03 0:14 ` Stephen Rothwell
2022-02-14 0:54 Stephen Rothwell
2022-02-14 0:54 ` Stephen Rothwell
2022-02-21 14:33 broonie
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=20211124110957.18dea3f2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jose.souza@intel.com \
--cc=juha-pekka.heikkila@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 \
--cc=stanislav.lisovskiy@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.