]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amd/display: restore code for plane with no modifiers
authorDave Airlie <airlied@redhat.com>
Thu, 4 Aug 2022 05:50:20 +0000 (15:50 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2022 17:22:40 +0000 (10:22 -0700)
When this file was split in commit 6d886e1e9b74 ("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: 6d886e1e9b74 ("drm/amd/display: Create a file dedicated to planes")
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

index 8cd25b2ea0dca7f01e25171347dd5582a1a365b8..b841b8b0a9d82074a3699f523ba8013a1277631c 100644 (file)
@@ -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);