Message ID | 20220905085744.29637-1-stanislav.lisovskiy@intel.com (mailing list archive) |
---|---|
Headers | show |
Series | Add DP MST DSC support to i915 | expand |
On Mon, 05 Sep 2022, Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> wrote: > Currently we have only DSC support for DP SST. As discussed elsewhere, the patches were modified while applying to resolve conflicts, leading to further conflicts in drm-tip rebuild, and eventually drm-tip build breakage. They would've created further conflicts in linux-next as well as drm-intel-next feature pull (or drm-next backmerge to drm-intel-next). I've gone ahead and reverted the commits from drm-intel-next directly, with Rodrigo's ack. The conflict resolution would have been messy and generated a bunch of extra work, and we needed to get drm-tip build back on track ASAP. We'll need to have a clean baseline to apply the patches on, i.e. drm-misc-next pull request to drm-next, and drm-next backmerge to drm-intel-next. BR, Jani. > > Stanislav Lisovskiy (4): > drm: Add missing DP DSC extended capability definitions. > drm/i915: Fix intel_dp_mst_compute_link_config > drm/i915: Extract drm_dp_atomic_find_vcpi_slots cycle to separate > function > drm/i915: Add DSC support to MST path > > drivers/gpu/drm/i915/display/intel_dp.c | 73 ++++---- > drivers/gpu/drm/i915/display/intel_dp.h | 17 ++ > drivers/gpu/drm/i915/display/intel_dp_mst.c | 195 ++++++++++++++++++-- > include/drm/display/drm_dp.h | 10 +- > 4 files changed, 237 insertions(+), 58 deletions(-)
On Tue, 06 Sep 2022, Jani Nikula <jani.nikula@intel.com> wrote: > We'll need to have a clean baseline to apply the patches on, i.e. > drm-misc-next pull request to drm-next, and drm-next backmerge to > drm-intel-next. Stan, this is now done, drm-intel-next has the baseline for your changes. Please re-send the series, Cc: dri-devel, and please do get the drm-misc maintainer ack on the first patch before merging. BR, Jani.