On Mon, 2022-04-11 at 15:38 +0300, Imre Deak wrote: > Hi Rodrigo, Jani, > > 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 > > 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? +Tvrtko. Jani is taking care of the drm-intel-next this round. Based on our previous experiences with this kind of conflicts I agree with Joonas. I also believe it is a good idea to backmerge the -gt-next when needed. But whenever we do this wee need to be careful when sending the drm-intel-next pull request. We should ideally get the -gt-next pull request merged to drm-next before doing the drm-intel-next PR, so we guarantee it was approved already and we also don't duplicate the commits in the PR. That sad, the PRs will need to be in sync and the window of -gt-next should close a bit earlier on begin of -rc5 in case of an existent backmerge in drm-intel-next... and avoid -rc6 PRs. > > > 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 > >
