diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-02-28 16:21:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-02-28 16:22:41 +1000 |
| commit | 60347451ddb0646c1a9cc5b9581e5bcf648ad1aa (patch) | |
| tree | 73cd9298b66b4a84b0e3f02346202f905f5840bd /drivers/gpu/drm/imx/parallel-display.c | |
| parent | a2ae604da74dcf9ae674d3c03efad80574952800 (diff) | |
| parent | 18b39fb975b79d6526449ca7c8ab504bc92e2825 (diff) | |
| download | linux-60347451ddb0646c1a9cc5b9581e5bcf648ad1aa.tar.bz2 | |
Merge tag 'drm-misc-next-2020-02-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.7
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- bridge: huge rework to get rid of omap_dss custom display drivers
Driver Changes:
- hisilicon: some fixes related to modes it can deal with / default to
- virtio: shmem and gpu context fixes and enhancements
- sun4i: Support for LVDS on the A33
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227113222.cdwzy4cvcqjtbmou@gilmour.lan
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
| -rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 142acff5ab37..08fafa4bf8c2 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -292,7 +292,7 @@ static int imx_pd_register(struct drm_device *drm, DRM_MODE_ENCODER_NONE, NULL); imxpd->bridge.funcs = &imx_pd_bridge_funcs; - drm_bridge_attach(encoder, &imxpd->bridge, NULL); + drm_bridge_attach(encoder, &imxpd->bridge, NULL, 0); if (!imxpd->next_bridge) { drm_connector_helper_add(&imxpd->connector, @@ -307,7 +307,7 @@ static int imx_pd_register(struct drm_device *drm, if (imxpd->next_bridge) { ret = drm_bridge_attach(encoder, imxpd->next_bridge, - &imxpd->bridge); + &imxpd->bridge, 0); if (ret < 0) { dev_err(imxpd->dev, "failed to attach bridge: %d\n", ret); |