mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From f91d0382b735a3d7711f6b160d80627cd4be54af Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Thu, 7 Feb 2019 15:26:13 -0800
|
|
Subject: [PATCH] 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;
|