Unverified Commit d2fb8811 authored by Maíra Canal's avatar Maíra Canal
Browse files

drm/v3d: Flush the MMU before we supply more memory to the binner 



We must ensure that the MMU is flushed before we supply more memory to
the binner, otherwise we might end up with invalid MMU accesses by the
GPU.

Fixes: 57692c94 ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+")
Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarIago Toral Quiroga <itoral@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240923141348.2422499-3-mcanal@igalia.com
parent cf1becb7

drivers/gpu/drm/v3d/v3d_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ void v3d_irq_disable(struct v3d_dev *v3d); 
void v3d_irq_reset(struct v3d_dev *v3d);



/* v3d_mmu.c */

int v3d_mmu_flush_all(struct v3d_dev *v3d);

int v3d_mmu_set_page_table(struct v3d_dev *v3d);

void v3d_mmu_insert_ptes(struct v3d_bo *bo);

void v3d_mmu_remove_ptes(struct v3d_bo *bo);

drivers/gpu/drm/v3d/v3d_irq.c

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ v3d_overflow_mem_work(struct work_struct *work) 
	list_add_tail(&bo->unref_head, &v3d->bin_job->render->unref_list);

	spin_unlock_irqrestore(&v3d->job_lock, irqflags);



	v3d_mmu_flush_all(v3d);



	V3D_CORE_WRITE(0, V3D_PTB_BPOA, bo->node.start << V3D_MMU_PAGE_SHIFT);

	V3D_CORE_WRITE(0, V3D_PTB_BPOS, obj->size);

drivers/gpu/drm/v3d/v3d_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#define V3D_PTE_WRITEABLE BIT(29)

#define V3D_PTE_VALID BIT(28)



static int v3d_mmu_flush_all(struct v3d_dev *v3d)

int v3d_mmu_flush_all(struct v3d_dev *v3d)

{

	int ret;