diff options
author | Boris Brezillon <boris.brezillon@collabora.com> | 2020-01-07 19:58:07 +0100 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@collabora.com> | 2020-01-08 00:34:34 +0100 |
commit | 09912635230374bdca2aca620d183f1834b3140c (patch) | |
tree | 5f1c735d665cbc85c1932374129b5fba90fbc673 /include/drm/drm_atomic.h | |
parent | b470743bedbacc7552763c0d973abe958aa0ff87 (diff) | |
download | linux-09912635230374bdca2aca620d183f1834b3140c.tar.gz linux-09912635230374bdca2aca620d183f1834b3140c.tar.bz2 linux-09912635230374bdca2aca620d183f1834b3140c.zip |
Revert "drm/bridge: Add a drm_bridge_state object"
This reverts commit 6ed7e9625fa6 ("drm/bridge: Add a drm_bridge_state
object") which introduced a circular dependency between drm.ko and
drm_kms_helper.ko. Looks like the helper/core split is not appropriate
and fixing that is not simple.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200107185807.606999-6-boris.brezillon@collabora.com
Diffstat (limited to 'include/drm/drm_atomic.h')
-rw-r--r-- | include/drm/drm_atomic.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index ccce65e14917..951dfb15c27b 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -670,9 +670,6 @@ __drm_atomic_get_current_plane_state(struct drm_atomic_state *state, } int __must_check -drm_atomic_add_encoder_bridges(struct drm_atomic_state *state, - struct drm_encoder *encoder); -int __must_check drm_atomic_add_affected_connectors(struct drm_atomic_state *state, struct drm_crtc *crtc); int __must_check |