diff options
author | Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> | 2017-01-24 17:28:50 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:12:30 -0400 |
commit | 8fb234135027899e5a62e357baa7c43546a1d57b (patch) | |
tree | 1a0fb2618bbe6bdcf21a81be398e97976470f97d /drivers/gpu/drm/amd | |
parent | 17c06cab918e23b15dcf1618d9735a46fd1529f8 (diff) |
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 <Andrey.Grodzovsky@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 6 |
1 files 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) | |||
2253 | int amdgpu_dm_atomic_commit( | 2253 | int amdgpu_dm_atomic_commit( |
2254 | struct drm_device *dev, | 2254 | struct drm_device *dev, |
2255 | struct drm_atomic_state *state, | 2255 | struct drm_atomic_state *state, |
2256 | bool async) | 2256 | bool nonblock) |
2257 | { | 2257 | { |
2258 | struct amdgpu_device *adev = dev->dev_private; | 2258 | struct amdgpu_device *adev = dev->dev_private; |
2259 | struct amdgpu_display_manager *dm = &adev->dm; | 2259 | struct amdgpu_display_manager *dm = &adev->dm; |
@@ -2282,7 +2282,7 @@ int amdgpu_dm_atomic_commit( | |||
2282 | * we should not pin/unpin the fb here, it should be done in | 2282 | * we should not pin/unpin the fb here, it should be done in |
2283 | * amdgpu_crtc_flip and from the vblank irq handler. | 2283 | * amdgpu_crtc_flip and from the vblank irq handler. |
2284 | */ | 2284 | */ |
2285 | if (!async) { | 2285 | if (!nonblock) { |
2286 | ret = drm_atomic_helper_prepare_planes(dev, state); | 2286 | ret = drm_atomic_helper_prepare_planes(dev, state); |
2287 | if (ret) | 2287 | if (ret) |
2288 | return ret; | 2288 | return ret; |
@@ -2620,7 +2620,7 @@ int amdgpu_dm_atomic_commit( | |||
2620 | /* In this state all old framebuffers would be unpinned */ | 2620 | /* In this state all old framebuffers would be unpinned */ |
2621 | 2621 | ||
2622 | /* TODO: Revisit when we support true asynchronous commit.*/ | 2622 | /* TODO: Revisit when we support true asynchronous commit.*/ |
2623 | if (!async) | 2623 | if (!nonblock) |
2624 | drm_atomic_helper_cleanup_planes(dev, state); | 2624 | drm_atomic_helper_cleanup_planes(dev, state); |
2625 | 2625 | ||
2626 | drm_atomic_state_put(state); | 2626 | drm_atomic_state_put(state); |