A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 38853169b3 on remote branch

Browse source 
Change-Id: Ic34026e2bf659aa329f1853ced109f23dbf33e74
This commit is contained in:
Linux Build Service Account 2021-04-27 10:57:51 -07:00
commit d13d221a43
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
msm/vidc/msm_vidc_buffer_calculations.c
View file

@ -1439,7 +1439,7 @@ static inline u32 calculate_enc_scratch_size(struct msm_vidc_inst *inst,
bitbin_size = ALIGN(bitstream_size, VENUS_DMA_ALIGNMENT);
}
if (aligned_width * aligned_height >= 3840 * 2160)
size_singlePipe = bitbin_size / 4;
size_singlePipe = bitbin_size / num_vpp_pipes;
else if (num_vpp_pipes > 2)
size_singlePipe = bitbin_size / 2;
else

10
msm/vidc/msm_vidc_common.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
*/
#include <soc/qcom/subsystem_restart.h>
@ -6162,10 +6162,12 @@ int msm_vidc_check_session_supported(struct msm_vidc_inst *inst)
width_min, height_min);
rc = -ENOTSUPP;
}
if (!rc && output_width > width_max) {
if (!rc && (output_width > width_max ||
output_height > height_max)) {
s_vpr_e(sid,
"Unsupported width = %u supported max width = %u\n",
output_width, width_max);
"Unsupported WxH (%u)x(%u), max supported is (%u)x(%u)\n",
output_width, output_height,
width_max, height_max);
rc = -ENOTSUPP;
}