MLK-18106: drm/mxsfb: Fix mxsfb_create_output
authorRobert Chiras <robert.chiras@nxp.com>
Thu, 19 Apr 2018 08:18:18 +0000 (11:18 +0300)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
Since MXSFB driver now also supports a bridge, this object needs to be
passed to the drm_of_find_panel_or_bridge function.
This fixes a bug created during kernel 4.14 rebase process.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
drivers/gpu/drm/mxsfb/mxsfb_out.c

index f42e845..044d5fb 100644 (file)
@@ -86,10 +86,9 @@ static const struct drm_connector_funcs mxsfb_panel_connector_funcs = {
 int mxsfb_create_output(struct drm_device *drm)
 {
        struct mxsfb_drm_private *mxsfb = drm->dev_private;
-       struct drm_panel *panel;
        int ret;
 
-       ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &panel, NULL);
+       ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &mxsfb->panel, &mxsfb->bridge);
        if (ret)
                return ret;