[Intel-xe] [PATCH v2 0/9] Clean-up Xe FBC additions

[Hogander, Jouni]

On Tue, 2023-05-30 at 15:52 +0300, Jani Nikula wrote:
> On Tue, 30 May 2023, Jouni Högander <jouni.hogander at intel.com> wrote:
> > This patch set cleans up Xe FBC additions. All stolen memory
> > details are
> > moved to i915_gem_stolen header and source files. Also some fence
> > handling
> > details are move away from FBC code. This allows removing all
> > ifdefs added
> > into fbc code.
> 
> I think all the #ifdef removals should be fixups to
> "drm/i915/display:
> Remaining changes to make xe compile".

Ok, but how do I present patches tackling those ifdefs are supposed to
be applied before "drm/i915/display: Remaining changes to make xe
compile"? Otherwise my fixup patch removing those ifdefs is breaking
the build until patch taking care of that ifdef is in the branch.

> 
> Basically my idea is that the above commit should be reduced to
> minimal
> or non-existent; the remaining or required ifdefs should be added per
> feature on a commit by commit basis, not in one big lump.
> 
> BR,
> Jani.
> 
> > 
> > v2: add missing intel_gt_types.h header
> > 
> > Cc: Jani Nikula <jani.nikula at intel.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > 
> > Jouni Högander (9):
> >   fixup! drm/i915/display: Implement FBC support
> >   drivers/xe: Add new type for compressed fb
> >   drm/i915/fbc: Add common type for compressed fb to avoid ifdefs
> >   drm/xe: Add i915_gem.h compatibility header
> >   drivers/xe: Move Xe stolen memory handling away form fbc code
> >   drm/i915: Move stolen memory handling into i915_gem_stolen
> >   drm/i915/fbc: Stolen initialize can be checked in plane check for
> > i915
> >     as well
> >   drm/i915/fbc: Add function to get number of fences for gt
> >   Add new fence_id and fence count functions
> > 
> >  drivers/gpu/drm/i915/display/intel_fbc.c      | 134 ++++----------
> > ----
> >  drivers/gpu/drm/i915/gem/i915_gem_stolen.c    |  37 +++++
> >  drivers/gpu/drm/i915/gem/i915_gem_stolen.h    |  13 ++
> >  drivers/gpu/drm/i915/gt/intel_gt_types.h      |   2 +
> >  drivers/gpu/drm/i915/i915_vma.h               |   5 +
> >  .../gpu/drm/xe/compat-i915-headers/i915_drv.h |   5 +
> >  .../gpu/drm/xe/compat-i915-headers/i915_gem.h |   9 ++
> >  .../xe/compat-i915-headers/i915_gem_stolen.h  |  76 ++++++++++
> >  .../gpu/drm/xe/compat-i915-headers/i915_vma.h |   2 +
> >  .../xe/compat-i915-headers/intel_gt_types.h   |  11 ++
> >  drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c        |   8 ++
> >  drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h        |   1 +
> >  12 files changed, 194 insertions(+), 109 deletions(-)
> >  create mode 100644 drivers/gpu/drm/xe/compat-i915-
> > headers/i915_gem.h
> >  create mode 100644 drivers/gpu/drm/xe/compat-i915-
> > headers/i915_gem_stolen.h
> >  create mode 100644 drivers/gpu/drm/xe/compat-i915-
> > headers/intel_gt_types.h
>