OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media: venus: core: Fix msm8996 frequency table

Browse Source 
[ Upstream commit c690435ed0 ]

In downstream driver, there are two frequency tables defined,
one for the encoder and one for the decoder:

/* Encoders /
<972000 490000000 0x55555555>, / 4k UHD @ 30 /
<489600 320000000 0x55555555>, / 1080p @ 60 /
<244800 150000000 0x55555555>, / 1080p @ 30 /
<108000 75000000 0x55555555>, / 720p @ 30 */

/* Decoders /
<1944000 490000000 0xffffffff>, / 4k UHD @ 60 /
< 972000 320000000 0xffffffff>, / 4k UHD @ 30 /
< 489600 150000000 0xffffffff>, / 1080p @ 60 /
< 244800 75000000 0xffffffff>; / 1080p @ 30 */

It shows that encoder always needs a higher clock than decoder.

In current venus driver, the unified frequency table is aligned
with the downstream decoder table which causes performance issues
in encoding scenarios. Fix that by aligning frequency table on
worst case (encoding).

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Loic Poulain 2019-09-11 11:45:59 -03:00 committed by Greg Kroah-Hartman
parent d6bf6a5e90
commit 3d0f01ba35
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/qcom/venus/core.c
View File

@ -427,10 +427,11 @@ static const struct venus_resources msm8916_res = {
}; };
static const struct freq_tbl msm8996_freq_table[] = { static const struct freq_tbl msm8996_freq_table[] = {
{ 1944000, 490000000 }, /* 4k UHD @ 60 */ { 1944000, 520000000 }, /* 4k UHD @ 60 (decode only) */
{ 972000, 320000000 }, /* 4k UHD @ 30 */ { 972000, 520000000 }, /* 4k UHD @ 30 */
{ 489600, 150000000 }, /* 1080p @ 60 */ { 489600, 346666667 }, /* 1080p @ 60 */
{ 244800, 75000000 }, /* 1080p @ 30 */ { 244800, 150000000 }, /* 1080p @ 30 */
{ 108000, 75000000 }, /* 720p @ 30 */
}; };
static const struct reg_val msm8996_reg_preset[] = { static const struct reg_val msm8996_reg_preset[] = {