Skip to contentSkip to conversation

Clean-up Xe FBC additions

PATCH Superseded Jouni Högander 1 participant 4 messages Jun 2, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v3 cover 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
#1 lore raw

PATCH v3 1/10 Revert "drm/i915/display: Make FBC check stolen at use time."

This reverts commit 21e4ad64271f79f821e808a3a84bc145f4c5b2cb.

As a part of clean-up we want to revert this patch and introduce required changes as a set of patches.

---
 drivers/gpu/drm/i915/display/intel_fbc.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +0 -9
index 0e8e899f596b..0a9b081c18b8 100644
@@ -1134,13 +1134,6 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
 	if (!fbc)
 		return 0;
 
-#ifndef I915
-	if (!i915_gem_stolen_initialized(i915)) {
-		plane_state->no_fbc_reason = "stolen memory not initialised";
-		return 0;
-	}
-#endif
-
 	if (intel_vgpu_active(i915)) {
 		plane_state->no_fbc_reason = "VGPU active";
 		return 0;
@@ -1794,10 +1787,8 @@ void intel_fbc_init(struct drm_i915_private *i915)
 {
 	enum intel_fbc_id fbc_id;
 
-#ifdef I915
 	if (!i915_gem_stolen_initialized(i915))
 		RUNTIME_INFO(i915)->fbc_mask = 0;
-#endif
 
 	if (need_fbc_vtd_wa(i915))
 		RUNTIME_INFO(i915)->fbc_mask = 0;
Signature · 1 line
2.34.1
#2 lore raw

PATCH v3 2/10 Revert "drm/i915/fbc: set compressed_fb to NULL on error"

In reply to Jouni Högander

This reverts commit a85e885ec8004b465d477a37ef6dd3ea4e714bef.

As a part of clean-up we want to revert this patch and introduce required changes as a set of patches.

---
 drivers/gpu/drm/i915/display/intel_fbc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
index 0a9b081c18b8..3dc9620552e9 100644
@@ -76,7 +76,7 @@ static int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, struct xe_
 					ttm_bo_type_kernel, flags);
 	if (IS_ERR(*bo)) {
 		err = PTR_ERR(*bo);
-		*bo = NULL;
+		bo = NULL;
 		return err;
 	}
 	err = xe_bo_pin(*bo);
Signature · 1 line
2.34.1
#3 lore raw
In reply to Jouni Högander

Hello,

Sent this to wrong mailing list. Please ignore. Full set now sent to [email protected]. Sorry for the inconvenience.

BR,

Jouni Högander

Quoted 51 lines · Jouni Högander

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