media: iris: Define AV1-specific platform capabilities and properties

Defining platform specific capabilities specific to AV1 decoder.
Set and subscribe to manadatory properties to firmware for AV1.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Signed-off-by: Deepa Guthyappa Madivalara <deepa.madivalara@oss.qualcomm.com>
Tested-by: Val Packett <val@packett.cool>
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_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h
index 325d30fce5c99185b61ff989fbfd4de9a56762b2..5ef365d9236c7cbdee24a4614789b3191881968b 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_buffer.h
+++ b/drivers/media/platform/qcom/iris/iris_buffer.h
@@ -42,6 +42,7 @@ enum iris_buffer_type {
        BUF_SCRATCH_1,
        BUF_SCRATCH_2,
        BUF_VPSS,
+       BUF_PARTIAL,
        BUF_TYPE_MAX,
 };
 

diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c
index c0b3a09ad3e3dfb0a47e3603a8089cf61390fda8..87f929442ec658f5d17646698f0bfa2acfe420d9 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_ctrls.c
+++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
@@ -98,6 +98,10 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
                return B_FRAME_QP_H264;
        case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP:
                return B_FRAME_QP_HEVC;
+       case V4L2_CID_MPEG_VIDEO_AV1_PROFILE:
+               return PROFILE_AV1;
+       case V4L2_CID_MPEG_VIDEO_AV1_LEVEL:
+               return LEVEL_AV1;
        default:
                return INST_FW_CAP_MAX;
        }
@@ -185,6 +189,10 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
                return V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP;
        case B_FRAME_QP_HEVC:
                return V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP;
+       case PROFILE_AV1:
+               return V4L2_CID_MPEG_VIDEO_AV1_PROFILE;
+       case LEVEL_AV1:
+               return V4L2_CID_MPEG_VIDEO_AV1_LEVEL;
        default:
                return 0;
        }

diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h
index b51471fb32c70acee44c37f8e9dce0c6bc0b6ccc..3edb5ae582b49bea2e2408c4a5cfc0a742adc05f 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_common.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h
@@ -141,6 +141,9 @@ struct hfi_subscription_params {
        u32     profile;
        u32     level;
        u32     tier;
+       u32     drap;
+       u32     film_grain;
+       u32     super_block;
 };
 
 u32 iris_hfi_get_v4l2_color_primaries(u32 hfi_primaries);

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 f9129553209922fda548ca320494ae6ae797854c..b492d9dfddd3c57c5f8e590133391588f93dd01f 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c
@@ -10,6 +10,7 @@
 
 #define UNSPECIFIED_COLOR_FORMAT 5
 #define NUM_SYS_INIT_PACKETS 8
+#define NUM_COMV_AV1 18
 
 #define SYS_INIT_PKT_SIZE (sizeof(struct iris_hfi_header) + \
        NUM_SYS_INIT_PACKETS * (sizeof(struct iris_hfi_packet) + sizeof(u32)))
@@ -121,6 +122,7 @@ static u32 iris_hfi_gen2_get_port_from_buf_type(struct iris_inst *inst,
                case BUF_COMV:
                case BUF_NON_COMV:
                case BUF_LINE:
+               case BUF_PARTIAL:
                        return HFI_PORT_BITSTREAM;
                case BUF_OUTPUT:
                case BUF_DPB:
@@ -380,6 +382,9 @@ static int iris_hfi_gen2_set_profile(struct iris_inst *inst, u32 plane)
        case V4L2_PIX_FMT_H264:
                profile = inst->fw_caps[PROFILE_H264].value;
                break;
+       case V4L2_PIX_FMT_AV1:
+               profile = inst->fw_caps[PROFILE_AV1].value;
+               break;
        }
 
        inst_hfi_gen2->src_subcr_params.profile = profile;
@@ -409,6 +414,9 @@ static int iris_hfi_gen2_set_level(struct iris_inst *inst, u32 plane)
        case V4L2_PIX_FMT_H264:
                level = inst->fw_caps[LEVEL_H264].value;
                break;
+       case V4L2_PIX_FMT_AV1:
+               level = inst->fw_caps[LEVEL_AV1].value;
+               break;
        }
 
        inst_hfi_gen2->src_subcr_params.level = level;
@@ -496,10 +504,12 @@ static int iris_hfi_gen2_set_linear_stride_scanline(struct iris_inst *inst, u32
 
 static int iris_hfi_gen2_set_tier(struct iris_inst *inst, u32 plane)
 {
-       struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);
        u32 port = iris_hfi_gen2_get_port(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+       struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);
        u32 tier = inst->fw_caps[TIER].value;
 
+       tier = (inst->codec == V4L2_PIX_FMT_AV1) ? inst->fw_caps[TIER_AV1].value :
+                                                       inst->fw_caps[TIER].value;
        inst_hfi_gen2->src_subcr_params.tier = tier;
 
        return iris_hfi_gen2_session_set_property(inst,
@@ -525,6 +535,40 @@ static int iris_hfi_gen2_set_frame_rate(struct iris_inst *inst, u32 plane)
                                                  sizeof(u32));
 }
 
+static int iris_hfi_gen2_set_film_grain(struct iris_inst *inst, u32 plane)
+{
+       u32 port = iris_hfi_gen2_get_port(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+       struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);
+       u32 film_grain = inst->fw_caps[FILM_GRAIN].value;
+
+       inst_hfi_gen2->src_subcr_params.film_grain = film_grain;
+
+       return iris_hfi_gen2_session_set_property(inst,
+                                                 HFI_PROP_AV1_FILM_GRAIN_PRESENT,
+                                                 HFI_HOST_FLAGS_NONE,
+                                                 port,
+                                                 HFI_PAYLOAD_U32_ENUM,
+                                                 &film_grain,
+                                                 sizeof(u32));
+}
+
+static int iris_hfi_gen2_set_super_block(struct iris_inst *inst, u32 plane)
+{
+       u32 port = iris_hfi_gen2_get_port(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+       struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);
+       u32 super_block = inst->fw_caps[SUPER_BLOCK].value;
+
+       inst_hfi_gen2->src_subcr_params.super_block = super_block;
+
+       return iris_hfi_gen2_session_set_property(inst,
+                                                 HFI_PROP_AV1_SUPER_BLOCK_ENABLED,
+                                                 HFI_HOST_FLAGS_NONE,
+                                                 port,
+                                                 HFI_PAYLOAD_U32_ENUM,
+                                                 &super_block,
+                                                 sizeof(u32));
+}
+
 static int iris_hfi_gen2_session_set_config_params(struct iris_inst *inst, u32 plane)
 {
        const struct iris_platform_data *pdata = inst->core->iris_platform_data;
@@ -548,6 +592,9 @@ static int iris_hfi_gen2_session_set_config_params(struct iris_inst *inst, u32 p
                {HFI_PROP_LINEAR_STRIDE_SCANLINE,     iris_hfi_gen2_set_linear_stride_scanline },
                {HFI_PROP_TIER,                       iris_hfi_gen2_set_tier                   },
                {HFI_PROP_FRAME_RATE,                 iris_hfi_gen2_set_frame_rate             },
+               {HFI_PROP_AV1_FILM_GRAIN_PRESENT,     iris_hfi_gen2_set_film_grain             },
+               {HFI_PROP_AV1_SUPER_BLOCK_ENABLED,    iris_hfi_gen2_set_super_block            },
+               {HFI_PROP_OPB_ENABLE,                 iris_hfi_gen2_set_opb_enable             },
        };
 
        if (inst->domain == DECODER) {
@@ -561,6 +608,9 @@ static int iris_hfi_gen2_session_set_config_params(struct iris_inst *inst, u32 p
                        } else if (inst->codec == V4L2_PIX_FMT_VP9) {
                                config_params = pdata->dec_input_config_params_vp9;
                                config_params_size = pdata->dec_input_config_params_vp9_size;
+                       } else if (inst->codec == V4L2_PIX_FMT_AV1) {
+                               config_params = pdata->dec_input_config_params_av1;
+                               config_params_size = pdata->dec_input_config_params_av1_size;
                        } else {
                                return -EINVAL;
                        }
@@ -615,6 +665,9 @@ static int iris_hfi_gen2_session_set_codec(struct iris_inst *inst)
                break;
        case V4L2_PIX_FMT_VP9:
                codec = HFI_CODEC_DECODE_VP9;
+               break;
+       case V4L2_PIX_FMT_AV1:
+               codec = HFI_CODEC_DECODE_AV1;
        }
 
        iris_hfi_gen2_packet_session_property(inst,
@@ -780,6 +833,11 @@ static int iris_hfi_gen2_subscribe_change_param(struct iris_inst *inst, u32 plan
                change_param_size =
                        core->iris_platform_data->dec_input_config_params_vp9_size;
                break;
+       case V4L2_PIX_FMT_AV1:
+               change_param = core->iris_platform_data->dec_input_config_params_av1;
+               change_param_size =
+                       core->iris_platform_data->dec_input_config_params_av1_size;
+               break;
        }
 
        payload[0] = HFI_MODE_PORT_SETTINGS_CHANGE;
@@ -862,6 +920,16 @@ static int iris_hfi_gen2_subscribe_change_param(struct iris_inst *inst, u32 plan
                                payload_size = sizeof(u32);
                                payload_type = HFI_PAYLOAD_U32;
                                break;
+                       case HFI_PROP_AV1_FILM_GRAIN_PRESENT:
+                               payload[0] = subsc_params.film_grain;
+                               payload_size = sizeof(u32);
+                               payload_type = HFI_PAYLOAD_U32;
+                               break;
+                       case HFI_PROP_AV1_SUPER_BLOCK_ENABLED:
+                               payload[0] = subsc_params.super_block;
+                               payload_size = sizeof(u32);
+                               payload_type = HFI_PAYLOAD_U32;
+                               break;
                        default:
                                prop_type = 0;
                                ret = -EINVAL;
@@ -917,6 +985,11 @@ static int iris_hfi_gen2_subscribe_property(struct iris_inst *inst, u32 plane)
                        subscribe_prop_size =
                                core->iris_platform_data->dec_output_prop_vp9_size;
                        break;
+               case V4L2_PIX_FMT_AV1:
+                       subcribe_prop = core->iris_platform_data->dec_output_prop_av1;
+                       subscribe_prop_size =
+                               core->iris_platform_data->dec_output_prop_av1_size;
+                       break;
                }
        }
 
@@ -1092,6 +1165,8 @@ static u32 iris_hfi_gen2_buf_type_from_driver(u32 domain, enum iris_buffer_type
                return HFI_BUFFER_ARP;
        case BUF_VPSS:
                return HFI_BUFFER_VPSS;
+       case BUF_PARTIAL:
+               return HFI_BUFFER_PARTIAL_DATA;
        default:
                return 0;
        }
@@ -1104,7 +1179,13 @@ static int iris_set_num_comv(struct iris_inst *inst)
        u32 num_comv;
 
        caps = core->iris_platform_data->inst_caps;
-       num_comv = caps->num_comv;
+
+       /*
+        * AV1 needs more comv buffers than other codecs.
+        * Update accordingly.
+        */
+       num_comv = (inst->codec == V4L2_PIX_FMT_AV1) ?
+                               NUM_COMV_AV1 : caps->num_comv;
 
        return core->hfi_ops->session_set_property(inst,
                                                   HFI_PROP_COMV_BUFFER_COUNT,

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 3d56f257bc5620aacec2bb7e11253dc7c83b7db9..5f1f1a7eb91f3827bb85a703199efd04c6dfc116 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h
@@ -89,10 +89,18 @@ enum hfi_seq_header_mode {
 #define HFI_PROP_DEC_START_FROM_RAP_FRAME      0x03000169
 #define HFI_PROP_NO_OUTPUT                     0x0300016a
 #define HFI_PROP_BUFFER_MARK                   0x0300016c
+#define HFI_PROP_WORST_COMPRESSION_RATIO       0x03000174
+#define HFI_PROP_WORST_COMPLEXITY_FACTOR       0x03000175
 #define HFI_PROP_RAW_RESOLUTION                0x03000178
 #define HFI_PROP_TOTAL_PEAK_BITRATE            0x0300017C
+#define HFI_PROP_AV1_FILM_GRAIN_PRESENT        0x03000180
+#define HFI_PROP_AV1_SUPER_BLOCK_ENABLED       0x03000181
+#define HFI_PROP_AV1_OP_POINT                  0x03000182
 #define HFI_PROP_OPB_ENABLE                    0x03000184
+#define HFI_PROP_AV1_TILE_ROWS_COLUMNS         0x03000187
+#define HFI_PROP_AV1_DRAP_CONFIG               0x03000189
 #define HFI_PROP_COMV_BUFFER_COUNT             0x03000193
+#define HFI_PROP_AV1_UNIFORM_TILE_SPACING      0x03000197
 #define HFI_PROP_END                           0x03FFFFFF
 
 #define HFI_SESSION_ERROR_BEGIN                        0x04000000

diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
index 2f1f118eae4f6462ab1aa1d16844b34e6e699f1e..eb3373f0ad4a1b26fb847db02449ec8d8cb3bdbb 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c
@@ -54,6 +54,8 @@ static u32 iris_hfi_gen2_buf_type_to_driver(struct iris_inst *inst,
                        return BUF_SCRATCH_2;
        case HFI_BUFFER_PERSIST:
                return BUF_PERSIST;
+       case HFI_BUFFER_PARTIAL_DATA:
+               return BUF_PARTIAL;
        default:
                return 0;
        }
@@ -72,6 +74,7 @@ static bool iris_hfi_gen2_is_valid_hfi_buffer_type(u32 buffer_type)
        case HFI_BUFFER_DPB:
        case HFI_BUFFER_PERSIST:
        case HFI_BUFFER_VPSS:
+       case HFI_BUFFER_PARTIAL_DATA:
                return true;
        default:
                return false;
@@ -596,6 +599,10 @@ static void iris_hfi_gen2_read_input_subcr_params(struct iris_inst *inst)
                inst->fw_caps[PROFILE_H264].value = subsc_params.profile;
                inst->fw_caps[LEVEL_H264].value = subsc_params.level;
                break;
+       case V4L2_PIX_FMT_AV1:
+               inst->fw_caps[PROFILE_AV1].value = subsc_params.profile;
+               inst->fw_caps[LEVEL_AV1].value = subsc_params.level;
+               break;
        }
 
        inst->fw_caps[POC].value = subsc_params.pic_order_cnt;
@@ -608,6 +615,11 @@ static void iris_hfi_gen2_read_input_subcr_params(struct iris_inst *inst)
                iris_inst_change_state(inst, IRIS_INST_ERROR);
        }
 
+       if (inst->codec == V4L2_PIX_FMT_AV1) {
+               inst->fw_caps[FILM_GRAIN].value = subsc_params.film_grain;
+               inst->fw_caps[SUPER_BLOCK].value = subsc_params.super_block;
+       }
+
        inst->fw_min_count = subsc_params.fw_min_count;
        inst->buffers[BUF_OUTPUT].min_count = iris_vpu_buf_count(inst, BUF_OUTPUT);
        inst->buffers[BUF_OUTPUT].size = pixmp_op->plane_fmt[0].sizeimage;
@@ -711,6 +723,12 @@ static int iris_hfi_gen2_handle_session_property(struct iris_inst *inst,
        case HFI_PROP_NO_OUTPUT:
                inst_hfi_gen2->hfi_frame_info.no_output = 1;
                break;
+       case HFI_PROP_AV1_FILM_GRAIN_PRESENT:
+               inst_hfi_gen2->src_subcr_params.film_grain = pkt->payload[0];
+               break;
+       case HFI_PROP_AV1_SUPER_BLOCK_ENABLED:
+               inst_hfi_gen2->src_subcr_params.super_block = pkt->payload[0];
+               break;
        case HFI_PROP_QUALITY_MODE:
        case HFI_PROP_STAGE:
        case HFI_PROP_PIPE:
@@ -841,6 +859,10 @@ static void iris_hfi_gen2_init_src_change_param(struct iris_inst *inst)
                subsc_params->profile = inst->fw_caps[PROFILE_H264].value;
                subsc_params->level = inst->fw_caps[LEVEL_H264].value;
                break;
+       case V4L2_PIX_FMT_AV1:
+               subsc_params->profile = inst->fw_caps[PROFILE_AV1].value;
+               subsc_params->level = inst->fw_caps[LEVEL_AV1].value;
+               break;
        }
 
        subsc_params->pic_order_cnt = inst->fw_caps[POC].value;

diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h
index 6e8e762bd5cf704d7932536bea56d4bdfc1bc598..14a2f4dbe38ab271c30df301e20b78b20ac08f12 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_common.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h
@@ -103,6 +103,13 @@ enum platform_inst_fw_cap_type {
        LEVEL_H264,
        LEVEL_HEVC,
        LEVEL_VP9,
+       PROFILE_AV1,
+       LEVEL_AV1,
+       TIER_AV1,
+       DRAP,
+       FILM_GRAIN,
+       SUPER_BLOCK,
+       ENH_LAYER_COUNT,
        INPUT_BUF_HOST_MAX_COUNT,
        OUTPUT_BUF_HOST_MAX_COUNT,
        STAGE,
@@ -241,6 +248,8 @@ struct iris_platform_data {
        unsigned int dec_input_config_params_hevc_size;
        const u32 *dec_input_config_params_vp9;
        unsigned int dec_input_config_params_vp9_size;
+       const u32 *dec_input_config_params_av1;
+       unsigned int dec_input_config_params_av1_size;
        const u32 *dec_output_config_params;
        unsigned int dec_output_config_params_size;
        const u32 *enc_input_config_params;
@@ -255,6 +264,8 @@ struct iris_platform_data {
        unsigned int dec_output_prop_hevc_size;
        const u32 *dec_output_prop_vp9;
        unsigned int dec_output_prop_vp9_size;
+       const u32 *dec_output_prop_av1;
+       unsigned int dec_output_prop_av1_size;
        const u32 *dec_ip_int_buf_tbl;
        unsigned int dec_ip_int_buf_tbl_size;
        const u32 *dec_op_int_buf_tbl;

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 010f6b804e0a516429ed49db7b2ed227a1e2c3be..b2d8559dd2b85dbc6aa427c15dd665d8d355f177 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -64,6 +64,16 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
                .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
                .set = iris_set_u32_enum,
        },
+       {
+               .cap_id = PROFILE_AV1,
+               .min = V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN,
+               .max = V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN,
+               .step_or_mask = BIT(V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN),
+               .value = V4L2_MPEG_VIDEO_AV1_PROFILE_MAIN,
+               .hfi_id = HFI_PROP_PROFILE,
+               .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
+               .set = iris_set_u32_enum,
+       },
        {
                .cap_id = PROFILE_VP9,
                .min = V4L2_MPEG_VIDEO_VP9_PROFILE_0,
@@ -147,6 +157,33 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
                .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
                .set = iris_set_u32_enum,
        },
+       {
+               .cap_id = LEVEL_AV1,
+               .min = V4L2_MPEG_VIDEO_AV1_LEVEL_2_0,
+               .max = V4L2_MPEG_VIDEO_AV1_LEVEL_6_1,
+               .step_or_mask = BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_2_0) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_2_1) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_2_2) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_2_3) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_3_0) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_3_1) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_3_2) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_3_3) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_4_0) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_4_1) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_4_2) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_4_3) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_5_0) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_5_1) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_5_2) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_5_3) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_6_0) |
+                               BIT(V4L2_MPEG_VIDEO_AV1_LEVEL_6_1),
+               .value = V4L2_MPEG_VIDEO_AV1_LEVEL_6_1,
+               .hfi_id = HFI_PROP_LEVEL,
+               .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
+               .set = iris_set_u32_enum,
+       },
        {
                .cap_id = TIER,
                .min = V4L2_MPEG_VIDEO_HEVC_TIER_MAIN,
@@ -158,6 +195,53 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
                .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,
                .set = iris_set_u32_enum,
        },
+       {
+               .cap_id = TIER_AV1,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_TIER,
+               .flags = CAP_FLAG_INPUT_PORT,
+               .set = iris_set_u32,
+       },
+       {
+               .cap_id = DRAP,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_AV1_DRAP_CONFIG,
+               .flags = CAP_FLAG_INPUT_PORT,
+               .set = iris_set_u32,
+       },
+       {
+               .cap_id = FILM_GRAIN,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_AV1_FILM_GRAIN_PRESENT,
+               .flags = CAP_FLAG_VOLATILE,
+       },
+       {
+               .cap_id = SUPER_BLOCK,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_AV1_SUPER_BLOCK_ENABLED,
+       },
+       {
+               .cap_id = ENH_LAYER_COUNT,
+               .min = 0,
+               .max = 1,
+               .step_or_mask = 1,
+               .value = 0,
+               .hfi_id = HFI_PROP_AV1_OP_POINT,
+               .flags = CAP_FLAG_INPUT_PORT,
+               .set = iris_set_u32,
+       },
        {
                .cap_id = INPUT_BUF_HOST_MAX_COUNT,
                .min = DEFAULT_MAX_HOST_BUF_COUNT,
@@ -699,6 +783,19 @@ static const u32 sm8550_vdec_input_config_param_vp9[] = {
        HFI_PROP_LEVEL,
 };
 
+static const u32 sm8550_vdec_input_config_param_av1[] = {
+       HFI_PROP_BITSTREAM_RESOLUTION,
+       HFI_PROP_CROP_OFFSETS,
+       HFI_PROP_LUMA_CHROMA_BIT_DEPTH,
+       HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT,
+       HFI_PROP_PROFILE,
+       HFI_PROP_LEVEL,
+       HFI_PROP_TIER,
+       HFI_PROP_AV1_FILM_GRAIN_PRESENT,
+       HFI_PROP_AV1_SUPER_BLOCK_ENABLED,
+       HFI_PROP_SIGNAL_COLOR_INFO,
+};
+
 static const u32 sm8550_venc_input_config_params[] = {
        HFI_PROP_COLOR_FORMAT,
        HFI_PROP_RAW_RESOLUTION,
@@ -736,11 +833,18 @@ static const u32 sm8550_vdec_subscribe_output_properties_vp9[] = {
        HFI_PROP_PICTURE_TYPE,
 };
 
+static const u32 sm8550_vdec_subscribe_output_properties_av1[] = {
+       HFI_PROP_PICTURE_TYPE,
+       HFI_PROP_WORST_COMPRESSION_RATIO,
+       HFI_PROP_WORST_COMPLEXITY_FACTOR,
+};
+
 static const u32 sm8550_dec_ip_int_buf_tbl[] = {
        BUF_BIN,
        BUF_COMV,
        BUF_NON_COMV,
        BUF_LINE,
+       BUF_PARTIAL,
 };
 
 static const u32 sm8550_dec_op_int_buf_tbl[] = {
@@ -805,6 +909,10 @@ const struct iris_platform_data sm8550_data = {
                sm8550_vdec_input_config_param_vp9,
        .dec_input_config_params_vp9_size =
                ARRAY_SIZE(sm8550_vdec_input_config_param_vp9),
+       .dec_input_config_params_av1 =
+               sm8550_vdec_input_config_param_av1,
+       .dec_input_config_params_av1_size =
+               ARRAY_SIZE(sm8550_vdec_input_config_param_av1),
        .dec_output_config_params =
                sm8550_vdec_output_config_params,
        .dec_output_config_params_size =
@@ -830,6 +938,10 @@ const struct iris_platform_data sm8550_data = {
        .dec_output_prop_vp9 = sm8550_vdec_subscribe_output_properties_vp9,
        .dec_output_prop_vp9_size =
                ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_vp9),
+       .dec_output_prop_av1 = sm8550_vdec_subscribe_output_properties_av1,
+       .dec_output_prop_av1_size =
+               ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_av1),
+
        .dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
        .dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),
        .dec_op_int_buf_tbl = sm8550_dec_op_int_buf_tbl,
@@ -898,6 +1010,10 @@ const struct iris_platform_data sm8650_data = {
                sm8550_vdec_input_config_param_vp9,
        .dec_input_config_params_vp9_size =
                ARRAY_SIZE(sm8550_vdec_input_config_param_vp9),
+       .dec_input_config_params_av1 =
+               sm8550_vdec_input_config_param_av1,
+       .dec_input_config_params_av1_size =
+               ARRAY_SIZE(sm8550_vdec_input_config_param_av1),
        .dec_output_config_params =
                sm8550_vdec_output_config_params,
        .dec_output_config_params_size =
@@ -923,6 +1039,9 @@ const struct iris_platform_data sm8650_data = {
        .dec_output_prop_vp9 = sm8550_vdec_subscribe_output_properties_vp9,
        .dec_output_prop_vp9_size =
                ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_vp9),
+       .dec_output_prop_av1 = sm8550_vdec_subscribe_output_properties_av1,
+       .dec_output_prop_av1_size =
+               ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_av1),
 
        .dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
        .dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),
@@ -981,6 +1100,10 @@ const struct iris_platform_data sm8750_data = {
                sm8550_vdec_input_config_param_vp9,
        .dec_input_config_params_vp9_size =
                ARRAY_SIZE(sm8550_vdec_input_config_param_vp9),
+       .dec_input_config_params_av1 =
+               sm8550_vdec_input_config_param_av1,
+       .dec_input_config_params_av1_size =
+               ARRAY_SIZE(sm8550_vdec_input_config_param_av1),
        .dec_output_config_params =
                sm8550_vdec_output_config_params,
        .dec_output_config_params_size =
@@ -1006,6 +1129,9 @@ const struct iris_platform_data sm8750_data = {
        .dec_output_prop_vp9 = sm8550_vdec_subscribe_output_properties_vp9,
        .dec_output_prop_vp9_size =
                ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_vp9),
+       .dec_output_prop_av1 = sm8550_vdec_subscribe_output_properties_av1,
+       .dec_output_prop_av1_size =
+               ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_av1),
 
        .dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
        .dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),
