media: qcom: iris: Add flip support for encoder

Add support for V4L2_CID_HFLIP and V4L2_CID_VFLIP controls in encoder.

Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK
Signed-off-by: Wangao Wang <wangao.wang@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_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
index faa0f75abfea2a0afa8052506b9b7f89c43d0b86..d7bd7f6dcc216a07532c69058a68ce2620ccf55d 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_ctrls.c
+++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
@@ -104,6 +104,10 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
                return LEVEL_AV1;
        case V4L2_CID_ROTATE:
                return ROTATION;
+       case V4L2_CID_HFLIP:
+               return HFLIP;
+       case V4L2_CID_VFLIP:
+               return VFLIP;
        default:
                return INST_FW_CAP_MAX;
        }
@@ -197,6 +201,10 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
                return V4L2_CID_MPEG_VIDEO_AV1_LEVEL;
        case ROTATION:
                return V4L2_CID_ROTATE;
+       case HFLIP:
+               return V4L2_CID_HFLIP;
+       case VFLIP:
+               return V4L2_CID_VFLIP;
        default:
                return 0;
        }
@@ -935,6 +943,25 @@ int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
                                             &hfi_val, sizeof(u32));
 }
 
+int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id)
+{
+       const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
+       u32 hfi_id = inst->fw_caps[cap_id].hfi_id;
+       u32 hfi_val = HFI_DISABLE_FLIP;
+
+       if (inst->fw_caps[HFLIP].value)
+               hfi_val |= HFI_HORIZONTAL_FLIP;
+
+       if (inst->fw_caps[VFLIP].value)
+               hfi_val |= HFI_VERTICAL_FLIP;
+
+       return hfi_ops->session_set_property(inst, hfi_id,
+                                            HFI_HOST_FLAGS_NONE,
+                                            iris_get_port_info(inst, cap_id),
+                                            HFI_PAYLOAD_U32_ENUM,
+                                            &hfi_val, sizeof(u32));
+}
+
 int iris_set_properties(struct iris_inst *inst, u32 plane)
 {
        const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;

diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h
index 3ea0a00c7587a516f19bb7307a0eb9a60c856ab0..355a592049f3fcc715a1b9df44b4d1398b052653 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_ctrls.h
+++ b/drivers/media/platform/qcom/iris/iris_ctrls.h
@@ -33,6 +33,7 @@ int iris_set_max_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_i
 int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
 int iris_set_qp_range(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
 int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
+int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
 int iris_set_properties(struct iris_inst *inst, u32 plane);
 
 #endif

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 c3508514014cdf5c10b0b2486746495aad6d09c9..864162364b312112d93bbc633f4b61e710ae9e4c 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
@@ -92,6 +92,14 @@ enum hfi_rotation {
 };
 
 #define HFI_PROP_ROTATION                      0x0300014b
+
+enum hfi_flip {
+       HFI_DISABLE_FLIP    = 0x00000000,
+       HFI_HORIZONTAL_FLIP = 0x00000001,
+       HFI_VERTICAL_FLIP   = 0x00000002,
+};
+
+#define HFI_PROP_FLIP                          0x0300014c
 #define HFI_PROP_SIGNAL_COLOR_INFO             0x03000155
 #define HFI_PROP_PICTURE_TYPE                  0x03000162
 #define HFI_PROP_DEC_DEFAULT_HEADER            0x03000168

diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index e8fe8b9bd21e7aff038e805f48a140a6c497e85a..b3bf25ed2dd0495ffbfa1d1c741671e35b7f1825 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -151,6 +151,8 @@ enum platform_inst_fw_cap_type {
        B_FRAME_QP_H264,
        B_FRAME_QP_HEVC,
        ROTATION,
+       HFLIP,
+       VFLIP,
        INST_FW_CAP_MAX,
 };
 

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 3412a77a2c0888c8921d10d9cecd8ccc8fb5b0f0..034c67341694b4626309e23717a284167a3b49c3 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -699,6 +699,28 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = {
                .flags = CAP_FLAG_OUTPUT_PORT,
                .set = iris_set_rotation,
        },
+       {
+               .cap_id = HFLIP,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_FLIP,
+               .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
+                       CAP_FLAG_DYNAMIC_ALLOWED,
+               .set = iris_set_flip,
+       },
+       {
+               .cap_id = VFLIP,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_FLIP,
+               .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
+                       CAP_FLAG_DYNAMIC_ALLOWED,
+               .set = iris_set_flip,
+       },
 };
 
 static struct platform_inst_caps platform_inst_cap_sm8550 = {