We test for whether the bridge is atomic in several places in the source
code, so let's consolidate them.

Suggested-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
 drivers/gpu/drm/drm_bridge.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 
5bdce9db4475c9699bec11b1e4c0615af028b33d..ef98e21dc593f38a2d3c67b850032ece38bec5e8
 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -279,10 +279,15 @@ drm_bridge_atomic_destroy_priv_state(struct 
drm_private_obj *obj,
 static const struct drm_private_state_funcs drm_bridge_priv_state_funcs = {
        .atomic_duplicate_state = drm_bridge_atomic_duplicate_priv_state,
        .atomic_destroy_state = drm_bridge_atomic_destroy_priv_state,
 };
 
+static bool drm_bridge_is_atomic(struct drm_bridge *bridge)
+{
+       return bridge->funcs->atomic_reset != NULL;
+}
+
 /**
  * drm_bridge_attach - attach the bridge to an encoder's chain
  *
  * @encoder: DRM encoder
  * @bridge: bridge to attach
@@ -331,11 +336,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct 
drm_bridge *bridge,
                ret = bridge->funcs->attach(bridge, encoder, flags);
                if (ret < 0)
                        goto err_reset_bridge;
        }
 
-       if (bridge->funcs->atomic_reset) {
+       if (drm_bridge_is_atomic(bridge)) {
                struct drm_bridge_state *state;
 
                state = bridge->funcs->atomic_reset(bridge);
                if (IS_ERR(state)) {
                        ret = PTR_ERR(state);
@@ -376,11 +381,11 @@ void drm_bridge_detach(struct drm_bridge *bridge)
                return;
 
        if (WARN_ON(!bridge->dev))
                return;
 
-       if (bridge->funcs->atomic_reset)
+       if (drm_bridge_is_atomic(bridge))
                drm_atomic_private_obj_fini(&bridge->base);
 
        if (bridge->funcs->detach)
                bridge->funcs->detach(bridge);
 

-- 
2.48.1

Reply via email to