diff options
Diffstat (limited to 'drivers/gpu/drm/sti')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_cursor.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_drv.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_gdp.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hda.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hqvdp.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_mixer.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_tvout.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/sti/sti_vid.c | 1 |
8 files changed, 11 insertions, 3 deletions
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c index 3abb400151ac..4e990299735c 100644 --- a/drivers/gpu/drm/sti/sti_cursor.c +++ b/drivers/gpu/drm/sti/sti_cursor.c @@ -6,6 +6,8 @@ * License terms: GNU General Public License (GPL), version 2 */ +#include <linux/seq_file.h> + #include <drm/drm_atomic.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> 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_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c index ff3d3e7e7704..ff33c38da197 100644 --- a/drivers/gpu/drm/sti/sti_gdp.c +++ b/drivers/gpu/drm/sti/sti_gdp.c @@ -5,6 +5,7 @@ * for STMicroelectronics. * License terms: GNU General Public License (GPL), version 2 */ +#include <linux/seq_file.h> #include <drm/drm_atomic.h> #include <drm/drm_fb_cma_helper.h> diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index ec0d017eaf1a..f7d3464cdf09 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -8,6 +8,7 @@ #include <linux/component.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/seq_file.h> #include <drm/drmP.h> #include <drm/drm_atomic_helper.h> diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c index e05b0dc523ff..1edec29b9e45 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c @@ -7,6 +7,7 @@ #include <linux/component.h> #include <linux/firmware.h> #include <linux/reset.h> +#include <linux/seq_file.h> #include <drm/drm_atomic.h> #include <drm/drm_fb_cma_helper.h> diff --git a/drivers/gpu/drm/sti/sti_mixer.c b/drivers/gpu/drm/sti/sti_mixer.c index e7425c38fc93..aed7801b51f7 100644 --- a/drivers/gpu/drm/sti/sti_mixer.c +++ b/drivers/gpu/drm/sti/sti_mixer.c @@ -5,6 +5,7 @@ * for STMicroelectronics. * License terms: GNU General Public License (GPL), version 2 */ +#include <linux/seq_file.h> #include "sti_compositor.h" #include "sti_mixer.h" diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c index 2c99016443e5..f983db5a59da 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c @@ -12,6 +12,7 @@ #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/reset.h> +#include <linux/seq_file.h> #include <drm/drmP.h> #include <drm/drm_crtc_helper.h> diff --git a/drivers/gpu/drm/sti/sti_vid.c b/drivers/gpu/drm/sti/sti_vid.c index 5a2c5dc3687b..523ed19f5ac6 100644 --- a/drivers/gpu/drm/sti/sti_vid.c +++ b/drivers/gpu/drm/sti/sti_vid.c @@ -3,6 +3,7 @@ * Author: Fabien Dessenne <fabien.dessenne@st.com> for STMicroelectronics. * License terms: GNU General Public License (GPL), version 2 */ +#include <linux/seq_file.h> #include <drm/drmP.h> |