From: Jani Nikula <jani.nikula@linux.intel.com>
To: Sasha Levin <sashal@kernel.org>
Cc: stable-commits@vger.kernel.org, ville.syrjala@linux.intel.com,
stable@vger.kernel.org,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>
Subject: Re: Patch "drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled" has been added to the 6.1-stable tree
Date: Mon, 11 Dec 2023 22:04:33 +0200 [thread overview]
Message-ID: <875y14y08e.fsf@intel.com> (raw)
In-Reply-To: <ZW4raf5GE24YZX0B@sashalap>
On Mon, 04 Dec 2023, Sasha Levin <sashal@kernel.org> wrote:
> On Mon, Dec 04, 2023 at 01:22:28PM +0200, Jani Nikula wrote:
>>On Mon, 04 Dec 2023, Sasha Levin <sashal@kernel.org> wrote:
>>> This is a note to let you know that I've just added the patch titled
>>>
>>> drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled
>>>
>>> to the 6.1-stable tree which can be found at:
>>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>>>
>>> The filename of the patch is:
>>> drm-i915-call-intel_pre_plane_updates-also-for-pipes.patch
>>> and it can be found in the queue-6.1 subdirectory.
>>>
>>> If you, or anyone else, feels it should not be added to the stable tree,
>>> please let <stable@vger.kernel.org> know about it.
>>
>>Turns out this one requires another commit to go with it, both for
>>v6.7-rc* and stable backports. I was just a bit too late with it for
>>v6.7-rc4 [1].
>>
>>Please hold off with all stable backports of this until you can backport
>>
>>96d7e7940136 ("drm/i915: Check pipe active state in {planes,vrr}_{enabling,disabling}()")
>>
>>from drm-intel-fixes with it. It should find its way to v6.7-rc5.
>>
>>Thanks, and sorry for the mess. :(
>
> No worries, and thanks for letting us know. I'll drop this patch from
> all trees.
It should be fine to backport
d21a3962d304 ("drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled")
to stable kernels as long as it's accompanied by
96d7e7940136 ("drm/i915: Check pipe active state in {planes,vrr}_{enabling,disabling}()")
which is now in v6.7-rc5.
Thanks,
Jani.
--
Jani Nikula, Intel
prev parent reply other threads:[~2023-12-11 20:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20231204104250.2009121-1-sashal@kernel.org>
2023-12-04 11:22 ` Patch "drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled" has been added to the 6.1-stable tree Jani Nikula
2023-12-04 19:41 ` Sasha Levin
2023-12-11 20:04 ` Jani Nikula [this message]
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=875y14y08e.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=joonas.lahtinen@linux.intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=sashal@kernel.org \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tvrtko.ursulin@linux.intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox