From 855ad95f050a24edd7662ef92a247bd612740f72 Mon Sep 17 00:00:00 2001 From: Karthikeyan Periasamy Date: Tue, 14 Jan 2020 16:17:55 -0800 Subject: [PATCH] msm: vidc: skip scaling check for decoder Scaling check is not required for decoder as clients may not set both input and output resolutions for decoder in which case input and output resolution will be different and scaling check fails if enabled. Change-Id: Iccdbad63bd8f975df4f57cad0250557119cf788d Signed-off-by: Karthikeyan Periasamy --- msm/vidc/msm_vidc_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c index e822174d5083..b987a280ccd7 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-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. */ #include @@ -5521,8 +5521,8 @@ int msm_vidc_check_scaling_supported(struct msm_vidc_inst *inst) u32 input_height, input_width, output_height, output_width; struct v4l2_format *f; - if (is_grid_session(inst)) { - s_vpr_h(inst->sid, "Skip scaling check for HEIC\n"); + if (is_grid_session(inst) || is_decode_session(inst)) { + s_vpr_h(inst->sid, "Skip scaling check\n"); return 0; }