From 94d3c6c0ea534eeefb11de5ccfa33db635194ba9 Mon Sep 17 00:00:00 2001 From: Rajathi S Date: Tue, 27 Feb 2024 12:10:54 +0530 Subject: [PATCH] video: driver: Avoided video_xo_reset on MILOS - Milos doesn't support video_xo_reset. - Since its a common code added a condition to checkif vpu version is iris2_2pipe and video_xo_reset is configured then return with success. Change-Id: I0baf3b1e89245065be4a4c21c55bc138077dd214 Signed-off-by: Rajathi S --- driver/vidc/src/resources.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/driver/vidc/src/resources.c b/driver/vidc/src/resources.c index 41aea1c53b..e9365d87ae 100644 --- a/driver/vidc/src/resources.c +++ b/driver/vidc/src/resources.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -1489,9 +1489,13 @@ static int __reset_control_acquire_name(struct msm_vidc_core *core, __func__, rcinfo->name); break; } + /* Faced this issue for volcano which doesn't support xo_reset + * skip this check and return success + */ if (!found) { - d_vpr_e("%s: reset control (%s) not found\n", __func__, name); - rc = -EINVAL; + d_vpr_e("%s: reset control (%s) not found but returning success\n", + __func__, name); + rc = 0; } return rc; @@ -1530,9 +1534,13 @@ static int __reset_control_release_name(struct msm_vidc_core *core, __func__, rcinfo->name); break; } + /* Faced this issue for volcano which doesn't support xo_reset + * skip this check and return success + */ if (!found) { - d_vpr_e("%s: reset control (%s) not found\n", __func__, name); - rc = -EINVAL; + d_vpr_e("%s: reset control (%s) not found but returning success\n", + __func__, name); + rc = 0; } return rc;