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/bridge/tc358764.c | |
parent | Merge tag 'amd-drm-next-5.7-2020-02-26' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
parent | drm/virtio: add virtio_gpu_is_shmem helper (diff) | |
download | linux-dev-60347451ddb0646c1a9cc5b9581e5bcf648ad1aa.tar.xz linux-dev-60347451ddb0646c1a9cc5b9581e5bcf648ad1aa.zip |
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/bridge/tc358764.c')
-rw-r--r-- | drivers/gpu/drm/bridge/tc358764.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c index 96207fcfde19..283e4a8dd923 100644 --- a/drivers/gpu/drm/bridge/tc358764.c +++ b/drivers/gpu/drm/bridge/tc358764.c @@ -349,12 +349,18 @@ static void tc358764_enable(struct drm_bridge *bridge) dev_err(ctx->dev, "error enabling panel (%d)\n", ret); } -static int tc358764_attach(struct drm_bridge *bridge) +static int tc358764_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) { struct tc358764 *ctx = bridge_to_tc358764(bridge); struct drm_device *drm = bridge->dev; int ret; + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { + DRM_ERROR("Fix bridge driver to make connector optional!"); + return -EINVAL; + } + ctx->connector.polled = DRM_CONNECTOR_POLL_HPD; ret = drm_connector_init(drm, &ctx->connector, &tc358764_connector_funcs, |