Commit 0b9bcf9a authored by Ariel D'Alessandro's avatar Ariel D'Alessandro Committed by Steven Price
Browse files

drm/panfrost: Use GPU_MMU_FEATURES_VA_BITS/PA_BITS macros 



As done in panthor, define and use these GPU_MMU_FEATURES_* macros,
which makes code easier to read and reuse.

Signed-off-by: default avatarAriel D'Alessandro <ariel.dalessandro@collabora.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarAdrián Larumbe <adrian.larumbe@collabora.com>
Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Link: https://lore.kernel.org/r/20250324185801.168664-3-ariel.dalessandro@collabora.com
parent f91e534f

drivers/gpu/drm/panfrost/panfrost_mmu.c

+4 −2
Original line number Diff line number Diff line
@@ -615,6 +615,8 @@ static void panfrost_drm_mm_color_adjust(const struct drm_mm_node *node, 


struct panfrost_mmu *panfrost_mmu_ctx_create(struct panfrost_device *pfdev)

{

	u32 va_bits = GPU_MMU_FEATURES_VA_BITS(pfdev->features.mmu_features);

	u32 pa_bits = GPU_MMU_FEATURES_PA_BITS(pfdev->features.mmu_features);

	struct panfrost_mmu *mmu;



	mmu = kzalloc(sizeof(*mmu), GFP_KERNEL);
@@ -633,8 +635,8 @@ struct panfrost_mmu *panfrost_mmu_ctx_create(struct panfrost_device *pfdev) 


	mmu->pgtbl_cfg = (struct io_pgtable_cfg) {

		.pgsize_bitmap	= SZ_4K | SZ_2M,

		.ias		= FIELD_GET(0xff, pfdev->features.mmu_features),

		.oas		= FIELD_GET(0xff00, pfdev->features.mmu_features),

		.ias		= va_bits,

		.oas		= pa_bits,

		.coherent_walk	= pfdev->coherent,

		.tlb		= &mmu_tlb_ops,

		.iommu_dev	= pfdev->dev,

drivers/gpu/drm/panfrost/panfrost_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#define   GROUPS_L2_COHERENT		BIT(0)	/* Cores groups are l2 coherent */



#define GPU_MMU_FEATURES		0x014	/* (RO) MMU features */

#define  GPU_MMU_FEATURES_VA_BITS(x)	((x) & GENMASK(7, 0))

#define  GPU_MMU_FEATURES_PA_BITS(x)	(((x) >> 8) & GENMASK(7, 0))

#define GPU_AS_PRESENT			0x018	/* (RO) Address space slots present */

#define GPU_JS_PRESENT			0x01C	/* (RO) Job slots present */