| Message ID | 1461679905-30177-9-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Maarten, Thanks for the patch. Acked-by: Vincent Abriou <vincent.abriou@st.com> On 04/26/2016 04:11 PM, Maarten Lankhorst wrote: > 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> > --- > drivers/gpu/drm/sti/sti_drv.c | 6 +++--- > 1 file 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) > } > > static int sti_atomic_commit(struct drm_device *drm, > - struct drm_atomic_state *state, bool async) > + struct drm_atomic_state *state, bool nonblock) > { > struct sti_private *private = drm->dev_private; > int err; > @@ -211,7 +211,7 @@ static int sti_atomic_commit(struct drm_device *drm, > if (err) > return err; > > - /* serialize outstanding asynchronous commits */ > + /* serialize outstanding nonblocking commits */ > mutex_lock(&private->commit.lock); > flush_work(&private->commit.work); > > @@ -223,7 +223,7 @@ static int sti_atomic_commit(struct drm_device *drm, > > drm_atomic_helper_swap_state(drm, state); > > - if (async) > + if (nonblock) > sti_atomic_schedule(private, state); > else > sti_atomic_complete(private, state); >
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) } static int sti_atomic_commit(struct drm_device *drm, - struct drm_atomic_state *state, bool async) + struct drm_atomic_state *state, bool nonblock) { struct sti_private *private = drm->dev_private; int err; @@ -211,7 +211,7 @@ static int sti_atomic_commit(struct drm_device *drm, if (err) return err; - /* serialize outstanding asynchronous commits */ + /* serialize outstanding nonblocking commits */ mutex_lock(&private->commit.lock); flush_work(&private->commit.work); @@ -223,7 +223,7 @@ static int sti_atomic_commit(struct drm_device *drm, drm_atomic_helper_swap_state(drm, state); - if (async) + if (nonblock) sti_atomic_schedule(private, state); else sti_atomic_complete(private, state);
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> --- drivers/gpu/drm/sti/sti_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)