drm/amdgpu: Enable DRIVER_ATOMIC flag for DAL.

This flag is needed to pass several of IGT test cases.

Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 27d46a907bd907c4cacf86b61fab8fba9fb940c7..a350fc9b2a7094c676f46108676343363257ea0e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2071,6 +2071,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,
        adev->audio_endpt_rreg = &amdgpu_block_invalid_rreg;
        adev->audio_endpt_wreg = &amdgpu_block_invalid_wreg;
 
+       if (amdgpu_device_has_dc_support(adev))
+               adev->ddev->driver->driver_features |= DRIVER_ATOMIC;
+
 
        DRM_INFO("initializing kernel modesetting (%s 0x%04X:0x%04X 0x%04X:0x%04X 0x%02X).\n",
                 amdgpu_asic_name[adev->asic_type], pdev->vendor, pdev->device,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index 2484dac08050a5f3e2549e6167e663976fe76b32..90fa8e8bc6fb3db21d57fe390cf0e2d0f38ec5e8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -348,7 +348,8 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev)
        drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
 
        /* disable all the possible outputs/crtcs before entering KMS mode */
-       drm_helper_disable_unused_functions(adev->ddev);
+       if (!amdgpu_device_has_dc_support(adev))
+               drm_helper_disable_unused_functions(adev->ddev);
 
        drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
        return 0;