mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +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>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 8011a92f6eabd682e62e268bcd80b45ce3f06af4 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Tue, 16 Oct 2018 10:13:41 -0700
|
|
Subject: [PATCH] drm/v3d: Don't try to set OVRTMUOUT on V3D 4.x.
|
|
|
|
The old field is gone and the register now has a different field,
|
|
QRMAXCNT for how many TMU requests get serviced before thread switch.
|
|
We were accidentally reducing it from its default of 0x3 (4 requests)
|
|
to 0x0 (1).
|
|
|
|
v2: Skip setting the reg at all on 4.x, instead of trying to update
|
|
only the old field.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_gem.c | 3 ++-
|
|
drivers/gpu/drm/v3d/v3d_regs.h | 2 ++
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_gem.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
|
|
@@ -25,7 +25,8 @@ v3d_init_core(struct v3d_dev *v3d, int c
|
|
* type. If you want the default behavior, you can still put
|
|
* "2" in the indirect texture state's output_type field.
|
|
*/
|
|
- V3D_CORE_WRITE(core, V3D_CTL_MISCCFG, V3D_MISCCFG_OVRTMUOUT);
|
|
+ if (v3d->ver < 40)
|
|
+ V3D_CORE_WRITE(core, V3D_CTL_MISCCFG, V3D_MISCCFG_OVRTMUOUT);
|
|
|
|
/* Whenever we flush the L2T cache, we always want to flush
|
|
* the whole thing.
|
|
--- a/drivers/gpu/drm/v3d/v3d_regs.h
|
|
+++ b/drivers/gpu/drm/v3d/v3d_regs.h
|
|
@@ -216,6 +216,8 @@
|
|
# define V3D_IDENT2_BCG_INT BIT(28)
|
|
|
|
#define V3D_CTL_MISCCFG 0x00018
|
|
+# define V3D_CTL_MISCCFG_QRMAXCNT_MASK V3D_MASK(3, 1)
|
|
+# define V3D_CTL_MISCCFG_QRMAXCNT_SHIFT 1
|
|
# define V3D_MISCCFG_OVRTMUOUT BIT(0)
|
|
|
|
#define V3D_CTL_L2CACTL 0x00020
|