diff options
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_encoder.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_encoder.c b/drivers/gpu/drm/tilcdc/tilcdc_encoder.c index a34a10337f6a..546fe7e6ee81 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_encoder.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_encoder.c @@ -55,15 +55,12 @@ int tilcdc_encoder_create(struct drm_device *ddev) struct tilcdc_drm_private *priv = ddev_to_tilcdc_priv(ddev); struct tilcdc_encoder *encoder; struct drm_bridge *bridge; - struct drm_panel *panel; - int ret; - ret = drm_of_find_panel_or_bridge(ddev->dev->of_node, 0, 0, - &panel, &bridge); - if (ret == -ENODEV) + bridge = devm_drm_of_get_bridge(ddev->dev, ddev->dev->of_node, 0, 0); + if (PTR_ERR(bridge) == -ENODEV) return 0; - else if (ret) - return ret; + else if (IS_ERR(bridge)) + return PTR_ERR(bridge); encoder = drmm_simple_encoder_alloc(ddev, struct tilcdc_encoder, base, DRM_MODE_ENCODER_NONE); @@ -73,12 +70,5 @@ int tilcdc_encoder_create(struct drm_device *ddev) } priv->encoder = encoder; - if (panel) { - bridge = devm_drm_panel_bridge_add_typed(ddev->dev, panel, - DRM_MODE_CONNECTOR_DPI); - if (IS_ERR(bridge)) - return PTR_ERR(bridge); - } - return tilcdc_attach_bridge(ddev, bridge); } |