]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/nouveau/kms/gf119-gp10x: push HeadSetControlOutputResource() mthd when encoders...
authorBen Skeggs <bskeggs@redhat.com>
Wed, 8 May 2019 04:54:34 +0000 (14:54 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 14 May 2019 06:58:06 +0000 (16:58 +1000)
HW has error checks in place which check that pixel depth is explicitly
provided on DP, while HDMI has a "default" setting that we use.

In multi-display configurations with identical modelines, but different
protocols (HDMI + DP, in this case), it was possible for the DP head to
get swapped to the head which previously drove the HDMI output, without
updating HeadSetControlOutputResource(), triggering the error check and
hanging the core update.

Reported-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/head.c

index 2e7a0c347ddbea4cf1005d42d18df84b78f33a93..8efb778a3b207a680279aad34619f684e1103c01 100644 (file)
@@ -306,7 +306,7 @@ nv50_head_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *state)
                        asyh->set.or = head->func->or != NULL;
                }
 
-               if (asyh->state.mode_changed)
+               if (asyh->state.mode_changed || asyh->state.connectors_changed)
                        nv50_head_atomic_check_mode(head, asyh);
 
                if (asyh->state.color_mgmt_changed ||