[Intel-gfx] [PATCH v3 00/10] Clean-up Xe FBC additions

Jouni Högander jouni.hogander at intel.com
Fri Jun 2 10:39:18 UTC 2023


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.

v3:
  - Move all the ifdef removals to fixup patch
  - Revert as necessary instead of modifying
  - intel_gt_fence_count -> intel_gt_legacy_fencing_support
  - Add !WARN_ON(1) to i915_gem_stolen defines that are not supposed to be
    used in case of Xe
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 (10):
  Revert "drm/i915/display: Make FBC check stolen at use time."
  Revert "drm/i915/fbc: set compressed_fb to NULL on error"
  Revert "drm/i915/display: Implement FBC support"
  fixup! drm/i915/display: Remaining changes to make xe compile
  drm/i915: Move stolen memory handling into i915_gem_stolen
  drm/xe: Xe stolen memory handling for fbc support
  drm/xe: Add i915_gem.h compatibility header
  drm/i915/fbc: Make FBC check stolen at use time
  drm/i915/fbc: Moved fence related code away from intel_fbc
  drm/xe: Add Xe implementation for fence checks used by fbc code

 drivers/gpu/drm/i915/display/intel_fbc.c      | 139 ++++--------------
 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 |   3 +
 .../gpu/drm/xe/compat-i915-headers/i915_gem.h |   9 ++
 .../xe/compat-i915-headers/i915_gem_stolen.h  |  79 ++++++++++
 .../gpu/drm/xe/compat-i915-headers/i915_vma.h |   2 +
 .../xe/compat-i915-headers/intel_gt_types.h   |  11 ++
 10 files changed, 188 insertions(+), 112 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

-- 
2.34.1



More information about the Intel-gfx mailing list