diff options
-rw-r--r-- | drivers/gpu/drm/tegra/drm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 2be88eb0cb83..71a52f4e688b 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c | |||
@@ -74,7 +74,7 @@ static void tegra_atomic_work(struct work_struct *work) | |||
74 | } | 74 | } |
75 | 75 | ||
76 | static int tegra_atomic_commit(struct drm_device *drm, | 76 | static int tegra_atomic_commit(struct drm_device *drm, |
77 | struct drm_atomic_state *state, bool async) | 77 | struct drm_atomic_state *state, bool nonblock) |
78 | { | 78 | { |
79 | struct tegra_drm *tegra = drm->dev_private; | 79 | struct tegra_drm *tegra = drm->dev_private; |
80 | int err; | 80 | int err; |
@@ -83,7 +83,7 @@ static int tegra_atomic_commit(struct drm_device *drm, | |||
83 | if (err) | 83 | if (err) |
84 | return err; | 84 | return err; |
85 | 85 | ||
86 | /* serialize outstanding asynchronous commits */ | 86 | /* serialize outstanding nonblocking commits */ |
87 | mutex_lock(&tegra->commit.lock); | 87 | mutex_lock(&tegra->commit.lock); |
88 | flush_work(&tegra->commit.work); | 88 | flush_work(&tegra->commit.work); |
89 | 89 | ||
@@ -95,7 +95,7 @@ static int tegra_atomic_commit(struct drm_device *drm, | |||
95 | 95 | ||
96 | drm_atomic_helper_swap_state(drm, state); | 96 | drm_atomic_helper_swap_state(drm, state); |
97 | 97 | ||
98 | if (async) | 98 | if (nonblock) |
99 | tegra_atomic_schedule(tegra, state); | 99 | tegra_atomic_schedule(tegra, state); |
100 | else | 100 | else |
101 | tegra_atomic_complete(tegra, state); | 101 | tegra_atomic_complete(tegra, state); |