From a31d614845ea55c69a8b62dd255b088030dc65b6 Mon Sep 17 00:00:00 2001 From: Mikko Perttunen Date: Wed, 7 Sep 2022 13:58:35 +0300 Subject: [PATCH] gpu: host1x: Add mlock release code for NVENC/NVJPG Add definitions to allow mlock releasing on recovery for NVENC/NVJPG on Tegra234. Bug 3778105 Signed-off-by: Mikko Perttunen Change-Id: Iea33063b0d71add9fe816d93c96401087a12a657 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2772958 (cherry picked from commit e5f17c5842af24bde32e74d6eb2a61b0d90cae3d) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2772920 Reviewed-by: Jonathan Hunter Tested-by: Jonathan Hunter GVS: Gerrit_Virtual_Submit --- drivers/gpu/host1x/hw/cdma_hw.c | 9 +++++++++ drivers/gpu/host1x/include/linux/host1x-next.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c index 1b65a10b..96f341ad 100644 --- a/drivers/gpu/host1x/hw/cdma_hw.c +++ b/drivers/gpu/host1x/hw/cdma_hw.c @@ -260,6 +260,15 @@ static void timeout_release_mlock(struct host1x_cdma *cdma) case HOST1X_CLASS_NVDEC: offset = HOST1X_COMMON_NVDEC_MLOCK; break; + case HOST1X_CLASS_NVENC: + offset = HOST1X_COMMON_NVENC_MLOCK; + break; + case HOST1X_CLASS_NVJPG: + offset = HOST1X_COMMON_NVJPG_MLOCK; + break; + case HOST1X_CLASS_NVJPG1: + offset = HOST1X_COMMON_NVJPG1_MLOCK; + break; default: WARN(1, "%s was not updated for class %u", __func__, ch->client->class); return; diff --git a/drivers/gpu/host1x/include/linux/host1x-next.h b/drivers/gpu/host1x/include/linux/host1x-next.h index 1538cda5..018ba549 100644 --- a/drivers/gpu/host1x/include/linux/host1x-next.h +++ b/drivers/gpu/host1x/include/linux/host1x-next.h @@ -13,6 +13,7 @@ enum host1x_class { HOST1X_CLASS_HOST1X = 0x1, + HOST1X_CLASS_NVJPG1 = 0x7, HOST1X_CLASS_NVENC = 0x21, HOST1X_CLASS_NVENC1 = 0x22, HOST1X_CLASS_GR2D = 0x51,