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

Commit e48f9f16 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm/omap: Store CRTC lookup by channel table in omap_drm_private 



The omap_crtcs global array is used to store pointers to omap_crtc
indexed by DISPC channel number, in order to look them up in the dss_mgr
operations. Store the information in the omap_drm_private structure in
the form of an array of omap_drm_pipeline pointers.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 00b30e79

drivers/gpu/drm/omapdrm/omap_crtc.c

+9 −13
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ int omap_crtc_wait_pending(struct drm_crtc *crtc) 
 */



/* ovl-mgr-id -> crtc */

static struct omap_crtc *omap_crtcs[8];

static struct omap_dss_device *omap_crtc_output[8];



/* we can probably ignore these until we support command-mode panels: */
@@ -215,7 +214,8 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable) 
static int omap_crtc_dss_enable(struct omap_drm_private *priv,

				enum omap_channel channel)

{

	struct omap_crtc *omap_crtc = omap_crtcs[channel];

	struct drm_crtc *crtc = priv->channels[channel]->crtc;

	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);



	priv->dispc_ops->mgr_set_timings(priv->dispc, omap_crtc->channel,

					 &omap_crtc->vm);
@@ -227,7 +227,8 @@ static int omap_crtc_dss_enable(struct omap_drm_private *priv, 
static void omap_crtc_dss_disable(struct omap_drm_private *priv,

				  enum omap_channel channel)

{

	struct omap_crtc *omap_crtc = omap_crtcs[channel];

	struct drm_crtc *crtc = priv->channels[channel]->crtc;

	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);



	omap_crtc_set_enabled(&omap_crtc->base, false);

}
@@ -236,7 +237,9 @@ static void omap_crtc_dss_set_timings(struct omap_drm_private *priv, 
		enum omap_channel channel,

		const struct videomode *vm)

{

	struct omap_crtc *omap_crtc = omap_crtcs[channel];

	struct drm_crtc *crtc = priv->channels[channel]->crtc;

	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);



	DBG("%s", omap_crtc->name);

	omap_crtc->vm = *vm;

}
@@ -245,7 +248,8 @@ static void omap_crtc_dss_set_lcd_config(struct omap_drm_private *priv, 
		enum omap_channel channel,

		const struct dss_lcd_mgr_config *config)

{

	struct omap_crtc *omap_crtc = omap_crtcs[channel];

	struct drm_crtc *crtc = priv->channels[channel]->crtc;

	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);



	DBG("%s", omap_crtc->name);

	priv->dispc_ops->mgr_set_lcd_config(priv->dispc, omap_crtc->channel,
@@ -681,8 +685,6 @@ static const char *channel_names[] = { 


void omap_crtc_pre_init(struct omap_drm_private *priv)

{

	memset(omap_crtcs, 0, sizeof(omap_crtcs));



	dss_install_mgr_ops(priv->dss, &mgr_ops, priv);

}
@@ -706,10 +708,6 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, 


	DBG("%s", channel_names[channel]);



	/* Multiple displays on same channel is not allowed */

	if (WARN_ON(omap_crtcs[channel] != NULL))

		return ERR_PTR(-EINVAL);



	omap_crtc = kzalloc(sizeof(*omap_crtc), GFP_KERNEL);

	if (!omap_crtc)

		return ERR_PTR(-ENOMEM);
@@ -748,7 +746,5 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, 


	omap_plane_install_properties(crtc->primary, &crtc->base);



	omap_crtcs[channel] = omap_crtc;



	return crtc;

}

drivers/gpu/drm/omapdrm/omap_drv.c

+19 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ static void omap_disconnect_pipelines(struct drm_device *ddev) 
		pipe->display = NULL;

	}



	memset(&priv->channels, 0, sizeof(priv->channels));



	priv->num_pipes = 0;

}
@@ -186,6 +188,7 @@ static int omap_connect_pipelines(struct drm_device *ddev) 
{

	struct omap_drm_private *priv = ddev->dev_private;

	struct omap_dss_device *output = NULL;

	unsigned int i;

	int r;



	if (!omapdss_stack_is_ready())
@@ -218,6 +221,22 @@ static int omap_connect_pipelines(struct drm_device *ddev) 
	sort(priv->pipes, priv->num_pipes, sizeof(priv->pipes[0]),

	     omap_compare_pipes, NULL);



	/*

	 * Populate the pipeline lookup table by DISPC channel. Only one display

	 * is allowed per channel.

	 */

	for (i = 0; i < priv->num_pipes; ++i) {

		struct omap_drm_pipeline *pipe = &priv->pipes[i];

		enum omap_channel channel = pipe->output->dispc_channel;



		if (WARN_ON(priv->channels[channel] != NULL)) {

			r = -EINVAL;

			goto cleanup;

		}



		priv->channels[channel] = pipe;

	}



	return 0;



cleanup:

drivers/gpu/drm/omapdrm/omap_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct omap_drm_private { 


	unsigned int num_pipes;

	struct omap_drm_pipeline pipes[8];

	struct omap_drm_pipeline *channels[8];



	unsigned int num_planes;

	struct drm_plane *planes[8];