From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [i-g-t V4 08/46] lib/intel_batchbuffer: Update intel-bb docs
Date: Fri, 28 Apr 2023 11:37:40 +0530 [thread overview]
Message-ID: <20230428060818.2446308-9-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20230428060818.2446308-1-bhanuprakash.modem@intel.com>
From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
After RANDOM pseudo-allocator was removed and RELOC allocator becomed
stateful docs stays intact and documents old code. Fix this before
adding xe code.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
---
lib/intel_batchbuffer.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 7dbd6dd58..306b7650e 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -836,7 +836,7 @@ static inline uint64_t __intel_bb_get_offset(struct intel_bb *ibb,
* @allocator_type: allocator type, must be INTEL_ALLOCATOR_NONE for relocations
*
* intel-bb assumes it will work in one of two modes - with relocations or
- * with using allocator (currently RANDOM and SIMPLE are implemented).
+ * with using allocator (currently RELOC and SIMPLE are implemented).
* Some description is required to describe how they maintain the addresses.
*
* Before entering into each scenarios generic rule is intel-bb keeps objects
@@ -854,10 +854,10 @@ static inline uint64_t __intel_bb_get_offset(struct intel_bb *ibb,
*
* This mode is valid only for ppgtt. Addresses are acquired from allocator
* and softpinned. intel-bb cache must be then coherent with allocator
- * (simple is coherent, random is not due to fact we don't keep its state).
+ * (simple is coherent, reloc partially [doesn't support address reservation]).
* When we do intel-bb reset with purging cache it has to reacquire addresses
* from allocator (allocator should return same address - what is true for
- * simple allocator and false for random as mentioned before).
+ * simple and reloc allocators).
*
* If we do reset without purging caches we use addresses from intel-bb cache
* during execbuf objects construction.
@@ -967,7 +967,7 @@ __intel_bb_create(int fd, uint32_t ctx, const intel_ctx_cfg_t *cfg,
* @size: size of the batchbuffer
* @start: allocator vm start address
* @end: allocator vm start address
- * @allocator_type: allocator type, SIMPLE, RANDOM, ...
+ * @allocator_type: allocator type, SIMPLE, RELOC, ...
* @strategy: allocation strategy
*
* Creates bb with context passed in @ctx, size in @size and allocator type
@@ -1280,8 +1280,9 @@ void intel_bb_reset(struct intel_bb *ibb, bool purge_objects_cache)
gem_close(ibb->fd, ibb->handle);
ibb->handle = gem_create(ibb->fd, ibb->size);
- /* Keep address for bb in reloc mode and RANDOM allocator */
- if (ibb->allocator_type == INTEL_ALLOCATOR_SIMPLE)
+ /* Reacquire offset for RELOC and SIMPLE */
+ if (ibb->allocator_type == INTEL_ALLOCATOR_SIMPLE ||
+ ibb->allocator_type == INTEL_ALLOCATOR_RELOC)
ibb->batch_offset = __intel_bb_get_offset(ibb,
ibb->handle,
ibb->size,
--
2.40.0
next prev parent reply other threads:[~2023-04-28 6:13 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-28 6:07 [igt-dev] [i-g-t V4 00/46] Add IGT display support for XE Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 01/46] lib/xe_ioctl: Add missing header for direct resolving Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 02/46] lib/xe_query: Add region helpers and missing doc Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 03/46] lib/xe_query: Remove commented out function prototype Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 04/46] lib/intel_allocator: Add allocator support for Xe Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 05/46] lib/drmtest: Add driver enum for i915/xe Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 06/46] lib/intel_bufops: Add Xe support in bufops Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 07/46] lib/intel_batchbuffer: Rename i915 -> fd as preparation step for xe Bhanuprakash Modem
2023-04-28 6:07 ` Bhanuprakash Modem [this message]
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 09/46] lib/intel_batchbuffer: Add Xe support in intel-bb Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 10/46] tests/xe_intel_bb: Check if intel-bb Xe support correctness Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 11/46] tests/xe-fast-feedback: Add xe_intel_bb test to BAT Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 12/46] lib/gpgpu_fill: Use RENDER engine flag to work on Xe Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 13/46] tests/xe_gpgpu_fill: Exercise gpgpu fill " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 14/46] lib/igt_fb: For xe assume vram is used on discrete Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 15/46] lib/igt_draw: Pass region while building intel_buf from flink Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 16/46] tests/kms_big_fb: Deduce region for xe framebuffer Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 17/46] lib/igt_fb: Add copy engine support for XE Bhanuprakash Modem
2023-04-28 6:50 ` Sharma, Swati2
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 18/46] lib/igt_draw: Add gpu draw routine " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 19/46] tests/i915/kms_big_fb: Add XE support Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 20/46] tests/i915/kms_big_joiner: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 21/46] tests/i915/kms_cdclk: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 22/46] tests/i915/kms_draw_crc: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 23/46] tests/i915/kms_dsc: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 24/46] tests/i915/kms_flip_scaled_crc: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 25/46] tests/i915/kms_flip_tiling: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 26/46] tests/i915/kms_mmap_write_crc: " Bhanuprakash Modem
2023-04-28 6:07 ` [igt-dev] [i-g-t V4 27/46] tests/kms_3d: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 28/46] tests/kms_async_flips: No " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 29/46] tests/kms_atomic_transition: Add " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 30/46] tests/color: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 31/46] tests/kms_concurrent: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 32/46] tests/kms_content_protection: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 33/46] tests/kms_cursor_crc: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 34/46] tests/kms_flip_event_leak: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 35/46] tests/kms_getfb: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 36/46] tests/kms_hdmi_inject: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 37/46] tests/kms_hdr: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 38/46] tests/kms_panel_fitting: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 39/46] tests/kms_plane: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 40/46] tests/kms_plane_lowers: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 41/46] tests/kms_plane_scaling: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 42/46] tests/kms_prime: Use Rendercopy instead of Blit Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 43/46] tests/kms_prime: Add XE support Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 44/46] tests/kms_rotation_crc: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 45/46] tests/kms_setmode: " Bhanuprakash Modem
2023-04-28 6:08 ` [igt-dev] [i-g-t V4 46/46] tests/kms_universal_plane: " Bhanuprakash Modem
2023-04-28 7:21 ` [igt-dev] ✗ Fi.CI.BAT: failure for Add IGT display support for XE (rev7) Patchwork
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=20230428060818.2446308-9-bhanuprakash.modem@intel.com \
--to=bhanuprakash.modem@intel.com \
--cc=igt-dev@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