From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>
Subject: [Intel-xe] [PATCH v2 3/5] drm/xe: Xe stolen memory handling for fbc support
Date: Thu, 31 Aug 2023 12:51:52 +0300 [thread overview]
Message-ID: <20230831095154.3121578-4-jouni.hogander@intel.com> (raw)
In-Reply-To: <20230831095154.3121578-1-jouni.hogander@intel.com>
Add Xe stolen memory handling for fbc.
v3:
- v2: Add parenthesis around parameter in i915_gem_stolen_node_allocated
v2:
- define i915_gem_stolen_area_address/size as !WARN_ON(1)
- squash common type addition into this patch
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
| 1 +
| 79 +++++++++++++++++++
2 files changed, 80 insertions(+)
create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h
--git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
index d629fd48a14c..6607c5a374cc 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
@@ -15,6 +15,7 @@
#include "xe_bo.h"
#include "xe_pm.h"
#include "xe_step.h"
+#include "i915_gem_stolen.h"
#include "i915_reg_defs.h"
#include "i915_utils.h"
#include "intel_uncore.h"
--git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h
new file mode 100644
index 000000000000..32f60258ded6
--- /dev/null
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h
@@ -0,0 +1,79 @@
+#ifndef _I915_GEM_OBJECT_H_
+#define _I915_GEM_OBJECT_H_
+
+#include "xe_ttm_stolen_mgr.h"
+#include "xe_res_cursor.h"
+
+struct xe_bo;
+
+struct i915_stolen_fb {
+ struct xe_bo *bo;
+};
+
+static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe,
+ struct i915_stolen_fb *fb,
+ u32 size, u32 align,
+ u32 start, u32 end)
+{
+ struct xe_bo *bo;
+ int err;
+ u32 flags = XE_BO_CREATE_PINNED_BIT | XE_BO_CREATE_STOLEN_BIT;
+
+ bo = xe_bo_create_locked_range(xe, xe_device_get_root_tile(xe),
+ NULL, size, start, end,
+ ttm_bo_type_kernel, flags);
+ if (IS_ERR(bo)) {
+ err = PTR_ERR(bo);
+ bo = NULL;
+ return err;
+ }
+ err = xe_bo_pin(bo);
+ xe_bo_unlock_vm_held(bo);
+
+ if (err) {
+ xe_bo_put(fb->bo);
+ bo = NULL;
+ }
+
+ fb->bo = bo;
+
+ return err;
+}
+
+static inline int i915_gem_stolen_insert_node(struct xe_device *xe,
+ struct i915_stolen_fb *fb,
+ u32 size, u32 align)
+{
+ /* Not used on xe */
+ BUG_ON(1);
+ return -ENODEV;
+}
+
+static inline void i915_gem_stolen_remove_node(struct xe_device *xe,
+ struct i915_stolen_fb *fb)
+{
+ xe_bo_unpin_map_no_vm(fb->bo);
+ fb->bo = NULL;
+}
+
+#define i915_gem_stolen_initialized(xe) (!!ttm_manager_type(&(xe)->ttm, XE_PL_STOLEN))
+#define i915_gem_stolen_node_allocated(fb) (!!((fb)->bo))
+
+static inline u32 i915_gem_stolen_node_offset(struct i915_stolen_fb *fb)
+{
+ struct xe_res_cursor res;
+
+ xe_res_first(fb->bo->ttm.resource, 0, 4096, &res);
+ return res.start;
+}
+
+/* Used for < gen4. These are not supported by Xe */
+#define i915_gem_stolen_area_address(xe) (!WARN_ON(1))
+/* Used for gen9 specific WA. Gen9 is not supported by Xe */
+#define i915_gem_stolen_area_size(xe) (!WARN_ON(1))
+
+#define i915_gem_stolen_node_address(xe, fb) (xe_ttm_stolen_gpu_offset(xe) + \
+ i915_gem_stolen_node_offset(fb))
+#define i915_gem_stolen_node_size(fb) ((u64)((fb)->bo->ttm.base.size))
+
+#endif
--
2.34.1
next prev parent reply other threads:[~2023-08-31 9:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 9:51 [Intel-xe] [PATCH v2 0/5] FBC refactoring Jouni Högander
2023-08-31 9:51 ` [Intel-xe] [PATCH v2 1/5] Revert "drm/i915/display: Implement FBC support" Jouni Högander
2023-08-31 9:51 ` [Intel-xe] [PATCH v2 2/5] fixup! drm/i915/display: Remaining changes to make xe compile Jouni Högander
2023-08-31 9:51 ` Jouni Högander [this message]
2023-08-31 9:51 ` [Intel-xe] [PATCH v2 4/5] drm/xe: Add i915_gem.h compatibility header Jouni Högander
2023-08-31 9:51 ` [Intel-xe] [PATCH v2 5/5] drm/xe: Add Xe implementation for fence checks used by fbc code Jouni Högander
2023-08-31 12:38 ` [Intel-xe] ✓ CI.Patch_applied: success for FBC refactoring (rev3) Patchwork
2023-08-31 12:39 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-08-31 12:40 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-08-31 12:47 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-08-31 12:47 ` [Intel-xe] ✗ CI.Hooks: failure " Patchwork
2023-08-31 12:47 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-08-31 13:21 ` [Intel-xe] ✓ CI.BAT: success " Patchwork
2023-09-12 16:22 ` [Intel-xe] [PATCH v2 0/5] FBC refactoring Maarten Lankhorst
2023-09-14 5:40 ` Hogander, Jouni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831095154.3121578-4-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox