Эх сурвалжийг харах

Video: Driver: Configure CSC on BITSTREAM port according to HFI

According to HFI definition, HFI_PROP_CSC needs to be configured
on BITSTREAM port, but during msm_vidc_set_cap, CSC is being
configured on PORT_NONE leading to error in FW.
Added change to configure CSC always on BITSTREAM port.

Change-Id: I3e9511ec40cd25687048f0739c57d164dd7a1c43
Signed-off-by: Vedang Nagar <[email protected]>
Vedang Nagar 1 жил өмнө
parent
commit
c98002d4fe

+ 2 - 1
driver/platform/cliffs/src/cliffs.c

@@ -581,7 +581,8 @@ static struct msm_platform_inst_capability instance_cap_data_cliffs[] = {
 	{CSC, ENC, CODECS_ALL,
 		0, 1, 1, 0,
 		0,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{LOWLATENCY_MODE, ENC, H264 | HEVC,
 		0, 1, 1, 0,

+ 4 - 2
driver/platform/cliffs/src/msm_vidc_cliffs.c

@@ -896,7 +896,8 @@ static struct msm_platform_inst_capability instance_cap_data_cliffs_v0[] = {
 	{CSC, ENC, CODECS_ALL_V0,
 		0, 1, 1, 0,
 		V4L2_CID_MPEG_VIDC_CSC,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{CSC_CUSTOM_MATRIX, ENC, CODECS_ALL_V0,
 		0, 1, 1, 0,
@@ -3166,7 +3167,8 @@ static struct msm_platform_inst_capability instance_cap_data_cliffs_v1[] = {
 	{CSC, ENC, CODECS_ALL_V1,
 		0, 1, 1, 0,
 		V4L2_CID_MPEG_VIDC_CSC,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{CSC_CUSTOM_MATRIX, ENC, CODECS_ALL_V1,
 		0, 1, 1, 0,

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

@@ -819,7 +819,8 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
 	{CSC, ENC, CODECS_ALL,
 		0, 1, 1, 0,
 		V4L2_CID_MPEG_VIDC_CSC,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{CSC_CUSTOM_MATRIX, ENC, CODECS_ALL,
 		0, 1, 1, 0,

+ 2 - 1
driver/platform/pineapple/src/msm_vidc_pineapple.c

@@ -895,7 +895,8 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 	{CSC, ENC, CODECS_ALL,
 		0, 1, 1, 0,
 		V4L2_CID_MPEG_VIDC_CSC,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{CSC_CUSTOM_MATRIX, ENC, CODECS_ALL,
 		0, 1, 1, 0,

+ 2 - 1
driver/platform/pineapple/src/pineapple.c

@@ -581,7 +581,8 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
 	{CSC, ENC, CODECS_ALL,
 		0, 1, 1, 0,
 		0,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{LOWLATENCY_MODE, ENC, H264 | HEVC,
 		0, 1, 1, 0,

+ 2 - 1
driver/platform/waipio/src/waipio.c

@@ -513,7 +513,8 @@ static struct msm_platform_inst_capability instance_cap_data_waipio[] = {
 	{CSC, ENC, CODECS_ALL,
 		0, 1, 1, 0,
 		0,
-		HFI_PROP_CSC},
+		HFI_PROP_CSC,
+		CAP_FLAG_OUTPUT_PORT},
 
 	{LOWLATENCY_MODE, ENC, H264 | HEVC,
 		0, 1, 1, 0,