Merge af651d629036bd1c350e826e170037761eb210ff on remote branch

Change-Id: I7d39110970eb88a350d9dea662b1e5c843ba7493

driver/platform/cliffs/src/cliffs.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <soc/qcom/of_common.h>
@@ -1657,16 +1657,6 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_clif
 		NULL,
 		msm_vidc_set_stage},
 
-	{STAGE, ENC, H264 | HEVC,
-		{0},
-		NULL,
-		msm_vidc_set_stage},
-
-	{STAGE, DEC, H264 | HEVC | VP9,
-		{0},
-		NULL,
-		msm_vidc_set_stage},
-
 	{PIPE, DEC | ENC, CODECS_ALL,
 		{0},
 		NULL,

driver/platform/pineapple/src/pineapple.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <soc/qcom/of_common.h>
@@ -1657,16 +1657,6 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_pine
 		NULL,
 		msm_vidc_set_stage},
 
-	{STAGE, ENC, H264 | HEVC,
-		{0},
-		NULL,
-		msm_vidc_set_stage},
-
-	{STAGE, DEC, H264 | HEVC | VP9,
-		{0},
-		NULL,
-		msm_vidc_set_stage},
-
 	{PIPE, DEC | ENC, CODECS_ALL,
 		{0},
 		NULL,

driver/platform/volcano/src/volcano.c

@@ -1580,16 +1580,6 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_volc
 		NULL,
 		msm_vidc_set_stage},
 
-	{STAGE, ENC, H264 | HEVC,
-		{0},
-		NULL,
-		msm_vidc_set_stage},
-
-	{STAGE, DEC, H264 | HEVC | VP9,
-		{0},
-		NULL,
-		msm_vidc_set_stage},
-
 	{PIPE, DEC|ENC, CODECS_ALL,
 		{0},
 		NULL,