From: Jani Nikula <jani.nikula@linux.intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>,
Matt Roper <matthew.d.roper@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/tgl: Use TGL stepping info for applying WAs
Date: Tue, 12 Jan 2021 18:24:50 +0200 [thread overview]
Message-ID: <87o8hut965.fsf@intel.com> (raw)
In-Reply-To: <20210111212553.brclyuex7dgzeryu@ldmartin-desk1>
On Mon, 11 Jan 2021, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Mon, Jan 11, 2021 at 12:57:43PM -0800, Matt Roper wrote:
>>On Mon, Jan 11, 2021 at 10:18:45PM +0200, Jani Nikula wrote:
>>So to clarify, it looks like we have a bunch of revid changes to the
>>display code that got merged to the gt-next tree but not to the
>>intel-next tree? Should we be going back and also merging /
>>cherry-picking those over to intel-next since that's where the display
>>changes are supposed to go, or is it too late to do that cleanly at this
>>point?
>
> it was my mistake to merge them to drm-intel-gt-next. They should have
> been in drm-intel-next.
That's not the problem though. The branches generally being too far
apart atm is. The single cherry-pick won't solve that. Applying these
patches to one tree just adds a dependency that will not be around in
the topic branch baseline, creating a new problem for merging the topic
branch.
>>Going forward, what should the general strategy be for stuff like
>>platform definitions and such? Merge such enablement patches to both
>
> last time we talked about this was regarding dg1 AFAIR and the consensus
> was to create a topic branch and that topic branch to be merged in both
> branches. That would avoid having 2 commits in different branches.
Agreed.
> Not sure if it would work out nicely for getting test on CI though.
> Since the changes are spread through the codebase, we could very easily
> hit a situation that this topic branch creates conflicts for other
> patches getting merged on either drm-intel-next or drm-intel-gt-next.
The cycle in review -> apply to topic branch -> merge topic branch just
needs to be short enough. We can't have the topic branch laying around
for more than maybe a few days, or we'll have problems.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-01-12 16:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 23:18 [Intel-gfx] [PATCH 0/2] Use TGL stepping info and add ADLS platform changes Aditya Swarup
2021-01-08 23:18 ` [Intel-gfx] [PATCH 1/2] drm/i915/tgl: Use TGL stepping info for applying WAs Aditya Swarup
2021-01-08 23:44 ` Matt Roper
2021-01-11 20:13 ` Jani Nikula
2021-01-11 20:18 ` Jani Nikula
2021-01-11 20:57 ` Matt Roper
2021-01-11 21:25 ` Lucas De Marchi
2021-01-12 16:24 ` Jani Nikula [this message]
2021-01-12 17:16 ` Matt Roper
2021-01-12 17:33 ` Vivi, Rodrigo
2021-01-12 17:39 ` Jani Nikula
2021-01-11 22:58 ` Aditya Swarup
2021-01-12 16:32 ` Jani Nikula
2021-01-11 20:20 ` Aditya Swarup
2021-01-12 16:11 ` Jani Nikula
2021-01-12 2:04 ` Lucas De Marchi
2021-01-12 16:18 ` Jani Nikula
2021-01-08 23:18 ` [Intel-gfx] [PATCH 2/2] drm/i915/adl_s: Add ADL-S platform info and PCI ids Aditya Swarup
2021-01-09 0:20 ` Matt Roper
2021-01-11 19:37 ` Aditya Swarup
2021-01-09 2:21 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Use TGL stepping info and add ADLS platform changes Patchwork
2021-01-09 2:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-01-09 10:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2021-01-11 19:29 [Intel-gfx] [PATCH 0/2] " Aditya Swarup
2021-01-11 19:29 ` [Intel-gfx] [PATCH 1/2] drm/i915/tgl: Use TGL stepping info for applying WAs Aditya Swarup
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=87o8hut965.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=matthew.d.roper@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