diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-09 19:50:30 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-27 11:10:01 +0200 |
commit | 2340c646e6a5da658e114be2f721ff90853588d4 (patch) | |
tree | df9744d2344e71e8c5d1b75c3e1528bc474313fe /target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch | |
parent | 81d0da118694feb874f992093063a2852285d194 (diff) | |
download | upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.gz upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.bz2 upstream-2340c646e6a5da658e114be2f721ff90853588d4.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch b/target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch new file mode 100644 index 0000000000..76905fa165 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0573-drm-v3d-Fix-BO-stats-accounting-for-dma-buf-imported.patch @@ -0,0 +1,40 @@ +From 0e031dc68877a44cc11e2692b3f4b46164330db2 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Thu, 7 Feb 2019 15:26:13 -0800 +Subject: [PATCH 573/773] drm/v3d: Fix BO stats accounting for dma-buf-imported + 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; |