summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/t30/channel_t30.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/tegra/host/t30/channel_t30.c')
-rw-r--r--drivers/video/tegra/host/t30/channel_t30.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/t30/channel_t30.c b/drivers/video/tegra/host/t30/channel_t30.c
index 1c529d396457..ef346181c0c7 100644
--- a/drivers/video/tegra/host/t30/channel_t30.c
+++ b/drivers/video/tegra/host/t30/channel_t30.c
@@ -29,6 +29,7 @@
#include "../t20/syncpt_t20.h"
#include "../3dctx_common.h"
#include "3dctx_t30.h"
+#include "../t20/mpectx_t20.h"
#include "scale3d.h"
#define NVMODMUTEX_2D_FULL (1)
@@ -130,9 +131,11 @@ const struct nvhost_channeldesc nvhost_t30_channelmap[] = {
BIT(NVSYNCPT_MPE_WR_SAFE),
.waitbases = BIT(NVWAITBASE_MPE),
.class = NV_VIDEO_ENCODE_MPEG_CLASS_ID,
+ .waitbasesync = true,
.exclusive = true,
.keepalive = true,
.module = {
+ .prepare_poweroff = nvhost_mpectx_prepare_power_off,
.clocks = {{"mpe", UINT_MAX}, {"emc", UINT_MAX}, {} },
.powergate_ids = {TEGRA_POWERGATE_MPE, -1},
NVHOST_DEFAULT_CLOCKGATE_DELAY,
@@ -159,6 +162,8 @@ static inline int t30_nvhost_hwctx_handler_init(
{
if (strcmp(module, "gr3d") == 0)
return t30_nvhost_3dctx_handler_init(h);
+ else if (strcmp(module, "mpe") == 0)
+ return t20_nvhost_mpectx_handler_init(h);
return 0;
}