From 8fb234135027899e5a62e357baa7c43546a1d57b Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Tue, 24 Jan 2017 17:28:50 -0500 Subject: [PATCH] drm/amd/display: Rename atomic_commit parameter. This parameter name is misleading. It's previous meaning confuses with ASYNC (immidiate flip) which is totatlly different thing then nonblocking commit. Signed-off-by: Andrey Grodzovsky Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ad08d6f7f094..ad60a28975ca 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 @@ -2253,7 +2253,7 @@ static void remove_stream(struct amdgpu_device *adev, struct amdgpu_crtc *acrtc) int amdgpu_dm_atomic_commit( struct drm_device *dev, struct drm_atomic_state *state, - bool async) + bool nonblock) { struct amdgpu_device *adev = dev->dev_private; struct amdgpu_display_manager *dm = &adev->dm; @@ -2282,7 +2282,7 @@ int amdgpu_dm_atomic_commit( * we should not pin/unpin the fb here, it should be done in * amdgpu_crtc_flip and from the vblank irq handler. */ - if (!async) { + if (!nonblock) { ret = drm_atomic_helper_prepare_planes(dev, state); if (ret) return ret; @@ -2620,7 +2620,7 @@ int amdgpu_dm_atomic_commit( /* In this state all old framebuffers would be unpinned */ /* TODO: Revisit when we support true asynchronous commit.*/ - if (!async) + if (!nonblock) drm_atomic_helper_cleanup_planes(dev, state); drm_atomic_state_put(state); -- 2.30.2