diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-04-16 03:43:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-04-16 03:43:46 -0700 |
| commit | 6714091b5b0fc7e07e7c3d152d13f0466935c9e9 (patch) | |
| tree | 33451fe3d3dbc92836c2164d963d6ceafc2a4b1f | |
| parent | aa1c413105ca879fdd52ce8ffe79126a44d1cd7e (diff) | |
| parent | 67e04152d6eb7fbfaae884d22d9dad353433795a (diff) | |
| download | video-driver-6714091b5b0fc7e07e7c3d152d13f0466935c9e9.tar.gz | |
Merge "msm: vidc: Add check for maximum height"
| -rw-r--r-- | msm/vidc/msm_vidc_common.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c index 2619d1f..3bc3d51 100644 --- a/msm/vidc/msm_vidc_common.c +++ b/msm/vidc/msm_vidc_common.c @@ -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 <linux/jiffies.h> @@ -6186,10 +6186,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; } |