Merge v5.3-rc1 into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / panfrost / panfrost_gem.c

diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c
index 590d378fab1b8233e1d0c2f07820cf42f4f11686..543ab1b81bd5cfdc474c22ed618531adeb492cff 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_gem.c
+++ b/drivers/gpu/drm/panfrost/panfrost_gem.c
@@ -19,7 +19,8 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)
        struct panfrost_gem_object *bo = to_panfrost_bo(obj);
        struct panfrost_device *pfdev = obj->dev->dev_private;
 
-       panfrost_mmu_unmap(bo);
+       if (bo->is_mapped)
+               panfrost_mmu_unmap(bo);
 
        spin_lock(&pfdev->mm_lock);
        drm_mm_remove_node(&bo->node);