diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-10-03 09:24:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-27 11:39:12 +0300 |
| commit | 2dfc9e7240eeef4d0880cbcf07591604afcae3b5 (patch) | |
| tree | 35426e8ec163c5d7bafd89ebe33e02d73a17c315 /drivers | |
| parent | 7b89d147cb3a26c162a853fcfc5ebc2b7ca07264 (diff) | |
| download | linux-2dfc9e7240eeef4d0880cbcf07591604afcae3b5.tar.xz | |
drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards
commit 227f66d2f9954f68375736af62ebcd73c6754d69 upstream.
Reported-by: Woody Suwalski <terraluna977@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 3d35ea3e95db..92ff3e4ca013 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -3281,11 +3281,14 @@ nv50_mstm = { void nv50_mstm_service(struct nv50_mstm *mstm) { - struct drm_dp_aux *aux = mstm->mgr.aux; + struct drm_dp_aux *aux = mstm ? mstm->mgr.aux : NULL; bool handled = true; int ret; u8 esi[8] = {}; + if (!aux) + return; + while (handled) { ret = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8); if (ret != 8) { |