diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-02-13 07:00:41 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-03-01 02:18:18 -0500 |
commit | d3541ca81dbddeefa0c42df448211a9dbaef0843 (patch) | |
tree | f6a9425fa31c30f7f4597fd6ab48a8a250bf7502 /drivers/gpu/drm/omapdrm/omap_drv.c | |
parent | 72877cf38b4b78fbb3a852f2288d7f2a7af0db22 (diff) |
drm: omapdrm: dss: Store dispc ops in dss_device structure
Remove the global dispc ops variable by storing it in the dss_device
structure.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 003445b70ee7..a93916cd0258 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -520,6 +520,8 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) | |||
520 | DBG("%s", dev_name(dev)); | 520 | DBG("%s", dev_name(dev)); |
521 | 521 | ||
522 | priv->dev = dev; | 522 | priv->dev = dev; |
523 | priv->dss = omapdss_get_dss(); | ||
524 | priv->dispc_ops = dispc_get_ops(priv->dss); | ||
523 | 525 | ||
524 | omap_crtc_pre_init(priv); | 526 | omap_crtc_pre_init(priv); |
525 | 527 | ||
@@ -527,9 +529,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) | |||
527 | if (ret) | 529 | if (ret) |
528 | goto err_crtc_uninit; | 530 | goto err_crtc_uninit; |
529 | 531 | ||
530 | priv->dss = omapdss_get_dss(); | ||
531 | priv->dispc_ops = dispc_get_ops(); | ||
532 | |||
533 | soc = soc_device_match(omapdrm_soc_devices); | 532 | soc = soc_device_match(omapdrm_soc_devices); |
534 | priv->omaprev = soc ? (unsigned int)soc->data : 0; | 533 | priv->omaprev = soc ? (unsigned int)soc->data : 0; |
535 | priv->wq = alloc_ordered_workqueue("omapdrm", 0); | 534 | priv->wq = alloc_ordered_workqueue("omapdrm", 0); |