[Intel-gfx] [PATCH] drm/i915: Fix intel_dp_atomic_find_vcpi_slots function

Ville Syrjälä ville.syrjala at linux.intel.com
Tue Sep 6 11:57:34 UTC 2022


On Tue, Sep 06, 2022 at 01:23:29PM +0300, Stanislav Lisovskiy wrote:
> drm_dp_atomic_find_vcpi_slots no longer exists and needs
> to be used as drm_dp_atomic_find_time_slots.
> Also rename the function itself.
> 
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
> Fixes: 7ae5ab441402 ("Extract drm_dp_atomic_find_vcpi_slots cycle to separate function")

The problem only exists in drm-tip. You need to revert the 
bad merge from rerere-cache and redo it.

And please always test build drm-tip after solving merge conflicts!

-- 
Ville Syrjälä
Intel


More information about the Intel-gfx mailing list