diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-08-28 10:52:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-08-28 10:52:34 +1000 |
| commit | c2b2f02a02c3ee46ebb7f16adc3749fb145494d7 (patch) | |
| tree | dd91b50428ac038e546b09ecc18fab189d91773a /drivers/gpu/drm/drm_dp_mst_topology.c | |
| parent | Merge tag 'amd-drm-fixes-5.9-2020-08-26' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff) | |
| parent | drm/omap: fix incorrect lock state (diff) | |
| download | linux-dev-c2b2f02a02c3ee46ebb7f16adc3749fb145494d7.tar.xz linux-dev-c2b2f02a02c3ee46ebb7f16adc3749fb145494d7.zip | |
Merge tag 'drm-misc-fixes-2020-08-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Fixes for v5.9-rc2:
- Take modeset bkl for legacy drivers.
- Allow null crtc in dp_mst.
- Omap locking state fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/7af1e52a-27de-8edc-d0b2-e23b01e8bc96@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_dp_mst_topology.c')
| -rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index b23cb2fec3f3..67dd72ea200e 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -5040,8 +5040,8 @@ int drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_state *state, struct drm crtc = conn_state->crtc; - if (WARN_ON(!crtc)) - return -EINVAL; + if (!crtc) + continue; if (!drm_dp_mst_dsc_aux_for_port(pos->port)) continue; |