From 801ecee53705e1bffefba2bed4a3b309568422ac Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Fri, 7 Apr 2017 15:03:37 -0400 Subject: [PATCH 0330/4131] drm/amd/display: Add lock around updating freesync property Getting rid of the WARN_ONs in atomic_get_property Signed-off-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c index e9876574..63ad629 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c @@ -1195,6 +1195,7 @@ static int amdgpu_freesync_update_property_atomic( dev = connector->dev; adev = dev->dev_private; + drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); ret = drm_object_property_get_value( &connector->base, adev->mode_info.freesync_property, @@ -1204,6 +1205,8 @@ static int amdgpu_freesync_update_property_atomic( &connector->base, adev->mode_info.freesync_property, val_capable); + drm_modeset_unlock(&dev->mode_config.connection_mutex); + return ret; } -- 2.7.4