Skip to contentSkip to conversation

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

PATCH In review Dave Airlie 3 participants 3 messages Aug 4, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: restore plane with no modifiers code.

When this file was split in

5d945cbcd4b16a29d6470a80dfb19738f9a4319f

Author: Rodrigo Siqueira <[email protected]>
Date:   Wed Jul 20 15:31:42 2022 -0400

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")
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +3 -0
index 8cd25b2ea0dc..b841b8b0a9d8 100644
@@ -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);
Signature · 1 line
2.37.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Dave Airlie

When this file was split in

5d945cbcd4b16a29d6470a80dfb19738f9a4319f

Author: Rodrigo Siqueira <[email protected]>
Date:   Wed Jul 20 15:31:42 2022 -0400

drm/amd/display: Create a file dedicated to planes

Quoted 8 lines

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")

Harry

Quoted 18 lines
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +3 -0
index 8cd25b2ea0dc..b841b8b0a9d8 100644
@@ -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);