Merge "msm: vidc: Fix MBs per frame to derive slices per frame"
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 @@
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;
}