Commit af1110cb authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Tomi Valkeinen
Browse files

drm/omap: dsi: Register a drm_bridge 



In order to integrate with a chain of drm_bridge, the internal DSI
output has to expose its operations through the drm_bridge API.
Register a bridge at initialisation time to do so and remove the
omap_dss_device operations that are now unused.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-41-tomi.valkeinen@ti.com
parent cf64148a

drivers/gpu/drm/omapdrm/dss/dsi.c

+89 −45
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/component.h>

#include <linux/sys_soc.h>



#include <drm/drm_bridge.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_panel.h>

#include <video/mipi_display.h>
@@ -438,6 +439,7 @@ struct dsi_data { 
	struct omap_dss_dsi_videomode_timings vm_timings;



	struct omap_dss_device output;

	struct drm_bridge bridge;

};



struct dsi_packet_sent_handler_data {
@@ -450,6 +452,9 @@ static bool dsi_perf; 
module_param(dsi_perf, bool, 0644);

#endif



#define drm_bridge_to_dsi(bridge) \

	container_of(bridge, struct dsi_data, bridge)



static inline struct dsi_data *to_dsi_data(struct omap_dss_device *dssdev)

{

	return dev_get_drvdata(dssdev->dev);
@@ -5006,50 +5011,7 @@ static int dsi_get_clocks(struct dsi_data *dsi) 
	return 0;

}



static void dsi_set_timings(struct omap_dss_device *dssdev,

			    const struct drm_display_mode *mode)

{

	DSSDBG("dsi_set_timings\n");

	dsi_set_config(dssdev, mode);

}



static int dsi_check_timings(struct omap_dss_device *dssdev,

			     struct drm_display_mode *mode)

{

	struct dsi_data *dsi = to_dsi_data(dssdev);

	struct dsi_clk_calc_ctx ctx;

	int r;



	DSSDBG("dsi_check_timings\n");



	mutex_lock(&dsi->lock);

	r = __dsi_calc_config(dsi, mode, &ctx);

	mutex_unlock(&dsi->lock);



	return r;

}



static int dsi_connect(struct omap_dss_device *src,

		       struct omap_dss_device *dst)

{

	return omapdss_device_connect(dst->dss, dst, dst->next);

}



static void dsi_disconnect(struct omap_dss_device *src,

			   struct omap_dss_device *dst)

{

	omapdss_device_disconnect(dst, dst->next);

}



static const struct omap_dss_device_ops dsi_ops = {

	.connect = dsi_connect,

	.disconnect = dsi_disconnect,

	.enable = dsi_enable_video_outputs,

	.disable = dsi_disable_video_outputs,



	.check_timings = dsi_check_timings,

	.set_timings = dsi_set_timings,



	.dsi = {

		.update = dsi_update_all,

		.is_video_mode = dsi_is_video_mode,
@@ -5389,6 +5351,83 @@ static const struct component_ops dsi_component_ops = { 
	.unbind	= dsi_unbind,

};



/* -----------------------------------------------------------------------------

 * DRM Bridge Operations

 */



static int dsi_bridge_attach(struct drm_bridge *bridge,

			     enum drm_bridge_attach_flags flags)

{

	struct dsi_data *dsi = drm_bridge_to_dsi(bridge);



	if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))

		return -EINVAL;



	return drm_bridge_attach(bridge->encoder, dsi->output.next_bridge,

				 bridge, flags);

}



static enum drm_mode_status

dsi_bridge_mode_valid(struct drm_bridge *bridge,

		      const struct drm_display_info *info,

		      const struct drm_display_mode *mode)

{

	struct dsi_data *dsi = drm_bridge_to_dsi(bridge);

	struct dsi_clk_calc_ctx ctx;

	int r;



	mutex_lock(&dsi->lock);

	r = __dsi_calc_config(dsi, mode, &ctx);

	mutex_unlock(&dsi->lock);



	return r ? MODE_CLOCK_RANGE : MODE_OK;

}



static void dsi_bridge_mode_set(struct drm_bridge *bridge,

				const struct drm_display_mode *mode,

				const struct drm_display_mode *adjusted_mode)

{

	struct dsi_data *dsi = drm_bridge_to_dsi(bridge);



	dsi_set_config(&dsi->output, adjusted_mode);

}



static void dsi_bridge_enable(struct drm_bridge *bridge)

{

	struct dsi_data *dsi = drm_bridge_to_dsi(bridge);



	dsi_enable_video_outputs(&dsi->output);

}



static void dsi_bridge_disable(struct drm_bridge *bridge)

{

	struct dsi_data *dsi = drm_bridge_to_dsi(bridge);



	dsi_disable_video_outputs(&dsi->output);

}



static const struct drm_bridge_funcs dsi_bridge_funcs = {

	.attach = dsi_bridge_attach,

	.mode_valid = dsi_bridge_mode_valid,

	.mode_set = dsi_bridge_mode_set,

	.enable = dsi_bridge_enable,

	.disable = dsi_bridge_disable,

};



static void dsi_bridge_init(struct dsi_data *dsi)

{

	dsi->bridge.funcs = &dsi_bridge_funcs;

	dsi->bridge.of_node = dsi->host.dev->of_node;

	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;



	drm_bridge_add(&dsi->bridge);

}



static void dsi_bridge_cleanup(struct dsi_data *dsi)

{

	drm_bridge_remove(&dsi->bridge);

}



/* -----------------------------------------------------------------------------

 * Probe & Remove, Suspend & Resume

 */
@@ -5398,6 +5437,8 @@ static int dsi_init_output(struct dsi_data *dsi) 
	struct omap_dss_device *out = &dsi->output;

	int r;



	dsi_bridge_init(dsi);



	out->dev = dsi->dev;

	out->id = dsi->module_id == 0 ?

			OMAP_DSS_OUTPUT_DSI1 : OMAP_DSS_OUTPUT_DSI2;
@@ -5412,9 +5453,11 @@ static int dsi_init_output(struct dsi_data *dsi) 
		       | DRM_BUS_FLAG_DE_HIGH

		       | DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;



	r = omapdss_device_init_output(out, NULL);

	if (r < 0)

	r = omapdss_device_init_output(out, &dsi->bridge);

	if (r < 0) {

		dsi_bridge_cleanup(dsi);

		return r;

	}



	omapdss_device_register(out);
@@ -5427,6 +5470,7 @@ static void dsi_uninit_output(struct dsi_data *dsi) 


	omapdss_device_unregister(out);

	omapdss_device_cleanup_output(out);

	dsi_bridge_cleanup(dsi);

}



static int dsi_probe_of(struct dsi_data *dsi)