[PATCH 1/5] Revert "drm/bridge: Fix a NULL pointer dereference in drm_atomic_bridge_chain_check()"
Boris Brezillon
boris.brezillon at collabora.com
Tue Jan 7 16:11:51 UTC 2020
This reverts commit b18398c16e176513502f962b642f89225039ef1f.
---
drivers/gpu/drm/drm_bridge.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c
index 32d43bfeeca1..37400607e9b7 100644
--- a/drivers/gpu/drm/drm_bridge.c
+++ b/drivers/gpu/drm/drm_bridge.c
@@ -938,19 +938,15 @@ int drm_atomic_bridge_chain_check(struct drm_bridge *bridge,
struct drm_connector_state *conn_state)
{
struct drm_connector *conn = conn_state->connector;
- struct drm_encoder *encoder;
+ struct drm_encoder *encoder = bridge->encoder;
struct drm_bridge *iter;
int ret;
- if (!bridge)
- return 0;
-
ret = drm_atomic_bridge_chain_select_bus_fmts(bridge, crtc_state,
conn_state);
if (ret)
return ret;
- encoder = bridge->encoder;
list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) {
int ret;
--
2.23.0
More information about the dri-devel
mailing list