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-0578-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.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-0578-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch b/target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch new file mode 100644 index 0000000000..7bbeec693a --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0578-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch @@ -0,0 +1,42 @@ +From 157d2df805d880b7ba014ae7c89b2d1d90c77bb2 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Tue, 16 Oct 2018 10:13:41 -0700 +Subject: [PATCH 578/773] 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 |