diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-25 04:01:22 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-08 08:49:29 -0400 |
commit | 16fece0153d5b6573c3fcb8cfbe483f83ca8eb01 (patch) | |
tree | db0badef9f2ccfd1e3e2d0cdcf97314864c7ede5 | |
parent | 7d902c05b480cc44033dcb56e12e51b082656b42 (diff) |
drm: Nuke drm_atomic_legacy_backoff
Finally all users are gone!
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170725080122.20548-9-daniel.vetter@ffwll.ch
-rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 32 | ||||
-rw-r--r-- | include/drm/drm_atomic.h | 2 |
2 files changed, 0 insertions, 34 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 306fdca92abf..1b755439f591 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c | |||
@@ -1588,38 +1588,6 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state, | |||
1588 | EXPORT_SYMBOL(drm_atomic_add_affected_planes); | 1588 | EXPORT_SYMBOL(drm_atomic_add_affected_planes); |
1589 | 1589 | ||
1590 | /** | 1590 | /** |
1591 | * drm_atomic_legacy_backoff - locking backoff for legacy ioctls | ||
1592 | * @state: atomic state | ||
1593 | * | ||
1594 | * This function should be used by legacy entry points which don't understand | ||
1595 | * -EDEADLK semantics. For simplicity this one will grab all modeset locks after | ||
1596 | * the slowpath completed. | ||
1597 | */ | ||
1598 | void drm_atomic_legacy_backoff(struct drm_atomic_state *state) | ||
1599 | { | ||
1600 | struct drm_device *dev = state->dev; | ||
1601 | int ret; | ||
1602 | bool global = false; | ||
1603 | |||
1604 | if (WARN_ON(dev->mode_config.acquire_ctx == state->acquire_ctx)) { | ||
1605 | global = true; | ||
1606 | |||
1607 | dev->mode_config.acquire_ctx = NULL; | ||
1608 | } | ||
1609 | |||
1610 | retry: | ||
1611 | drm_modeset_backoff(state->acquire_ctx); | ||
1612 | |||
1613 | ret = drm_modeset_lock_all_ctx(dev, state->acquire_ctx); | ||
1614 | if (ret) | ||
1615 | goto retry; | ||
1616 | |||
1617 | if (global) | ||
1618 | dev->mode_config.acquire_ctx = state->acquire_ctx; | ||
1619 | } | ||
1620 | EXPORT_SYMBOL(drm_atomic_legacy_backoff); | ||
1621 | |||
1622 | /** | ||
1623 | * drm_atomic_check_only - check whether a given config would work | 1591 | * drm_atomic_check_only - check whether a given config would work |
1624 | * @state: atomic configuration to check | 1592 | * @state: atomic configuration to check |
1625 | * | 1593 | * |
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 711617fdf032..8a5808eb5628 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h | |||
@@ -545,8 +545,6 @@ int __must_check | |||
545 | drm_atomic_add_affected_planes(struct drm_atomic_state *state, | 545 | drm_atomic_add_affected_planes(struct drm_atomic_state *state, |
546 | struct drm_crtc *crtc); | 546 | struct drm_crtc *crtc); |
547 | 547 | ||
548 | void drm_atomic_legacy_backoff(struct drm_atomic_state *state); | ||
549 | |||
550 | void | 548 | void |
551 | drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret); | 549 | drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret); |
552 | 550 | ||