[Intel-xe] [PATCH 0/9] Cleaned up revert of remaining changes.

[Hogander, Jouni]

On Fri, 2023-11-03 at 10:05 +0100, Maarten Lankhorst wrote:
> Hey,
> 
> On 2023-11-01 12:45, Hogander, Jouni wrote:
> > On Fri, 2023-10-27 at 13:34 +0200, Maarten Lankhorst wrote:
> > > From: Maarten Lankhorst <dev at lankhorst.se>
> > > 
> > > All reverts are made simpler, and the header updates are squashed
> > > to
> > > a
> > > single commit.
> > > 
> > > This makes reviewing a lot easier.
> > 
> > I took overview of patches 4, 5 and 6. It seems your approach will
> > take
> > care of i915_gem_fence_wait_priority. These three patches should be
> > sent to dri-devel at lists.freedesktop.org (at least patch 4) and
> > intel-gfx at lists.freedesktop.org. I think we could use them in drm-
> > xe-
> > next while waiting for review to complete. I will soon start
> > backporting this from drm-intel-next:
> > 
> > https://patchwork.freedesktop.org/series/125160/
> Noticed this patch. You really only want to wait for USAGE_KERNEL if 
> state->fence is set.
> 
> See drm_gem_plane_helper_prepare_fb.
> 
> Can you fix this up? Else I send a patch on monday.

I already merged this. There was review comment from Ville asking vice
versa:

https://patchwork.freedesktop.org/patch/564991/?series=125160&rev=3

BR,

Jouni Högander

> 
> Cheers,
> ~Maarten
> 
> > Still waiting for CI results there before merging into drm-intel-
> > next.
> > I was originally planning to use i915_compat headers for
> > i915_gem_fence_wait_priority. I think your approach is better. So
> > if
> > it's ok to you I could sent these three patches together with my
> > backport (https://patchwork.freedesktop.org/series/125160/) into
> > intel-
> > xe mailing list. what do you think?
> > 
> > Generally speaking I found this patch set being hard to follow and
> > review. I would expect
> > 
> > 1. "fixup! FIXME: drm/i915/display: Remaining changes to make xe
> > compile"
> > 
> > 2. FIXME: <name for changes split out>
> > 
> > where:
> > 
> > 1. removing changes from FIXME: drm/i915/display: Remaining changes
> > to
> > make xe compile" and 2. introducing same changes as a separate
> > FIXME
> > patch.
> > 
> > BR,
> > 
> > Jouni Högander
> > 
> > 
> > > Maarten Lankhorst (9):
> > >    drm/i915/display: Revert all before remaining changes to make
> > > xe
> > >      compile
> > >    drm/i915/display: Revert remaining changes to make xe compile
> > >    drm/xe: Update headers to be more compatible with i915
> > >    drm/atomic: Add drm_atomic_helper_set_fence_deadline()
> > > function
> > >    drm/i915: Implement fence->set_deadline.
> > >    FIXME drm/i915/display: Use fence->set_deadline to boost
> > > requests
> > >    drm/i915/display: Use i915_gem_object_get_dma_address to get
> > > dma
> > >      address
> > >    FIXME drm/i915/display: Minimal changes to fbdev to make xe
> > > work
> > >    FIXME drm/i915/display: Make intel_fb.c code compatible with
> > > xe
> > > 
> > >   drivers/gpu/drm/drm_atomic_helper.c           |  15 ++-
> > >   .../gpu/drm/i915/display/intel_atomic_plane.c |  70 +++--------
> > > -
> > >   drivers/gpu/drm/i915/display/intel_cursor.c   |  12 +--
> > >   drivers/gpu/drm/i915/display/intel_display.c  |  37 +------
> > >   .../drm/i915/display/intel_display_types.h    |   4 -
> > >   drivers/gpu/drm/i915/display/intel_fb.c       |  89 ++++++-----
> > > -----
> > >   drivers/gpu/drm/i915/display/intel_fbc.c      |  13 ++-
> > >   drivers/gpu/drm/i915/display/intel_fbdev.c    | 100 ++++++-----
> > > -----
> > > --
> > >   .../gpu/drm/i915/display/intel_frontbuffer.c  |   7 +-
> > >   .../gpu/drm/i915/display/intel_frontbuffer.h  |   4 -
> > >   .../drm/i915/display/skl_universal_plane.c    |   4 -
> > >   drivers/gpu/drm/i915/i915_request.c           |   9 ++
> > >   .../compat-i915-headers/gem/i915_gem_lmem.h   |   2 +
> > >   .../compat-i915-headers/gem/i915_gem_mman.h   |  17 +++
> > >   .../compat-i915-headers/gem/i915_gem_object.h |  76
> > > +++++++++++++
> > >   .../gem/i915_gem_object_frontbuffer.h         |   4 +-
> > >   .../gpu/drm/xe/compat-i915-headers/i915_drv.h |   1 +
> > >   .../xe/compat-i915-headers/i915_gem_stolen.h  |  13 ++-
> > >   .../gpu/drm/xe/compat-i915-headers/i915_vma.h |   6 ++
> > >   include/drm/drm_atomic_helper.h               |   3 +-
> > >   20 files changed, 234 insertions(+), 252 deletions(-)
> > >   create mode 100644 drivers/gpu/drm/xe/compat-i915-
> > > headers/gem/i915_gem_lmem.h
> > >   create mode 100644 drivers/gpu/drm/xe/compat-i915-
> > > headers/gem/i915_gem_mman.h
> > >   create mode 100644 drivers/gpu/drm/xe/compat-i915-
> > > headers/gem/i915_gem_object.h
> > > 
> >