On Mon, 11 Apr 2022, Imre Deak <imre.deak@xxxxxxxxx> wrote: > Hi Rodrigo, Jani, TL;DR, all done, for details read on. ;) > On Mon, Apr 04, 2022 at 04:38:42PM +0300, Imre Deak wrote: >> This is a rebased version of patches 15-17 of [1], adding DG2 display >> engine support for decompressing render and media compressed >> framebuffers. >> >> The dependency patches from [1] should be merged already to drm-tip. >> >> It addresses the review comments on the modifier layout description from >> Nanley, updates the commit logs vs. flat CCS and Tile4 and splits out >> the changes adding the modifiers to drm_fourcc.h to separate patches. >> >> [1] https://patchwork.freedesktop.org/series/95686/ >> >> Cc: Anshuman Gupta <anshuman.gupta@xxxxxxxxx> >> Cc: Ramalingam C <ramalingam.c@xxxxxxxxx> >> Cc: Radhakrishna Sripada <radhakrishna.sripada@xxxxxxxxx> >> Cc: Matt Roper <matthew.d.roper@xxxxxxxxx> >> Cc: Mika Kahola <mika.kahola@xxxxxxxxx> >> Cc: Juha-Pekka Heikkilä <juha-pekka.heikkila@xxxxxxxxx> >> Cc: Nanley Chery <nanley.g.chery@xxxxxxxxx> > > I'd like to push this patchset to drm-intel-next, but it depends on > https://patchwork.freedesktop.org/patch/475167/?series=100419&rev=1 Please reference commits, looking that up is just an extra step for me. > which is only in drm-intel-gt-next. According to Joonas, this should be > resolved by backmerging drm-intel-gt-next to drm-intel-next, could you > help with this? To set the record straight, we don't crossmerge drm-intel-gt-next to drm-intel-next. The other direction is possible. These are the valid merges: drm-intel-next -> drm-next feature pull drm-intel-gt-next -> drm-next feature pull drm-next -> drm-intel-next backmerge drm-next -> drm-intel-gt-next backmerge drm-intel-next -> drm-intel-gt-next crossmerge topic/* -> * topic merge Anyway, drm-intel-gt-next with the commit in question 5e3094cfd9fb ("drm/i915/xehpsdv: Add has_flat_ccs to device info") has already been merged to drm-next and -rc1. I've done a backmerge and pushed it out. Because we don't do drm-intel-gt-next -> drm-intel-next crossmerges, it might be better to apply things like feature flags to drm-intel-next, because the route from gt back to drm-intel-next is longer. I might be prudent to trigger a retest with the new baseline before merging. BR, Jani. > >> Anshuman Gupta (1): >> drm/i915/dg2: Add support for DG2 clear color compression >> >> Matt Roper (2): >> drm/fourcc: Introduce format modifiers for DG2 render and media >> compression >> drm/i915/dg2: Add support for DG2 render and media compression >> >> Mika Kahola (1): >> drm/fourcc: Introduce format modifier for DG2 clear color >> >> drivers/gpu/drm/i915/display/intel_display.c | 4 +- >> drivers/gpu/drm/i915/display/intel_fb.c | 53 +++++++++++++++---- >> .../drm/i915/display/skl_universal_plane.c | 49 +++++++++++++---- >> include/uapi/drm/drm_fourcc.h | 36 +++++++++++++ >> 4 files changed, 122 insertions(+), 20 deletions(-) >> >> -- >> 2.30.2 >> -- Jani Nikula, Intel Open Source Graphics Center
