media: iris: Add support for HFI_PROP_OPB_ENABLE to control split mode

Add handling for the HFI_PROP_OPB_ENABLE property, which allows enabling
or disabling split mode in the firmware. When HFI_PROP_OPB_ENABLE is set
to true, the firmware activates split mode for output picture buffers
(OPB). The OPB format is determined by the HFI_PROP_COLOR_FORMAT
property, supporting NV12 or QC08C formats.

Signed-off-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
index 4ce71a14250832440099e4cf3835b4aedfb749e8..56ced61de924eff3388c7df096f8235136bf473d 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -422,6 +422,20 @@ static int iris_hfi_gen2_set_level(struct iris_inst *inst, u32 plane)
                                                  sizeof(u32));
 }
 
+static int iris_hfi_gen2_set_opb_enable(struct iris_inst *inst, u32 plane)
+{
+       u32 port = iris_hfi_gen2_get_port(inst, plane);
+       u32 opb_enable = iris_split_mode_enabled(inst);
+
+       return iris_hfi_gen2_session_set_property(inst,
+                                                 HFI_PROP_OPB_ENABLE,
+                                                 HFI_HOST_FLAGS_NONE,
+                                                 port,
+                                                 HFI_PAYLOAD_U32,
+                                                 &opb_enable,
+                                                 sizeof(u32));
+}
+
 static int iris_hfi_gen2_set_colorformat(struct iris_inst *inst, u32 plane)
 {
        u32 port = iris_hfi_gen2_get_port(inst, plane);
@@ -527,6 +541,7 @@ static int iris_hfi_gen2_session_set_config_params(struct iris_inst *inst, u32 p
                {HFI_PROP_SIGNAL_COLOR_INFO,          iris_hfi_gen2_set_colorspace             },
                {HFI_PROP_PROFILE,                    iris_hfi_gen2_set_profile                },
                {HFI_PROP_LEVEL,                      iris_hfi_gen2_set_level                  },
+               {HFI_PROP_OPB_ENABLE,                 iris_hfi_gen2_set_opb_enable             },
                {HFI_PROP_COLOR_FORMAT,               iris_hfi_gen2_set_colorformat            },
                {HFI_PROP_LINEAR_STRIDE_SCANLINE,     iris_hfi_gen2_set_linear_stride_scanline },
                {HFI_PROP_TIER,                       iris_hfi_gen2_set_tier                   },

diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
index aa1f795f5626c1f76a32dd650302633877ce67be..1b6a4dbac828ffea53c1be0d3624a033c283c972 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
@@ -91,6 +91,7 @@ enum hfi_seq_header_mode {
 #define HFI_PROP_BUFFER_MARK                   0x0300016c
 #define HFI_PROP_RAW_RESOLUTION                0x03000178
 #define HFI_PROP_TOTAL_PEAK_BITRATE            0x0300017C
+#define HFI_PROP_OPB_ENABLE                    0x03000184
 #define HFI_PROP_COMV_BUFFER_COUNT             0x03000193
 #define HFI_PROP_END                           0x03FFFFFF
 

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 36d69cc73986b74534a2912524c8553970fd862e..69c952c68e939f305f25511e2e4763487ec8e0de 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -691,6 +691,7 @@ static const u32 sm8550_venc_input_config_params[] = {
 };
 
 static const u32 sm8550_vdec_output_config_params[] = {
+       HFI_PROP_OPB_ENABLE,
        HFI_PROP_COLOR_FORMAT,
        HFI_PROP_LINEAR_STRIDE_SCANLINE,
 };