Skip to content

Commit

Permalink
media: venus: core: Add sdm660 DT compatible and resource struct
Browse files Browse the repository at this point in the history
Add the SDM660 DT compatible and its resource structure in order
to support the Venus IP in SDM630, SDM636, SDM660 and SDA variants.

This SoC features Venus 4.4 (HFI3XX) with only one subcore, used
for both encoding and decoding, and switched on with one main and
one subcore dedicated GDSC.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  • Loading branch information
AngeloGioacchino Del Regno authored and mchehab committed Oct 21, 2021
1 parent 96fbc6c commit 57c3b9f
Showing 1 changed file with 64 additions and 0 deletions.
64 changes: 64 additions & 0 deletions drivers/media/platform/qcom/venus/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,69 @@ static const struct venus_resources msm8996_res = {
.fwname = "qcom/venus-4.2/venus.mdt",
};

static const struct freq_tbl sdm660_freq_table[] = {
{ 979200, 518400000 },
{ 489600, 441600000 },
{ 432000, 404000000 },
{ 244800, 320000000 },
{ 216000, 269330000 },
{ 108000, 133330000 },
};

static const struct reg_val sdm660_reg_preset[] = {
{ 0x80010, 0x001f001f },
{ 0x80018, 0x00000156 },
{ 0x8001c, 0x00000156 },
};

static const struct bw_tbl sdm660_bw_table_enc[] = {
{ 979200, 1044000, 0, 2446336, 0 }, /* 4k UHD @ 30 */
{ 864000, 887000, 0, 2108416, 0 }, /* 720p @ 240 */
{ 489600, 666000, 0, 1207296, 0 }, /* 1080p @ 60 */
{ 432000, 578000, 0, 1058816, 0 }, /* 720p @ 120 */
{ 244800, 346000, 0, 616448, 0 }, /* 1080p @ 30 */
{ 216000, 293000, 0, 534528, 0 }, /* 720p @ 60 */
{ 108000, 151000, 0, 271360, 0 }, /* 720p @ 30 */
};

static const struct bw_tbl sdm660_bw_table_dec[] = {
{ 979200, 2365000, 0, 1892000, 0 }, /* 4k UHD @ 30 */
{ 864000, 1978000, 0, 1554000, 0 }, /* 720p @ 240 */
{ 489600, 1133000, 0, 895000, 0 }, /* 1080p @ 60 */
{ 432000, 994000, 0, 781000, 0 }, /* 720p @ 120 */
{ 244800, 580000, 0, 460000, 0 }, /* 1080p @ 30 */
{ 216000, 501000, 0, 301000, 0 }, /* 720p @ 60 */
{ 108000, 255000, 0, 202000, 0 }, /* 720p @ 30 */
};

static const struct venus_resources sdm660_res = {
.freq_tbl = sdm660_freq_table,
.freq_tbl_size = ARRAY_SIZE(sdm660_freq_table),
.reg_tbl = sdm660_reg_preset,
.reg_tbl_size = ARRAY_SIZE(sdm660_reg_preset),
.bw_tbl_enc = sdm660_bw_table_enc,
.bw_tbl_enc_size = ARRAY_SIZE(sdm660_bw_table_enc),
.bw_tbl_dec = sdm660_bw_table_dec,
.bw_tbl_dec_size = ARRAY_SIZE(sdm660_bw_table_dec),
.clks = {"core", "iface", "bus", "bus_throttle" },
.clks_num = 4,
.vcodec0_clks = { "vcodec0_core" },
.vcodec1_clks = { "vcodec0_core" },
.vcodec_clks_num = 1,
.vcodec_num = 1,
.max_load = 1036800,
.hfi_version = HFI_VERSION_3XX,
.vmem_id = VIDC_RESOURCE_NONE,
.vmem_size = 0,
.vmem_addr = 0,
.cp_start = 0,
.cp_size = 0x79000000,
.cp_nonpixel_start = 0x1000000,
.cp_nonpixel_size = 0x28000000,
.dma_mask = 0xd9000000 - 1,
.fwname = "qcom/venus-4.4/venus.mdt",
};

static const struct freq_tbl sdm845_freq_table[] = {
{ 3110400, 533000000 }, /* 4096x2160@90 */
{ 2073600, 444000000 }, /* 4096x2160@60 */
Expand Down Expand Up @@ -793,6 +856,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,msm8996-venus", .data = &msm8996_res, },
{ .compatible = "qcom,sdm660-venus", .data = &sdm660_res, },
{ .compatible = "qcom,sdm845-venus", .data = &sdm845_res, },
{ .compatible = "qcom,sdm845-venus-v2", .data = &sdm845_res_v2, },
{ .compatible = "qcom,sc7180-venus", .data = &sc7180_res, },
Expand Down

0 comments on commit 57c3b9f

Please sign in to comment.