Quellcode durchsuchen

video: driver: Remove unused capabilities

Cleanup of unused capabilities from
platform caps list.

Change-Id: I98f4beb96f41d2b8a3b4342f7d453a6abc046e55
Signed-off-by: Vedang Nagar <[email protected]>
Signed-off-by: Ankush Mitra <[email protected]>
Ankush Mitra vor 2 Jahren
Ursprung
Commit
c1bb733a6b

+ 0 - 26
driver/platform/anorak/src/msm_vidc_anorak.c

@@ -207,32 +207,6 @@ static struct msm_platform_inst_capability instance_cap_data_anorak[] = {
 
 	{SECURE_MBPF, ENC, HEVC, 36, 36864, 1, 36864},
 
-	/* ((1920 * 1088) / 256) * 480 fps */
-	{MBPS, ENC, CODECS_ALL, 64, 3916800, 1, 3916800},
-
-	{MBPS, ENC, HEVC, 36, 3916800, 1, 3916800},
-
-	/* ((16384x16384)/256)@1fps */
-	{MBPS, ENC, HEIC, 36, 1048576, 1, 1048576},
-
-	/* ((3840 * 2176) / 256) * 240 fps */
-	{MBPS, DEC, CODECS_ALL, 64, 7833600, 1, 7833600},
-
-	/* ((4096 * 2304) / 256) * 120 */
-	{MBPS, DEC, VP9, 36, 4423680, 1, 4423680},
-
-	/* ((8192x8192)/256)@1fps */
-	{MBPS, DEC, HEIC, 64, 262144,  1, 262144 },
-
-	/* ((4096 * 2304) / 256) * 60 fps */
-	{POWER_SAVE_MBPS, ENC, CODECS_ALL, 0, 2211840, 1, 2211840},
-
-	/* Enable check mbps for encoder */
-	{CHECK_MBPS, ENC, CODECS_ALL, 0, 1, 1, 1},
-
-	/* Disable check mbps for encoder */
-	{CHECK_MBPS, DEC, CODECS_ALL, 0, 1, 1, 0},
-
 	{FRAME_RATE, ENC, CODECS_ALL,
 		(MINIMUM_FPS << 16), (MAXIMUM_FPS << 16),
 		1, (DEFAULT_FPS << 16),

+ 0 - 17
driver/platform/kalama/src/kalama.c

@@ -298,23 +298,6 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
 	/* (4096 * 2304) / 256 */
 	{BATCH_FPS, DEC, H264|HEVC|VP9, 1, 120, 1, 120},
 
-	/* ((1920 * 1088) / 256) * 480 fps */
-	{MBPS, ENC, CODECS_ALL, 64, 3916800, 1, 3916800},
-
-	{MBPS, ENC, HEVC, 36, 3916800, 1, 3916800},
-
-	/* ((1920 * 1088) / 256) * 960 fps */
-	{MBPS, DEC, CODECS_ALL, 64, 7833600, 1, 7833600},
-
-	/* ((4096 * 2304) / 256) * 120 */
-	{MBPS, DEC, VP9, 36, 4423680, 1, 4423680},
-
-	/* Enable check mbps for encoder */
-	{CHECK_MBPS, ENC, CODECS_ALL, 0, 1, 1, 1},
-
-	/* Disable check mbps for encoder */
-	{CHECK_MBPS, DEC, CODECS_ALL, 0, 1, 1, 0},
-
 	{FRAME_RATE, ENC, CODECS_ALL,
 		(MINIMUM_FPS << 16), (MAXIMUM_FPS << 16),
 		1, (DEFAULT_FPS << 16),

+ 1 - 27
driver/platform/kalama/src/msm_vidc_kalama.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <dt-bindings/clock/qcom,gcc-kalama.h>
@@ -445,32 +445,6 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
 
 	{SECURE_MBPF, ENC, HEVC, 36, 36864, 1, 36864},
 
-	/* ((1920 * 1088) / 256) * 480 fps */
-	{MBPS, ENC, CODECS_ALL, 64, 3916800, 1, 3916800},
-
-	{MBPS, ENC, HEVC, 36, 3916800, 1, 3916800},
-
-	/* ((16384x16384)/256)@1fps */
-	{MBPS, ENC, HEIC, 36, 1048576, 1, 1048576},
-
-	/* ((1920 * 1088) / 256) * 960 fps */
-	{MBPS, DEC, CODECS_ALL, 64, 7833600, 1, 7833600},
-
-	/* ((4096 * 2304) / 256) * 120 */
-	{MBPS, DEC, VP9, 36, 4423680, 1, 4423680},
-
-	/* ((8192x8192)/256)@1fps */
-	{MBPS, DEC, HEIC, 64, 262144,  1, 262144 },
-
-	/* ((4096 * 2304) / 256) * 60 fps */
-	{POWER_SAVE_MBPS, ENC, CODECS_ALL, 0, 2211840, 1, 2211840},
-
-	/* Enable check mbps for encoder */
-	{CHECK_MBPS, ENC, CODECS_ALL, 0, 1, 1, 1},
-
-	/* Disable check mbps for encoder */
-	{CHECK_MBPS, DEC, CODECS_ALL, 0, 1, 1, 0},
-
 	{FRAME_RATE, ENC, CODECS_ALL,
 		(MINIMUM_FPS << 16), (MAXIMUM_FPS << 16),
 		1, (DEFAULT_FPS << 16),

+ 0 - 26
driver/platform/pineapple/src/msm_vidc_pineapple.c

@@ -445,32 +445,6 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 
 	{SECURE_MBPF, ENC, HEVC, 36, 36864, 1, 36864},
 
-	/* ((1920 * 1088) / 256) * 480 fps */
-	{MBPS, ENC, CODECS_ALL, 64, 3916800, 1, 3916800},
-
-	{MBPS, ENC, HEVC, 36, 3916800, 1, 3916800},
-
-	/* ((16384x16384)/256)@1fps */
-	{MBPS, ENC, HEIC, 36, 1048576, 1, 1048576},
-
-	/* ((1920 * 1088) / 256) * 960 fps */
-	{MBPS, DEC, CODECS_ALL, 64, 7833600, 1, 7833600},
-
-	/* ((4096 * 2304) / 256) * 120 */
-	{MBPS, DEC, VP9, 36, 4423680, 1, 4423680},
-
-	/* ((8192x8192)/256)@1fps */
-	{MBPS, DEC, HEIC, 64, 262144,  1, 262144 },
-
-	/* ((4096 * 2304) / 256) * 60 fps */
-	{POWER_SAVE_MBPS, ENC, CODECS_ALL, 0, 2211840, 1, 2211840},
-
-	/* Enable check mbps for encoder */
-	{CHECK_MBPS, ENC, CODECS_ALL, 0, 1, 1, 1},
-
-	/* Disable check mbps for encoder */
-	{CHECK_MBPS, DEC, CODECS_ALL, 0, 1, 1, 0},
-
 	{FRAME_RATE, ENC, CODECS_ALL,
 		(MINIMUM_FPS << 16), (MAXIMUM_FPS << 16),
 		1, (DEFAULT_FPS << 16),

+ 0 - 17
driver/platform/pineapple/src/pineapple.c

@@ -300,23 +300,6 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 	/* (4096 * 2304) / 256 */
 	{BATCH_FPS, DEC, H264|HEVC|VP9, 1, 120, 1, 120},
 
-	/* ((1920 * 1088) / 256) * 480 fps */
-	{MBPS, ENC, CODECS_ALL, 64, 3916800, 1, 3916800},
-
-	{MBPS, ENC, HEVC, 36, 3916800, 1, 3916800},
-
-	/* ((1920 * 1088) / 256) * 960 fps */
-	{MBPS, DEC, CODECS_ALL, 64, 7833600, 1, 7833600},
-
-	/* ((4096 * 2304) / 256) * 120 */
-	{MBPS, DEC, VP9, 36, 4423680, 1, 4423680},
-
-	/* Enable check mbps for encoder */
-	{CHECK_MBPS, ENC, CODECS_ALL, 0, 1, 1, 1},
-
-	/* Disable check mbps for encoder */
-	{CHECK_MBPS, DEC, CODECS_ALL, 0, 1, 1, 0},
-
 	{FRAME_RATE, ENC, CODECS_ALL,
 		(MINIMUM_FPS << 16), (MAXIMUM_FPS << 16),
 		1, (DEFAULT_FPS << 16),

+ 0 - 26
driver/platform/waipio/src/msm_vidc_waipio.c

@@ -204,32 +204,6 @@ static struct msm_platform_inst_capability instance_cap_data_waipio[] = {
 
 	{SECURE_MBPF, ENC, HEVC, 36, 36864, 1, 36864},
 
-	/* ((1920 * 1088) / 256) * 480 fps */
-	{MBPS, ENC, CODECS_ALL, 64, 3916800, 1, 3916800},
-
-	{MBPS, ENC, HEVC, 36, 3916800, 1, 3916800},
-
-	/* ((16384x16384)/256)@1fps */
-	{MBPS, ENC, HEIC, 36, 1048576, 1, 1048576},
-
-	/* ((1920 * 1088) / 256) * 960 fps */
-	{MBPS, DEC, CODECS_ALL, 64, 7833600, 1, 7833600},
-
-	/* ((4096 * 2304) / 256) * 120 */
-	{MBPS, DEC, VP9, 36, 4423680, 1, 4423680},
-
-	/* ((8192x8192)/256)@1fps */
-	{MBPS, DEC, HEIC, 64, 262144,  1, 262144 },
-
-	/* ((4096 * 2304) / 256) * 60 fps */
-	{POWER_SAVE_MBPS, ENC, CODECS_ALL, 0, 2211840, 1, 2211840},
-
-	/* Enable check mbps for encoder */
-	{CHECK_MBPS, ENC, CODECS_ALL, 0, 1, 1, 1},
-
-	/* Disable check mbps for encoder */
-	{CHECK_MBPS, DEC, CODECS_ALL, 0, 1, 1, 0},
-
 	{FRAME_RATE, ENC, CODECS_ALL,
 		(MINIMUM_FPS << 16), (MAXIMUM_FPS << 16),
 		1, (DEFAULT_FPS << 16),

+ 2 - 4
driver/vidc/inc/msm_vidc_internal.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _MSM_VIDC_INTERNAL_H_
@@ -437,9 +438,6 @@ enum msm_vidc_inst_capability_type {
 	BATCH_FPS,
 	LOSSLESS_MBPF,
 	SECURE_MBPF,
-	MBPS,
-	POWER_SAVE_MBPS,
-	CHECK_MBPS,
 	FRAME_RATE,
 	OPERATING_RATE,
 	INPUT_RATE,

+ 1 - 3
driver/vidc/src/msm_vidc_driver.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/iommu.h>
@@ -97,9 +98,6 @@ static const struct msm_vidc_cap_name cap_name_arr[] = {
 	{BATCH_FPS,                      "BATCH_FPS"                  },
 	{LOSSLESS_MBPF,                  "LOSSLESS_MBPF"              },
 	{SECURE_MBPF,                    "SECURE_MBPF"                },
-	{MBPS,                           "MBPS"                       },
-	{POWER_SAVE_MBPS,                "POWER_SAVE_MBPS"            },
-	{CHECK_MBPS,                     "CHECK_MPBS"                 },
 	{FRAME_RATE,                     "FRAME_RATE"                 },
 	{OPERATING_RATE,                 "OPERATING_RATE"             },
 	{INPUT_RATE,                     "INPUT_RATE"                 },