diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-04-26 10:11:41 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-02 10:36:57 -0400 |
commit | ab575184254c113fa1a8e8653619ec2f08747bbd (patch) | |
tree | 97935a421ea0e108655c76643f5d761580313c08 /drivers/gpu/drm/sti | |
parent | 3302f3586fe0ff7659ebeb4fed9d9a458131354f (diff) |
drm/sti: Rename async to nonblock.
The async name is deprecated and should be changed to nonblocking.
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-9-git-send-email-maarten.lankhorst@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/sti')
-rw-r--r-- | drivers/gpu/drm/sti/sti_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index 6bd6abaa5a70..872495e72294 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c | |||
@@ -202,7 +202,7 @@ static void sti_atomic_work(struct work_struct *work) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | static int sti_atomic_commit(struct drm_device *drm, | 204 | static int sti_atomic_commit(struct drm_device *drm, |
205 | struct drm_atomic_state *state, bool async) | 205 | struct drm_atomic_state *state, bool nonblock) |
206 | { | 206 | { |
207 | struct sti_private *private = drm->dev_private; | 207 | struct sti_private *private = drm->dev_private; |
208 | int err; | 208 | int err; |
@@ -211,7 +211,7 @@ static int sti_atomic_commit(struct drm_device *drm, | |||
211 | if (err) | 211 | if (err) |
212 | return err; | 212 | return err; |
213 | 213 | ||
214 | /* serialize outstanding asynchronous commits */ | 214 | /* serialize outstanding nonblocking commits */ |
215 | mutex_lock(&private->commit.lock); | 215 | mutex_lock(&private->commit.lock); |
216 | flush_work(&private->commit.work); | 216 | flush_work(&private->commit.work); |
217 | 217 | ||
@@ -223,7 +223,7 @@ static int sti_atomic_commit(struct drm_device *drm, | |||
223 | 223 | ||
224 | drm_atomic_helper_swap_state(drm, state); | 224 | drm_atomic_helper_swap_state(drm, state); |
225 | 225 | ||
226 | if (async) | 226 | if (nonblock) |
227 | sti_atomic_schedule(private, state); | 227 | sti_atomic_schedule(private, state); |
228 | else | 228 | else |
229 | sti_atomic_complete(private, state); | 229 | sti_atomic_complete(private, state); |