2 files changed, 103 insertions, 0 deletions

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 990a1519f968..4c78648ad1d1 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -553,6 +553,62 @@ static const struct venus_resources msm8916_res = {
 	.fwname = "qcom/venus-1.8/venus.mdt",
 };
 
+static const struct freq_tbl msm8939_freq_table[] = {
+	{ 489600, 266670000 }, /* HEVC 1080p 60fps */
+	{ 244800, 133330000 }, /* HEVC 1080p 30fps */
+	{ 220800, 133330000 }, /* HEVC 720p 60fps */
+	{ 108000, 133330000 }, /* HEVC 720p 30fps */
+	{  72000, 133330000 }, /* HEVC VGA 60fps */
+	{  36000, 133330000 }, /* HEVC VGA 30 fps */
+};
+
+static const struct reg_val msm8939_reg_preset[] = {
+	{ 0xe0020, 0x0aaaaaaa },
+	{ 0xe0024, 0x0aaaaaaa },
+	{ 0x80124, 0x00000003 },
+};
+
+static const struct bw_tbl msm8939_bw_table_enc[] = {
+	{ 1387725, 2577408, 0, 0, 0 },	/* HEVC 1080p 60fps */
+	{  693863,  644403, 0, 0, 0 },	/* HEVC 1080p 30fps */
+	{  612250, 1288704, 0, 0, 0 },	/* HEVC 720p 60fps */
+	{  306074,  644403, 0, 0, 0 },	/* HEVC 720p 30fps */
+	{  204083, 1288704, 0, 0, 0 },	/* HEVC VGA 60fps */
+	{  101991,  644403, 0, 0, 0 },	/* HEVC VGA 30 fps */
+};
+
+static const struct bw_tbl msm8939_bw_table_dec[] = {
+	{ 1306624, 2291405, 0, 0, 0 },	/* HEVC 1080p 60fps */
+	{  653312,  572826, 0, 0, 0 },	/* HEVC 1080p 30fps */
+	{  576410, 1145754, 0, 0, 0 },	/* HEVC 720p 60fps */
+	{  288256,  572826, 0, 0, 0 },	/* HEVC 720p 30fps */
+	{  192103, 1145754, 0, 0, 0 },	/* HEVC VGA 60fps */
+	{  96051,   572826, 0, 0, 0 },	/* HEVC VGA 30 fps */
+};
+
+static const struct venus_resources msm8939_res = {
+	.freq_tbl = msm8939_freq_table,
+	.freq_tbl_size = ARRAY_SIZE(msm8939_freq_table),
+	.reg_tbl = msm8939_reg_preset,
+	.reg_tbl_size = ARRAY_SIZE(msm8939_reg_preset),
+	.bw_tbl_enc = msm8939_bw_table_enc,
+	.bw_tbl_enc_size = ARRAY_SIZE(msm8939_bw_table_enc),
+	.bw_tbl_dec = msm8939_bw_table_dec,
+	.bw_tbl_dec_size = ARRAY_SIZE(msm8939_bw_table_dec),
+	.clks = { "core", "iface", "bus", },
+	.clks_num = 3,
+	.vcodec0_clks = { "vcodec0_core" },
+	.vcodec1_clks = { "vcodec1_core" },
+	.vcodec_clks_num = 1,
+	.max_load = 489600, /* 1080p @ 30 + 1080p @ 30 */
+	.hfi_version = HFI_VERSION_1XX,
+	.vmem_id = VIDC_RESOURCE_NONE,
+	.vmem_size = 0,
+	.vmem_addr = 0,
+	.dma_mask = 0xddc00000 - 1,
+	.fwname = "qcom/venus-1.8/venus.mdt",
+};
+
 static const struct freq_tbl msm8996_freq_table[] = {
 	{ 1944000, 520000000 },	/* 4k UHD @ 60 (decode only) */
 	{  972000, 520000000 },	/* 4k UHD @ 30 */
@@ -878,6 +934,7 @@ static const struct venus_resources sc7280_res = {
 
 static const struct of_device_id venus_dt_match[] = {
 	{ .compatible = "qcom,msm8916-venus", .data = &msm8916_res, },
+	{ .compatible = "qcom,msm8939-venus", .data = &msm8939_res, },
 	{ .compatible = "qcom,msm8996-venus", .data = &msm8996_res, },
 	{ .compatible = "qcom,sdm660-venus", .data = &sdm660_res, },
 	{ .compatible = "qcom,sdm845-venus", .data = &sdm845_res, },
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index 48c9084bb4db..0ef5251099c3 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -322,10 +322,56 @@ static int core_power_v1(struct venus_core *core, int on)
 	return ret;
 }
 
+static int vdec_get_v1(struct device *dev)
+{
+	struct venus_core *core = dev_get_drvdata(dev);
+
+	return vcodec_clks_get(core, dev, core->vcodec0_clks,
+			       core->res->vcodec0_clks);
+}
+
+static int vdec_power_v1(struct device *dev, int on)
+{
+	struct venus_core *core = dev_get_drvdata(dev);
+	int ret = 0;
+
+	if (on == POWER_ON)
+		ret = vcodec_clks_enable(core, core->vcodec0_clks);
+	else
+		vcodec_clks_disable(core, core->vcodec0_clks);
+
+	return ret;
+}
+
+static int venc_get_v1(struct device *dev)
+{
+	struct venus_core *core = dev_get_drvdata(dev);
+
+	return vcodec_clks_get(core, dev, core->vcodec1_clks,
+			       core->res->vcodec1_clks);
+}
+
+static int venc_power_v1(struct device *dev, int on)
+{
+	struct venus_core *core = dev_get_drvdata(dev);
+	int ret = 0;
+
+	if (on == POWER_ON)
+		ret = vcodec_clks_enable(core, core->vcodec1_clks);
+	else
+		vcodec_clks_disable(core, core->vcodec1_clks);
+
+	return ret;
+}
+
 static const struct venus_pm_ops pm_ops_v1 = {
 	.core_get = core_get_v1,
 	.core_put = core_put_v1,
 	.core_power = core_power_v1,
+	.vdec_get = vdec_get_v1,
+	.vdec_power = vdec_power_v1,
+	.venc_get = venc_get_v1,
+	.venc_power = venc_power_v1,
 	.load_scale = load_scale_v1,
 };