Applied. Thanks!
On Sat, Jul 11, 2026 at 7:34 AM Timur Kristóf <[email protected]> wrote: > > Always set native cursor mode when the CRTC is disabled, > to make sure it doesn't cause atomic commits to fail when > they are trying to disable the CRTC. > > Fixes: 41af6215cdbc ("drm/amd/display: Reject cursor plane on DCE when scaled > differently than primary") > Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5432 > Cc: Leo Li <[email protected]> > Cc: Michel Dänzer <[email protected]> > Signed-off-by: Timur Kristóf <[email protected]> > Tested-by: Viktor Jägersküpper <[email protected]> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index b97ceabe6173..61b0b7531959 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -6608,10 +6608,15 @@ static int dm_crtc_get_cursor_mode(struct > amdgpu_device *adev, > /* Overlay cursor not supported on HW before DCN > * DCN401/420 does not have the cursor-on-scaled-plane or > cursor-on-yuv-plane restrictions > * as previous DCN generations, so enable native mode on DCN401/420 > + * > + * Always set native cursor mode when the CRTC is disabled, > + * to make sure it doesn't cause atomic commits to fail when > + * they are trying to disable the CRTC. > */ > if (amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 0, 1) || > amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 2, 0) || > - amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 2, 1)) { > + amdgpu_ip_version(adev, DCE_HWIP, 0) == IP_VERSION(4, 2, 1) || > + !dm_crtc_state->base.enable) { > *cursor_mode = DM_CURSOR_NATIVE_MODE; > return 0; > } > -- > 2.55.0 >