@@ -1070,6 +1196,10 @@ const struct iris_platform_data qcs8300_data = {
                sm8550_vdec_input_config_param_vp9,
        .dec_input_config_params_vp9_size =
                ARRAY_SIZE(sm8550_vdec_input_config_param_vp9),
+       .dec_input_config_params_av1 =
+               sm8550_vdec_input_config_param_av1,
+       .dec_input_config_params_av1_size =
+               ARRAY_SIZE(sm8550_vdec_input_config_param_av1),
        .dec_output_config_params =
                sm8550_vdec_output_config_params,
        .dec_output_config_params_size =
@@ -1095,6 +1225,9 @@ const struct iris_platform_data qcs8300_data = {
        .dec_output_prop_vp9 = sm8550_vdec_subscribe_output_properties_vp9,
        .dec_output_prop_vp9_size =
                ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_vp9),
+       .dec_output_prop_av1 = sm8550_vdec_subscribe_output_properties_av1,
+       .dec_output_prop_av1_size =
+               ARRAY_SIZE(sm8550_vdec_subscribe_output_properties_av1),
 
        .dec_ip_int_buf_tbl = sm8550_dec_ip_int_buf_tbl,
        .dec_ip_int_buf_tbl_size = ARRAY_SIZE(sm8550_dec_ip_int_buf_tbl),

diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
index c9b881923ef1831baaa86bea7c13c9734dbe6e4b..dfd94f4a84a9410d1e6b6a7c503c9d7bc4c7a1af 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_vidc.c
+++ b/drivers/media/platform/qcom/iris/iris_vidc.c
@@ -178,6 +178,7 @@ int iris_open(struct file *filp)
        INIT_LIST_HEAD(&inst->buffers[BUF_SCRATCH_1].list);
        INIT_LIST_HEAD(&inst->buffers[BUF_SCRATCH_2].list);
        INIT_LIST_HEAD(&inst->buffers[BUF_VPSS].list);
+       INIT_LIST_HEAD(&inst->buffers[BUF_PARTIAL].list);
        init_completion(&inst->completion);
        init_completion(&inst->flush_completion);