FAILED: patch "[PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36" failed to apply to 6.18-stable tree

FAILED: patch "[PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36" failed to apply to 6.18-stable tree

[gregkh]

The patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 9ce3169430f1db035d491481086e2fae2552569c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026090953-attire-untidy-c602@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'

Possible dependencies:



thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 9ce3169430f1db035d491481086e2fae2552569c Mon Sep 17 00:00:00 2001
From: Roman Li <Roman.Li@amd.com>
Date: Fri, 14 Aug 2026 18:03:17 -0400
Subject: [PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36

[WHY]
Splash screen corruption on some 8K monitors.

[HOW]
Set GPUVM min page size to 4K for DCN35/36 to use the correct DML2
calculations, avoiding the corruption path observed during splash.

Fixes: 115009d11ccf ("drm/amd/display: Add DCN35 DML2 support")
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Roman Li <Roman.Li@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 2cbfb03dead5088a7bdfe2ce392a5caa3d1b3719)
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
index 166f10b8862f..c82886323a51 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
@@ -301,6 +301,7 @@ void dml2_init_socbb_params(struct dml2_context *dml2, const struct dc *in_dc, s
 		out->smn_latency_us = 2;
 		out->dispclk_dppclk_vco_speed_mhz = 3600;
 		out->pct_ideal_dram_bw_after_urgent_pixel_only = 65.0;
+		out->gpuvm_min_page_size_kbytes = 4;
 		break;
 
 

Re: FAILED: patch "[PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36" failed to apply to 6.18-stable tree

[Mario Limonciello]

On 9/9/26 06:52, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 6.18-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
> 
> To reproduce the conflict and resubmit, you may use the following commands:
> 
> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
> git checkout FETCH_HEAD
> git cherry-pick -x 9ce3169430f1db035d491481086e2fae2552569c
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026090953-attire-untidy-c602@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
> 
> Possible dependencies:
> 
> 

I'm not sure why this fails to cherry pick here.  I just tried on my 
side and it works:

╰─❯ git reset --hard
HEAD is now at 1c732c6b94f0f Linux 6.18.49
╰─❯ git cherry-pick -x 9ce3169430f1db035d491481086e2fae2552569c
Auto-merging drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
[linux-6.18.y 40ba5915f3a5f] drm/amd/display: Set gpuvm min page size to 
4K on dcn35/36
  Author: Roman Li <Roman.Li@amd.com>
  Date: Fri Aug 14 18:03:17 2026 -0400
  1 file changed, 1 insertion(+)
╰─❯ git log --oneline -3
40ba5915f3a5f (HEAD -> linux-6.18.y) drm/amd/display: Set gpuvm min page 
size to 4K on dcn35/36
1c732c6b94f0f (tag: v6.18.49, gregkh/linux-6.18.y) Linux 6.18.49
5f08c45bdcfd2 usb: usbfs: fix use-after-free of usb_device in 
usbdev_release()

And then I tried to compile amdgpu.ko and it compiled just fine.

> 
> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
>  From 9ce3169430f1db035d491481086e2fae2552569c Mon Sep 17 00:00:00 2001
> From: Roman Li <Roman.Li@amd.com>
> Date: Fri, 14 Aug 2026 18:03:17 -0400
> Subject: [PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36
> 
> [WHY]
> Splash screen corruption on some 8K monitors.
> 
> [HOW]
> Set GPUVM min page size to 4K for DCN35/36 to use the correct DML2
> calculations, avoiding the corruption path observed during splash.
> 
> Fixes: 115009d11ccf ("drm/amd/display: Add DCN35 DML2 support")
> Cc: Mario Limonciello <mario.limonciello@amd.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Reviewed-by: Alex Hung <alex.hung@amd.com>
> Signed-off-by: Roman Li <Roman.Li@amd.com>
> Signed-off-by: Alex Hung <alex.hung@amd.com>
> Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> (cherry picked from commit 2cbfb03dead5088a7bdfe2ce392a5caa3d1b3719)
> Cc: stable@vger.kernel.org
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
> index 166f10b8862f..c82886323a51 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
> @@ -301,6 +301,7 @@ void dml2_init_socbb_params(struct dml2_context *dml2, const struct dc *in_dc, s
>   		out->smn_latency_us = 2;
>   		out->dispclk_dppclk_vco_speed_mhz = 3600;
>   		out->pct_ideal_dram_bw_after_urgent_pixel_only = 65.0;
> +		out->gpuvm_min_page_size_kbytes = 4;
>   		break;
>   
>   

Re: FAILED: patch "[PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36" failed to apply to 6.18-stable tree

[Greg KH]

On Wed, Sep 09, 2026 at 12:00:21PM -0500, Mario Limonciello wrote:
> 
> 
> On 9/9/26 06:52, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 6.18-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> > 
> > To reproduce the conflict and resubmit, you may use the following commands:
> > 
> > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 9ce3169430f1db035d491481086e2fae2552569c
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026090953-attire-untidy-c602@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
> > 
> > Possible dependencies:
> > 
> > 
> 
> I'm not sure why this fails to cherry pick here.  I just tried on my side
> and it works:
> 
> ╰─❯ git reset --hard
> HEAD is now at 1c732c6b94f0f Linux 6.18.49
> ╰─❯ git cherry-pick -x 9ce3169430f1db035d491481086e2fae2552569c
> Auto-merging drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
> [linux-6.18.y 40ba5915f3a5f] drm/amd/display: Set gpuvm min page size to 4K
> on dcn35/36
>  Author: Roman Li <Roman.Li@amd.com>
>  Date: Fri Aug 14 18:03:17 2026 -0400
>  1 file changed, 1 insertion(+)
> ╰─❯ git log --oneline -3
> 40ba5915f3a5f (HEAD -> linux-6.18.y) drm/amd/display: Set gpuvm min page
> size to 4K on dcn35/36
> 1c732c6b94f0f (tag: v6.18.49, gregkh/linux-6.18.y) Linux 6.18.49
> 5f08c45bdcfd2 usb: usbfs: fix use-after-free of usb_device in
> usbdev_release()
> 
> And then I tried to compile amdgpu.ko and it compiled just fine.
> 
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------------ original commit in Linus's tree ------------------
> > 
> >  From 9ce3169430f1db035d491481086e2fae2552569c Mon Sep 17 00:00:00 2001
> > From: Roman Li <Roman.Li@amd.com>
> > Date: Fri, 14 Aug 2026 18:03:17 -0400
> > Subject: [PATCH] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36
> > 
> > [WHY]
> > Splash screen corruption on some 8K monitors.
> > 
> > [HOW]
> > Set GPUVM min page size to 4K for DCN35/36 to use the correct DML2
> > calculations, avoiding the corruption path observed during splash.
> > 
> > Fixes: 115009d11ccf ("drm/amd/display: Add DCN35 DML2 support")
> > Cc: Mario Limonciello <mario.limonciello@amd.com>
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Reviewed-by: Alex Hung <alex.hung@amd.com>
> > Signed-off-by: Roman Li <Roman.Li@amd.com>
> > Signed-off-by: Alex Hung <alex.hung@amd.com>
> > Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > (cherry picked from commit 2cbfb03dead5088a7bdfe2ce392a5caa3d1b3719)
> > Cc: stable@vger.kernel.org
> > 
> > diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
> > index 166f10b8862f..c82886323a51 100644
> > --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
> > +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c
> > @@ -301,6 +301,7 @@ void dml2_init_socbb_params(struct dml2_context *dml2, const struct dc *in_dc, s
> >   		out->smn_latency_us = 2;
> >   		out->dispclk_dppclk_vco_speed_mhz = 3600;
> >   		out->pct_ideal_dram_bw_after_urgent_pixel_only = 65.0;
> > +		out->gpuvm_min_page_size_kbytes = 4;
> >   		break;
> 

Can you send the patch that it results in, perhaps there was a rename
that a normal 'quilt apply' does not handle.

thanks,

greg k-h

[PATCH 6.18.y] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36

[Mario Limonciello (AMD)]

From: Roman Li <Roman.Li@amd.com>

[WHY]
Splash screen corruption on some 8K monitors.

[HOW]
Set GPUVM min page size to 4K for DCN35/36 to use the correct DML2
calculations, avoiding the corruption path observed during splash.

Fixes: 115009d11ccf ("drm/amd/display: Add DCN35 DML2 support")
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Roman Li <Roman.Li@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 2cbfb03dead5088a7bdfe2ce392a5caa3d1b3719)
Cc: stable@vger.kernel.org
(cherry picked from commit 9ce3169430f1db035d491481086e2fae2552569c)
Signed-off-by: Mario Limonciello <superm1@kernel.org>
---
 drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
index 3b866e876bf4d..9fea55fddded4 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c
@@ -299,6 +299,7 @@ void dml2_init_socbb_params(struct dml2_context *dml2, const struct dc *in_dc, s
 		out->smn_latency_us = 2;
 		out->dispclk_dppclk_vco_speed_mhz = 3600;
 		out->pct_ideal_dram_bw_after_urgent_pixel_only = 65.0;
+		out->gpuvm_min_page_size_kbytes = 4;
 		break;
 
 	case dml_project_dcn401:
-- 
2.53.0

Re: [PATCH 6.18.y] drm/amd/display: Set gpuvm min page size to 4K on dcn35/36

[Sasha Levin]

> [WHY]
> Splash screen corruption on some 8K monitors.
>
> [HOW]
> Set GPUVM min page size to 4K for DCN35/36 to use the correct DML2
> calculations, avoiding the corruption path observed during splash.

Queued for 6.18, thanks.

-- 
Thanks,
Sasha