drm/amdgpu: disable DRIVER_ATOMIC under SRIOV
authorYintian Tao <yttao@amd.com>
Tue, 16 Apr 2019 06:04:38 +0000 (14:04 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 19 Apr 2019 16:33:06 +0000 (11:33 -0500)
Under SRIOV, we need disable DRIVER_ATOMIC.
Otherwise, it will trigger WARN_ON at drm_universal_plane_init.

Signed-off-by: Yintian Tao <yttao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c

index 7e7f9ed89ee1e3029557320e85bd205719e9de23..7d484fad3909015d956125995be9ff535450ea70 100644 (file)
@@ -36,6 +36,7 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
        /* enable virtual display */
        adev->mode_info.num_crtc = 1;
        adev->enable_virtual_display = true;
+       adev->ddev->driver->driver_features &= ~DRIVER_ATOMIC;
        adev->cg_flags = 0;
        adev->pg_flags = 0;
 }