Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab12e88 authored by Linus Walleij's avatar Linus Walleij
Browse files

drm/tve200: Clean up panel bridging 



This makes use of the drm_simple_display_pipe_attach_bridge()
call and removes the two calls removing the bridge, which were
erroneous: they unregister the bridge which is not what
we want, we just want to unreference it and that is already
handled by the core.

Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20170910220801.28588-1-linus.walleij@linaro.org
parent be05fe13

drivers/gpu/drm/tve200/tve200_display.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -333,8 +333,5 @@ int tve200_display_init(struct drm_device *drm) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	/* We need the encoder to attach the bridge */

	priv->encoder = &priv->pipe.encoder;



	return 0;

	return 0;

}
 
}

drivers/gpu/drm/tve200/tve200_drm.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,6 @@ struct tve200_drm_dev_private { 
	struct drm_device *drm;

	struct drm_device *drm;





	struct drm_connector *connector;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	struct drm_panel *panel;

	struct drm_panel *panel;

	struct drm_bridge *bridge;

	struct drm_bridge *bridge;

	struct drm_simple_display_pipe pipe;

	struct drm_simple_display_pipe pipe;

drivers/gpu/drm/tve200/tve200_drv.c

+13 −17
Original line number Original line Diff line number Diff line
@@ -87,6 +87,14 @@ static int tve200_modeset_init(struct drm_device *dev) 
			ret = PTR_ERR(bridge);

			ret = PTR_ERR(bridge);

			goto out_bridge;

			goto out_bridge;

		}

		}

	} else {

		/*

		 * TODO: when we are using a different bridge than a panel

		 * (such as a dumb VGA connector) we need to devise a different

		 * method to get the connector out of the bridge.

		 */

		dev_err(dev->dev, "the bridge is not a panel\n");

		goto out_bridge;

	}

	}





	ret = tve200_display_init(dev);

	ret = tve200_display_init(dev);
@@ -95,21 +103,13 @@ static int tve200_modeset_init(struct drm_device *dev) 
		goto out_bridge;

		goto out_bridge;

	}

	}





	if (bridge) {

	ret = drm_simple_display_pipe_attach_bridge(&priv->pipe,

		ret = drm_bridge_attach(priv->encoder, bridge, NULL);

						    bridge);

		if (ret)

	if (ret) {

		dev_err(dev->dev, "failed to attach bridge\n");

		goto out_bridge;

		goto out_bridge;

	}

	}





	/*

	 * TODO: when we are using a different bridge than a panel

	 * (such as a dumb VGA connector) we need to devise a different

	 * method to get the connector out of the bridge.

	 */

	if (!panel) {

		dev_err(dev->dev, "the bridge is not a panel\n");

		goto out_bridge;

	}

	priv->panel = panel;

	priv->panel = panel;

	priv->connector = panel->connector;

	priv->connector = panel->connector;

	priv->bridge = bridge;

	priv->bridge = bridge;
@@ -138,8 +138,6 @@ static int tve200_modeset_init(struct drm_device *dev) 
out_bridge:

out_bridge:

	if (panel)

	if (panel)

		drm_panel_bridge_remove(bridge);

		drm_panel_bridge_remove(bridge);

	else

		drm_bridge_remove(bridge);

	drm_mode_config_cleanup(dev);

	drm_mode_config_cleanup(dev);

finish:

finish:

	return ret;

	return ret;
@@ -275,8 +273,6 @@ static int tve200_remove(struct platform_device *pdev) 
		drm_fbdev_cma_fini(priv->fbdev);

		drm_fbdev_cma_fini(priv->fbdev);

	if (priv->panel)

	if (priv->panel)

		drm_panel_bridge_remove(priv->bridge);

		drm_panel_bridge_remove(priv->bridge);

	else

		drm_bridge_remove(priv->bridge);

	drm_mode_config_cleanup(drm);

	drm_mode_config_cleanup(drm);

	clk_disable_unprepare(priv->pclk);

	clk_disable_unprepare(priv->pclk);

	drm_dev_unref(drm);

	drm_dev_unref(drm);