]> git.itanic.dy.fi Git - linux-stable/commitdiff
Revert "drm/amdgpu: add modifiers in amdgpu_vkms_plane_init()"
authorGuchun Chen <guchun.chen@amd.com>
Fri, 18 Feb 2022 04:57:52 +0000 (12:57 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 23 Feb 2022 21:31:06 +0000 (16:31 -0500)
This reverts commit 4046afcebfc3c8c0dd5666c2671b2c192b344f78.

No need to support modifier in virtual kms, otherwise, in SRIOV
mode, when lanuching X server, set crtc will fail due to mismatch
between primary plane modifier and framebuffer modifier.

Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c

index d99c8779b51e916782c93c24c6e8af9c8128267b..5224d9a39737f24f747549d43b207acbd8361ebd 100644 (file)
@@ -391,7 +391,6 @@ static struct drm_plane *amdgpu_vkms_plane_init(struct drm_device *dev,
                                                int index)
 {
        struct drm_plane *plane;
-       uint64_t modifiers[] = {DRM_FORMAT_MOD_LINEAR, DRM_FORMAT_MOD_INVALID};
        int ret;
 
        plane = kzalloc(sizeof(*plane), GFP_KERNEL);
@@ -402,7 +401,7 @@ static struct drm_plane *amdgpu_vkms_plane_init(struct drm_device *dev,
                                       &amdgpu_vkms_plane_funcs,
                                       amdgpu_vkms_formats,
                                       ARRAY_SIZE(amdgpu_vkms_formats),
-                                      modifiers, type, NULL);
+                                      NULL, type, NULL);
        if (ret) {
                kfree(plane);
                return ERR_PTR(ret);