diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:01:23 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-09-04 19:02:48 +0200 |
| commit | 662394fb30fdbcc89ec387918714aebee6868a9f (patch) | |
| tree | c308c5f1a650abf9d9ccbb2a1747469a0d8570c0 /target/linux/brcm2708/patches-4.19/950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch | |
| parent | 99a5e285887c4a10aaf06d8e01fae0707995da00 (diff) | |
| download | upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.gz upstream-662394fb30fdbcc89ec387918714aebee6868a9f.tar.bz2 upstream-662394fb30fdbcc89ec387918714aebee6868a9f.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-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0577-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-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch b/target/linux/brcm2708/patches-4.19/950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch new file mode 100644 index 0000000000..7dd2fdd13d --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0577-drm-v3d-Don-t-try-to-set-OVRTMUOUT-on-V3D-4.x.patch @@ -0,0 +1,42 @@ +From f56d4ecf8f2b666cf6fc166b1b9b30a9af650d00 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Tue, 16 Oct 2018 10:13:41 -0700 +Subject: [PATCH 577/782] 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 |