2019-09-04 17:01:23 +00:00
|
|
|
From da3b2808835148e309a3e6fd02ca351813d82f1e Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Date: Thu, 7 Feb 2019 15:26:13 -0800
|
2019-09-04 17:01:23 +00:00
|
|
|
Subject: [PATCH 572/782] drm/v3d: Fix BO stats accounting for dma-buf-imported
|
2019-07-09 18:32:28 +00:00
|
|
|
buffers.
|
|
|
|
|
|
|
|
|
|
We always decrement at GEM free, so make sure we increment at GEM
|
|
|
|
|
creation for dma-bufs.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20190207232613.24981-1-eric@anholt.net
|
|
|
|
|
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
|
|
|
(cherry picked from commit cc3f60cfd4f2752f1bad7eaa3839855c15347abc)
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/v3d/v3d_bo.c | 6 ++++++
|
|
|
|
|
1 file changed, 6 insertions(+)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_bo.c
|
|
|
|
|
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
|
|
|
|
|
@@ -282,6 +282,7 @@ v3d_prime_import_sg_table(struct drm_dev
|
|
|
|
|
struct dma_buf_attachment *attach,
|
|
|
|
|
struct sg_table *sgt)
|
|
|
|
|
{
|
|
|
|
|
+ struct v3d_dev *v3d = to_v3d_dev(dev);
|
|
|
|
|
struct drm_gem_object *obj;
|
|
|
|
|
struct v3d_bo *bo;
|
|
|
|
|
|
|
|
|
|
@@ -296,6 +297,11 @@ v3d_prime_import_sg_table(struct drm_dev
|
|
|
|
|
obj->import_attach = attach;
|
|
|
|
|
v3d_bo_get_pages(bo);
|
|
|
|
|
|
|
|
|
|
+ mutex_lock(&v3d->bo_lock);
|
|
|
|
|
+ v3d->bo_stats.num_allocated++;
|
|
|
|
|
+ v3d->bo_stats.pages_allocated += obj->size >> PAGE_SHIFT;
|
|
|
|
|
+ mutex_unlock(&v3d->bo_lock);
|
|
|
|
|
+
|
|
|
|
|
v3d_mmu_insert_ptes(bo);
|
|
|
|
|
|
|
|
|
|
return obj;
|
