drm/amd/display: restore code for plane with no modifiers

798cd57c · Dave Airlie <[email protected]> · 2022-08-04 15:50:20 +10:00

When this file was split in commit 5d945cbcd4b1 ("drm/amd/display:
Create a file dedicated to planes") this chunk seemed to get dropped.

Linus noticed on this rx580 and I've reproduced on FIJI which makes
sense as these are pre-modifier GPUs.

With this applied, I get gdm back.

Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes")
Signed-off-by: Dave Airlie <[email protected]>
Reported-and-tested-by: Linus Torvalds <[email protected]>
Reviewed-by: Harry Wentland <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 798cd57cd5f871452461746032cf6ee50b0fd69a
Parents: b44f2fd8

Changes

1 files changed · +3 −0

File	Status	Add	Del	Content
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c	modified	+3	−0	View file

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

View file

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index 8cd25b2..b841b8b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -1591,6 +1591,9 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
 	if (res)
 		return res;
 
+	if (modifiers == NULL)
+		adev_to_drm(dm->adev)->mode_config.fb_modifiers_not_supported = true;
+
 	res = drm_universal_plane_init(adev_to_drm(dm->adev), plane, possible_crtcs,
 				       &dm_plane_funcs, formats, num_formats,
 				       modifiers, plane->type, NULL);