Skip to content

Commit 61429aa

Browse files
Dikshita Agarwalgregkh
authored andcommitted
media: iris: Remove deprecated property setting to firmware
commit a693b4a upstream. HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER is deprecated and no longer supported on current firmware, remove setting the same to firmware. Cc: stable@vger.kernel.org Fixes: 7986525 ("media: iris: enable video driver probe of SM8250 SoC") Acked-by: Vikash Garodia <quic_vgarodia@quicinc.com> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-HDK Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-QRD Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com> Tested-by: Vikash Garodia <quic_vgarodia@quicinc.com> # on sa8775p-ride Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 991e881 commit 61429aa

File tree

5 files changed

+1
-23
lines changed

5 files changed

+1
-23
lines changed

drivers/media/platform/qcom/iris/iris_ctrls.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ static inline bool iris_valid_cap_id(enum platform_inst_fw_cap_type cap_id)
1717
static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
1818
{
1919
switch (id) {
20-
case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER:
21-
return DEBLOCK;
2220
case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
2321
return PROFILE;
2422
case V4L2_CID_MPEG_VIDEO_H264_LEVEL:
@@ -34,8 +32,6 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
3432
return 0;
3533

3634
switch (cap_id) {
37-
case DEBLOCK:
38-
return V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER;
3935
case PROFILE:
4036
return V4L2_CID_MPEG_VIDEO_H264_PROFILE;
4137
case LEVEL:

drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,14 +490,6 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p
490490
packet->shdr.hdr.size += sizeof(u32) + sizeof(*wm);
491491
break;
492492
}
493-
case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER: {
494-
struct hfi_enable *en = prop_data;
495-
u32 *in = pdata;
496-
497-
en->enable = *in;
498-
packet->shdr.hdr.size += sizeof(u32) + sizeof(*en);
499-
break;
500-
}
501493
default:
502494
return -EINVAL;
503495
}

drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565

6666
#define HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS 0x202001
6767

68-
#define HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER 0x1200001
6968
#define HFI_PROPERTY_PARAM_VDEC_DPB_COUNTS 0x120300e
7069
#define HFI_PROPERTY_CONFIG_VDEC_ENTROPY 0x1204004
7170

drivers/media/platform/qcom/iris/iris_platform_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ enum platform_inst_fw_cap_type {
8989
CODED_FRAMES,
9090
BIT_DEPTH,
9191
RAP_FRAME,
92-
DEBLOCK,
92+
TIER,
9393
INST_FW_CAP_MAX,
9494
};
9595

drivers/media/platform/qcom/iris/iris_platform_sm8250.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8250[] = {
3030
.hfi_id = HFI_PROPERTY_PARAM_WORK_MODE,
3131
.set = iris_set_stage,
3232
},
33-
{
34-
.cap_id = DEBLOCK,
35-
.min = 0,
36-
.max = 1,
37-
.step_or_mask = 1,
38-
.value = 0,
39-
.hfi_id = HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER,
40-
.set = iris_set_u32,
41-
},
4233
};
4334

4435
static struct platform_inst_caps platform_inst_cap_sm8250 = {

0 commit comments

Comments
 (0)