diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-03-06 23:37:25 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 16:13:28 +0300 |
| commit | 00b30e794ffc3bd8f4c6dc357fe7e881ae6e5373 (patch) | |
| tree | 8c87b3ae781cfaac16701fed52f8e7113e50fc35 /drivers/gpu/drm/omapdrm/omap_crtc.c | |
| parent | 3be0f15bd6e94aa17a571020704bde413342e8eb (diff) | |
drm/omap: Pass pipe pointer to omap_crtc_init()
Replace the dss display device pointer by a pipe pointer that will allow
the omap_crtc_init() function to access both the display and the DSS
output. As a result we can remove the omapdss_device_get_dispc_channel()
function that is now unneeded.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index f5bf553a862f..f5bdb8de98f4 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -693,7 +693,8 @@ void omap_crtc_pre_uninit(struct omap_drm_private *priv) /* initialize crtc */ struct drm_crtc *omap_crtc_init(struct drm_device *dev, - struct drm_plane *plane, struct omap_dss_device *dssdev) + struct omap_drm_pipeline *pipe, + struct drm_plane *plane) { struct omap_drm_private *priv = dev->dev_private; struct drm_crtc *crtc = NULL; @@ -701,7 +702,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, enum omap_channel channel; int ret; - channel = omapdss_device_get_dispc_channel(dssdev); + channel = pipe->output->dispc_channel; DBG("%s", channel_names[channel]); @@ -724,7 +725,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, &omap_crtc_funcs, NULL); if (ret < 0) { dev_err(dev->dev, "%s(): could not init crtc for: %s\n", - __func__, dssdev->name); + __func__, pipe->display->name); kfree(omap_crtc); return ERR_PTR(ret); } |