• Ville Syrjälä's avatar
    drm/i915: Handle -EDEADLK from ironlake_check_fdi_lanes() · 8e2b4dff
    Ville Syrjälä authored
    ironlake_check_fdi_lanes() may try to grab some extra crtc locks.
    If that fails we need to propagate the -EDEADLK all the way up,
    and we shouldn't dump out the crtc state or other debug messages
    either since it wasn't the crtc state that caused the failure.
    
    Just hit this on my IVB:
    [drm:intel_atomic_check [i915]] checking fdi config on pipe C, lanes 3
    [drm:intel_atomic_check [i915]] only 2 lanes on pipe C: required 3 lanes
    [drm:intel_atomic_check [i915]] fdi link bw constraint, reducing pipe bpp to 18
    [drm:intel_atomic_check [i915]] checking fdi config on pipe C, lanes 2
    [drm:intel_atomic_check [i915]] CRTC bw constrained, retrying
    [drm:intel_dp_compute_config [i915]] DP link computation with max lane count 4 max rate 270000 max bpp 18 pixel clock 185580KHz
    [drm:intel_dp_compute_config [i915]] DP lane count 4 clock 162000 bpp 18
    [drm:intel_dp_compute_config [i915]] DP link rate required 417555 available 648000
    [drm:intel_atomic_check [i915]] checking fdi config on pipe C, lanes 2
    WARNING: CPU: 4 PID: 25115 at ../drivers/gpu/drm/drm_modeset_lock.c:241 drm_modeset_lock+0xbc/0xd0 [drm]
    ...
    WARNING: CPU: 4 PID: 25115 at ../drivers/gpu/drm/drm_modeset_lock.c:223 drm_modeset_drop_locks+0x4a/0x50 [drm]
    
    The warnings are from 'WARN_ON(ctx->contended)'.
    Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20181107213522.17590-1-ville.syrjala@linux.intel.comReviewed-by: default avatarImre Deak <imre.deak@intel.com>
    8e2b4dff
intel_display.c 457 KB