• Lyude Paul's avatar
    drm/i915: Pass down rc in intel_encoder->compute_config() · 204474a6
    Lyude Paul authored
    Something that I completely missed when implementing the new MST VCPI
    atomic helpers is that with those helpers, there's technically a chance
    of us having to grab additional modeset locks in ->compute_config() and
    furthermore, that means we have the potential to hit a normal modeset
    deadlock. However, because ->compute_config() only returns a bool this
    means we can't return -EDEADLK when we need to drop locks and try again
    which means we end up just failing the atomic check permanently. Whoops.
    
    So, fix this by modifying ->compute_config() to pass down an actual
    error code instead of a bool so that the atomic check can be restarted
    on modeset deadlocks.
    
    Thanks to Ville Syrjälä for pointing this out!
    
    Changes since v1:
    * Add some newlines
    * Return only -EINVAL from hsw_crt_compute_config()
    * Propogate return code from intel_dp_compute_dsc_params()
    * Change all of the intel_dp_compute_link_config*() variants
    * Don't miss if (hdmi_port_clock_valid()) branch in
      intel_hdmi_compute_config()
    
    [Cherry-picked from drm-misc-next to drm-intel-next-queued to fix
     linux-next & drm-tip conflict, while waiting for proper propagation of
     the DP MST series that this commit fixes. In hindsight, a topic branch
     might have been a better approach for it.]
    Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
    Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Fixes: eceae147 ("drm/dp_mst: Start tracking per-port VCPI allocations")
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109320Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20190115200800.3121-1-lyude@redhat.com
    (cherry picked from commit 96550555)
    Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
    Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
    204474a6
intel_crt.c 29.5 KB