media: iris: stop encoding PIPE value into fw_caps

The value of the PIPE property depends on the number of pipes available
on the platform and is frequently the only difference between several
fw_caps. In order to reduce duplication, use num_vpp_pipe from the
iris_platform_data rather than hardcoding the value into the fw_cap.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
[bod: duplciation -> duplication]
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 9da050aa1f7ce8152dfa46a706e2c27adfb5d6ce..c0b3a09ad3e3dfb0a47e3603a8089cf61390fda8 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_ctrls.c
+++ b/drivers/media/platform/qcom/iris/iris_ctrls.c
@@ -313,13 +313,23 @@ void iris_session_init_caps(struct iris_core *core)
                        continue;
 
                core->inst_fw_caps_dec[cap_id].cap_id = caps[i].cap_id;
-               core->inst_fw_caps_dec[cap_id].min = caps[i].min;
-               core->inst_fw_caps_dec[cap_id].max = caps[i].max;
                core->inst_fw_caps_dec[cap_id].step_or_mask = caps[i].step_or_mask;
-               core->inst_fw_caps_dec[cap_id].value = caps[i].value;
                core->inst_fw_caps_dec[cap_id].flags = caps[i].flags;
                core->inst_fw_caps_dec[cap_id].hfi_id = caps[i].hfi_id;
                core->inst_fw_caps_dec[cap_id].set = caps[i].set;
+
+               if (cap_id == PIPE) {
+                       core->inst_fw_caps_dec[cap_id].value =
+                               core->iris_platform_data->num_vpp_pipe;
+                       core->inst_fw_caps_dec[cap_id].min =
+                               core->iris_platform_data->num_vpp_pipe;
+                       core->inst_fw_caps_dec[cap_id].max =
+                               core->iris_platform_data->num_vpp_pipe;
+               } else {
+                       core->inst_fw_caps_dec[cap_id].min = caps[i].min;
+                       core->inst_fw_caps_dec[cap_id].max = caps[i].max;
+                       core->inst_fw_caps_dec[cap_id].value = caps[i].value;
+               }
        }
 
        caps = core->iris_platform_data->inst_fw_caps_enc;

diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
index 00e7b3b7d735c3e2d9a684ed20505dc4e444810b..8337018fd118e68cbd4e4d736f76f584e0f50fea 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c
@@ -160,10 +160,8 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = {
        },
        {
                .cap_id = PIPE,
-               .min = PIPE_1,
-               .max = PIPE_4,
+               /* .max, .min and .value are set via platform data */
                .step_or_mask = 1,
-               .value = PIPE_4,
                .hfi_id = HFI_PROP_PIPE,
                .set = iris_set_pipe,
        },

diff --git a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
index 87517361a1cf4b6fe53b8a1483188670df52c7e7..7ae50ab22f8c577675a10b767e1d5f3cfe16d439 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
+++ b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h
@@ -146,10 +146,8 @@ static const struct platform_inst_fw_cap inst_fw_cap_qcs8300_dec[] = {
        },
        {
                .cap_id = PIPE,
-               .min = PIPE_1,
-               .max = PIPE_2,
+               /* .max, .min and .value are set via platform data */
                .step_or_mask = 1,
-               .value = PIPE_2,
                .hfi_id = HFI_PROP_PIPE,
                .set = iris_set_pipe,
        },

diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
index 66a5bdd24d8a0e98b0554a019438bf4caa1dc43c..805179fba0c41bd7c9e3e5de365912de2b56c182 100644 (file)
--- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
@@ -20,10 +20,8 @@
 static const struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] = {
        {
                .cap_id = PIPE,
-               .min = PIPE_1,
-               .max = PIPE_4,
+               /* .max, .min and .value are set via platform data */
                .step_or_mask = 1,
-               .value = PIPE_4,
                .hfi_id = HFI_PROPERTY_PARAM_WORK_ROUTE,
                .set = iris_set_pipe,
        },