Missing backport of 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") in 6.1.y stable series?
Hi
We got in Debian a request to backport 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") for the kernel in Debian bookworm, based on 6.1.y stable series.
https://bugs.debian.org/1119232
While looking at he request, I noticed that the series of commits had a bit of a convuluted history. AFAICT the story began with:
de05abe6b9d0 ("drm/amd/display: Enable Freesync Video Mode by default"), this landed in 5.18-rc1 (and backported to v6.1.5, v6.0.19).
This was then reverted with 4243c84aa082 ("Revert "drm/amd/display: Enable Freesync Video Mode by default""), which landed in v6.3-rc1 (and in turn was backported to v6.1.53).
So far we are in sync.
The above was then reverted again, via 11b92df8a2f7 ("Revert "Revert drm/amd/display: Enable Freesync Video Mode by default"") applied in v6.5-rc1 and as well backported to v6.1.53 (so still in sync).
Now comes were we are diverging: 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") got applied later on, landing in v6.9-rc1 but *not* in 6.1.y anymore.
I suspect this one was not applied to 6.1.y because in meanwhile there was a conflict to cherry-pick it cleanly due to context changes due to 3e094a287526 ("drm/amd/display: Use drm_connector in create_stream_for_sink").
If this is correct, then the 6.1.y series can be brough in sync with cherry-picking the commit and adjust the context around the change. I'm attaching the proposed change.
Alex in particular, does that make sense?
Regards, Salvatore
[Public]
-----Original Message----- From: Salvatore Bonaccorso salvatore.bonaccorso@gmail.com On Behalf Of Salvatore Bonaccorso Sent: Tuesday, October 28, 2025 3:18 PM To: stable stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org; Sasha Levin sashal@kernel.org; Deucher, Alexander Alexander.Deucher@amd.com; Hamza Mahfooz hamza.mahfooz@amd.com Subject: Missing backport of 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") in 6.1.y stable series?
Hi
We got in Debian a request to backport 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") for the kernel in Debian bookworm, based on 6.1.y stable series.
https://bugs.debian.org/1119232
While looking at he request, I noticed that the series of commits had a bit of a convuluted history. AFAICT the story began with:
de05abe6b9d0 ("drm/amd/display: Enable Freesync Video Mode by default"), this landed in 5.18-rc1 (and backported to v6.1.5, v6.0.19).
This was then reverted with 4243c84aa082 ("Revert "drm/amd/display: Enable Freesync Video Mode by default""), which landed in v6.3-rc1 (and in turn was backported to v6.1.53).
So far we are in sync.
The above was then reverted again, via 11b92df8a2f7 ("Revert "Revert drm/amd/display: Enable Freesync Video Mode by default"") applied in v6.5-rc1 and as well backported to v6.1.53 (so still in sync).
Now comes were we are diverging: 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") got applied later on, landing in v6.9-rc1 but *not* in 6.1.y anymore.
I suspect this one was not applied to 6.1.y because in meanwhile there was a conflict to cherry-pick it cleanly due to context changes due to 3e094a287526 ("drm/amd/display: Use drm_connector in create_stream_for_sink").
If this is correct, then the 6.1.y series can be brough in sync with cherry-picking the commit and adjust the context around the change. I'm attaching the proposed change.
Alex in particular, does that make sense?
Yes, that makes sense to me.
Thanks,
Alex
Hi Alex
On Wed, Oct 29, 2025 at 09:47:35PM +0000, Deucher, Alexander wrote:
[Public]
-----Original Message----- From: Salvatore Bonaccorso salvatore.bonaccorso@gmail.com On Behalf Of Salvatore Bonaccorso Sent: Tuesday, October 28, 2025 3:18 PM To: stable stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org; Sasha Levin sashal@kernel.org; Deucher, Alexander Alexander.Deucher@amd.com; Hamza Mahfooz hamza.mahfooz@amd.com Subject: Missing backport of 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") in 6.1.y stable series?
Hi
We got in Debian a request to backport 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") for the kernel in Debian bookworm, based on 6.1.y stable series.
https://bugs.debian.org/1119232
While looking at he request, I noticed that the series of commits had a bit of a convuluted history. AFAICT the story began with:
de05abe6b9d0 ("drm/amd/display: Enable Freesync Video Mode by default"), this landed in 5.18-rc1 (and backported to v6.1.5, v6.0.19).
This was then reverted with 4243c84aa082 ("Revert "drm/amd/display: Enable Freesync Video Mode by default""), which landed in v6.3-rc1 (and in turn was backported to v6.1.53).
So far we are in sync.
The above was then reverted again, via 11b92df8a2f7 ("Revert "Revert drm/amd/display: Enable Freesync Video Mode by default"") applied in v6.5-rc1 and as well backported to v6.1.53 (so still in sync).
Now comes were we are diverging: 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") got applied later on, landing in v6.9-rc1 but *not* in 6.1.y anymore.
I suspect this one was not applied to 6.1.y because in meanwhile there was a conflict to cherry-pick it cleanly due to context changes due to 3e094a287526 ("drm/amd/display: Use drm_connector in create_stream_for_sink").
If this is correct, then the 6.1.y series can be brough in sync with cherry-picking the commit and adjust the context around the change. I'm attaching the proposed change.
Alex in particular, does that make sense?
Yes, that makes sense to me.
Thanks for the confirmation. Greg, Sasha so can this be picked up as well for 6.1.y? The patch was attached in previous message, but I can resubmit it if needed.
*But* the patch submission is solely based on the above and on the request from https://bugs.debian.org/1119232 . I was not able to verify myself the underlying issue. So I really appreciate the input from Alex here and would prefer an explicit ack from him.
Regards, Salvatore
On Sun, Nov 02, 2025 at 08:32:24PM +0100, Salvatore Bonaccorso wrote:
Hi Alex
On Wed, Oct 29, 2025 at 09:47:35PM +0000, Deucher, Alexander wrote:
[Public]
-----Original Message----- From: Salvatore Bonaccorso salvatore.bonaccorso@gmail.com On Behalf Of Salvatore Bonaccorso Sent: Tuesday, October 28, 2025 3:18 PM To: stable stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org; Sasha Levin sashal@kernel.org; Deucher, Alexander Alexander.Deucher@amd.com; Hamza Mahfooz hamza.mahfooz@amd.com Subject: Missing backport of 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") in 6.1.y stable series?
Hi
We got in Debian a request to backport 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") for the kernel in Debian bookworm, based on 6.1.y stable series.
https://bugs.debian.org/1119232
While looking at he request, I noticed that the series of commits had a bit of a convuluted history. AFAICT the story began with:
de05abe6b9d0 ("drm/amd/display: Enable Freesync Video Mode by default"), this landed in 5.18-rc1 (and backported to v6.1.5, v6.0.19).
This was then reverted with 4243c84aa082 ("Revert "drm/amd/display: Enable Freesync Video Mode by default""), which landed in v6.3-rc1 (and in turn was backported to v6.1.53).
So far we are in sync.
The above was then reverted again, via 11b92df8a2f7 ("Revert "Revert drm/amd/display: Enable Freesync Video Mode by default"") applied in v6.5-rc1 and as well backported to v6.1.53 (so still in sync).
Now comes were we are diverging: 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") got applied later on, landing in v6.9-rc1 but *not* in 6.1.y anymore.
I suspect this one was not applied to 6.1.y because in meanwhile there was a conflict to cherry-pick it cleanly due to context changes due to 3e094a287526 ("drm/amd/display: Use drm_connector in create_stream_for_sink").
If this is correct, then the 6.1.y series can be brough in sync with cherry-picking the commit and adjust the context around the change. I'm attaching the proposed change.
Alex in particular, does that make sense?
Yes, that makes sense to me.
Thanks for the confirmation. Greg, Sasha so can this be picked up as well for 6.1.y? The patch was attached in previous message, but I can resubmit it if needed.
can you resubmit please?
thanks,
greg k-h
On Mon, Nov 03, 2025 at 09:22:38AM +0900, Greg Kroah-Hartman wrote:
On Sun, Nov 02, 2025 at 08:32:24PM +0100, Salvatore Bonaccorso wrote:
Hi Alex
On Wed, Oct 29, 2025 at 09:47:35PM +0000, Deucher, Alexander wrote:
[Public]
-----Original Message----- From: Salvatore Bonaccorso salvatore.bonaccorso@gmail.com On Behalf Of Salvatore Bonaccorso Sent: Tuesday, October 28, 2025 3:18 PM To: stable stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org; Sasha Levin sashal@kernel.org; Deucher, Alexander Alexander.Deucher@amd.com; Hamza Mahfooz hamza.mahfooz@amd.com Subject: Missing backport of 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") in 6.1.y stable series?
Hi
We got in Debian a request to backport 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") for the kernel in Debian bookworm, based on 6.1.y stable series.
https://bugs.debian.org/1119232
While looking at he request, I noticed that the series of commits had a bit of a convuluted history. AFAICT the story began with:
de05abe6b9d0 ("drm/amd/display: Enable Freesync Video Mode by default"), this landed in 5.18-rc1 (and backported to v6.1.5, v6.0.19).
This was then reverted with 4243c84aa082 ("Revert "drm/amd/display: Enable Freesync Video Mode by default""), which landed in v6.3-rc1 (and in turn was backported to v6.1.53).
So far we are in sync.
The above was then reverted again, via 11b92df8a2f7 ("Revert "Revert drm/amd/display: Enable Freesync Video Mode by default"") applied in v6.5-rc1 and as well backported to v6.1.53 (so still in sync).
Now comes were we are diverging: 3c591faadd8a ("Reapply "Revert drm/amd/display: Enable Freesync Video Mode by default"") got applied later on, landing in v6.9-rc1 but *not* in 6.1.y anymore.
I suspect this one was not applied to 6.1.y because in meanwhile there was a conflict to cherry-pick it cleanly due to context changes due to 3e094a287526 ("drm/amd/display: Use drm_connector in create_stream_for_sink").
If this is correct, then the 6.1.y series can be brough in sync with cherry-picking the commit and adjust the context around the change. I'm attaching the proposed change.
Alex in particular, does that make sense?
Yes, that makes sense to me.
Thanks for the confirmation. Greg, Sasha so can this be picked up as well for 6.1.y? The patch was attached in previous message, but I can resubmit it if needed.
can you resubmit please?
Nevermind, I found it, I'll go queue it up now, thanks.
greg k-h
linux-stable-mirror@lists.linaro.org
-
Deucher, Alexander -
Greg Kroah-Hartman -
Salvatore Bonaccorso