[Intel-xe] [PATCH 00/15] Destroy 'remaining changes to make xe compile'

Jani Nikula jani.nikula at linux.intel.com
Thu Oct 26 14:02:07 UTC 2023


On Thu, 26 Oct 2023, Maarten Lankhorst <maarten.lankhorst at linux.intel.com> wrote:
> From: Maarten Lankhorst <dev at lankhorst.se>
>
> Revert all pieces one by 1, and fixup the patch until only a small
> amount of changes are left.
>
> Update compat headers for extra definitions, those patches should
> probably be squashed too.

Yeah. Most of these need proper fixup! annotations. (git commit --amend
--fixup=<sha1>)

A handful of patches need to be sent and merged upstream first and then
backported?

BR,
Jani.





>
> Maarten Lankhorst (15):
>   revert fixme in intel_atomic_plane.c
>   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
>   fixup xe i915_drv.h compat header
>   revert intel_frontbuffer changes.
>   Update compat headers.
>   more reverts
>   drm/i915/display: Use i915_gem_object_get_dma_address to get dma
>     address
>   revert more (fbc)
>   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
>   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

-- 
Jani Nikula, Intel


More information about the Intel-xe mailing list