diff options
| author |   Maxime Ripard <maxime.ripard@bootlin.com> | 2019-02-19 11:17:05 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-02-19 11:17:05 +0100 |
| commit | ae6ba10d5090fc7e9095eaef3dcf06ba016725a6 (patch) | |
| tree | e631eaa2df52712783acc4d757841da4890c4143 /drivers/gpu/drm/drm_atomic_uapi.c | |
| parent | drm: Remove set but not used variable 'gem' (diff) | |
| parent | Merge v5.0-rc7 into drm-next (diff) | |
| download | wireguard-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.tar.xz wireguard-linux-ae6ba10d5090fc7e9095eaef3dcf06ba016725a6.zip | |
Merge drm/drm-next into drm-misc-next
Backmerge drm-next to bring in -rc7
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_uapi.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_uapi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index defc03a9cd1c..0aabd401d3ca 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1296,12 +1296,11 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, (arg->flags & DRM_MODE_PAGE_FLIP_EVENT)) return -EINVAL; - drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); - state = drm_atomic_state_alloc(dev); if (!state) return -ENOMEM; + drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE); state->acquire_ctx = &ctx; state->allow_modeset = !!(arg->flags & DRM_MODE_ATOMIC_ALLOW_MODESET); |