Commit 15447d18 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: hfi_cmds: Support plane-actual-info property from v1 



The property is supported from v1 and upwards. So move it to
set_property_1x.

Fixes: 01e869e7 ("media: venus: venc: fix handlig of S_SELECTION and G_SELECTION")
Cc: stable@vger.kernel.org # v5.12
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Tested-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 39a6b918

drivers/media/platform/qcom/venus/hfi_cmds.c

+12 −12
Original line number Diff line number Diff line
@@ -1039,6 +1039,18 @@ static int pkt_session_set_property_1x(struct hfi_session_set_property_pkt *pkt, 
		pkt->shdr.hdr.size += sizeof(u32) + sizeof(*hierp);

		break;

	}

	case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO: {

		struct hfi_uncompressed_plane_actual_info *in = pdata;

		struct hfi_uncompressed_plane_actual_info *info = prop_data;



		info->buffer_type = in->buffer_type;

		info->num_planes = in->num_planes;

		info->plane_format[0] = in->plane_format[0];

		if (in->num_planes > 1)

			info->plane_format[1] = in->plane_format[1];

		pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info);

		break;

	}



	/* FOLLOWING PROPERTIES ARE NOT IMPLEMENTED IN CORE YET */

	case HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS:
@@ -1205,18 +1217,6 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt, 
		pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cu);

		break;

	}

	case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO: {

		struct hfi_uncompressed_plane_actual_info *in = pdata;

		struct hfi_uncompressed_plane_actual_info *info = prop_data;



		info->buffer_type = in->buffer_type;

		info->num_planes = in->num_planes;

		info->plane_format[0] = in->plane_format[0];

		if (in->num_planes > 1)

			info->plane_format[1] = in->plane_format[1];

		pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info);

		break;

	}

	case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE:

	case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER:

	case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE: