aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_drv.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-05-31 16:14:43 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2018-09-03 09:13:29 -0400
commitd96aaada55553b9e4264a2f2c8cc9599f027cd28 (patch)
tree3b11a16ffa29042aa5403199b4de68248cdd2b9f /drivers/gpu/drm/omapdrm/omap_drv.c
parent70f9cbfc56a3239ff65796e024b4bbf653d1e0ba (diff)
drm/omap: Pass both output and display omap_dss_device to encoder init
The drm_encoder implementation requires access to the omap_dss_device corresponding to the display, which is passed to its initialization function and stored internally. Clean up of the HDMI mode and infoframe handling will require access to the output omap_dss_device. To prepare for that, pass it to the encoder initialization function and store it internally as well. 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_drv.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 0cca16c323d9..174bf498f4e5 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -318,7 +318,7 @@ static int omap_modeset_init(struct drm_device *dev)
318 struct drm_encoder *encoder; 318 struct drm_encoder *encoder;
319 struct drm_crtc *crtc; 319 struct drm_crtc *crtc;
320 320
321 encoder = omap_encoder_init(dev, display); 321 encoder = omap_encoder_init(dev, pipe->output, display);
322 if (!encoder) 322 if (!encoder)
323 return -ENOMEM; 323 return -ENOMEM;
324 324