Skip to content

Commit 69a4299

Browse files
committed
drm/panthor: Relax the constraints on the tiler chunk size
The field used to store the chunk size if 12 bits wide, and the encoding is chunk_size = chunk_header.chunk_size << 12, which gives us a theoretical [4k:8M] range. This range is further limited by implementation constraints, and all known implementations seem to impose a [128k:8M] range, so do the same here. We also relax the power-of-two constraint, which doesn't seem to exist on v10. This will allow userspace to fine-tune initial/max tiler memory on memory-constrained devices. v4: - Actually fix the range in the kerneldoc v3: - Add R-bs - Fix valid range in the kerneldoc v2: - Turn the power-of-two constraint into a page-aligned constraint to allow fine-tune of the initial/max heap memory size - Fix the panthor_heap_create() kerneldoc Fixes: 9cca48f ("drm/panthor: Add the heap logical block") Signed-off-by: Boris Brezillon <[email protected]> Reviewed-by: Liviu Dudau <[email protected]> Reviewed-by: Steven Price <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent e3193f0 commit 69a4299

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

drivers/gpu/drm/panthor/panthor_heap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ int panthor_heap_destroy(struct panthor_heap_pool *pool, u32 handle)
253253
* @pool: Pool to instantiate the heap context from.
254254
* @initial_chunk_count: Number of chunk allocated at initialization time.
255255
* Must be at least 1.
256-
* @chunk_size: The size of each chunk. Must be a power of two between 256k
257-
* and 2M.
256+
* @chunk_size: The size of each chunk. Must be page-aligned and lie in the
257+
* [128k:8M] range.
258258
* @max_chunks: Maximum number of chunks that can be allocated.
259259
* @target_in_flight: Maximum number of in-flight render passes.
260260
* @heap_ctx_gpu_va: Pointer holding the GPU address of the allocated heap
@@ -284,8 +284,8 @@ int panthor_heap_create(struct panthor_heap_pool *pool,
284284
if (initial_chunk_count > max_chunks)
285285
return -EINVAL;
286286

287-
if (hweight32(chunk_size) != 1 ||
288-
chunk_size < SZ_256K || chunk_size > SZ_2M)
287+
if (!IS_ALIGNED(chunk_size, PAGE_SIZE) ||
288+
chunk_size < SZ_128K || chunk_size > SZ_8M)
289289
return -EINVAL;
290290

291291
down_read(&pool->lock);

include/uapi/drm/panthor_drm.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,11 @@ struct drm_panthor_tiler_heap_create {
898898
/** @initial_chunk_count: Initial number of chunks to allocate. Must be at least one. */
899899
__u32 initial_chunk_count;
900900

901-
/** @chunk_size: Chunk size. Must be a power of two at least 256KB large. */
901+
/**
902+
* @chunk_size: Chunk size.
903+
*
904+
* Must be page-aligned and lie in the [128k:8M] range.
905+
*/
902906
__u32 chunk_size;
903907

904908
/**

0 commit comments

Comments
 (0)