Skip to content

Clean-up Xe FBC additions

Jouni Högander intel-xe 4 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest posting 2/210 patches 0 repliesNew
  2. v3 posting 1/22 of 10 patches 1 replySuperseded
  3. v29 patches 5 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v19 patches0 repliesSuperseded

Changes in v3 from the cover letter

- 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

Patches in v3 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10Revert "drm/i915/display: Make FBC check stolen at use time."drivers/gpu/drm/i915/display/intel_fbc.c+0 -90 replies
2/10Revert "drm/i915/fbc: set compressed_fb to NULL on error"drivers/gpu/drm/i915/display/intel_fbc.c+1 -10 replies
3/10Revert "drm/i915/display: Implement FBC support"drivers/gpu/drm/i915/display/intel_fbc.c+20 -610 replies
4/10fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_fbc.c+4 -430 replies
5/10drm/i915: Move stolen memory handling into i915_gem_stolendrivers/gpu/drm/i915/display/intel_fbc.c drivers/gpu/drm/i915/gem/i915_gem_stolen.c drivers/gpu/drm/i915/gem/i915_gem_stolen.h+73 -210 replies
6/10drm/xe: Xe stolen memory handling for fbc supportdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h+80 -00 replies
7/10drm/xe: Add i915_gem.h compatibility headerdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h+10 -00 replies
8/10drm/i915/fbc: Make FBC check stolen at use timedrivers/gpu/drm/i915/display/intel_fbc.c+5 -30 replies
9/10drm/i915/fbc: Moved fence related code away from intel_fbcdrivers/gpu/drm/i915/display/intel_fbc.c drivers/gpu/drm/i915/gt/intel_gt_types.h drivers/gpu/drm/i915/i915_vma.h+13 -60 replies
10/10drm/xe: Add Xe implementation for fence checks used by fbc codedrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h drivers/gpu/drm/xe/compat-i915-headers/intel_gt_types.h+14 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [Intel-xe] [PATCH v3 00/10] Clean-up Xe FBC additions

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 <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Rodrigo Vivi <[email protected]>

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
Signature · 1 line
2.34.1