Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

media: venus: core: delete not used buffer mode flags 



Delete not used flag for capture buffer allocation mode and
no longer used cap_bufs_mode_dynamic from instance structure.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Tested-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent d4a5b0a6

drivers/media/platform/qcom/venus/core.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -255,8 +255,6 @@ struct venus_buffer { 
 * @priv:	a private for HFI operations callbacks

 * @priv:	a private for HFI operations callbacks

 * @session_type:	the type of the session (decoder or encoder)

 * @session_type:	the type of the session (decoder or encoder)

 * @hprop:	a union used as a holder by get property

 * @hprop:	a union used as a holder by get property

 * @cap_bufs_mode_static:	buffers allocation mode capability

 * @cap_bufs_mode_dynamic:	buffers allocation mode capability

 */

 */

struct venus_inst {

struct venus_inst {

	struct list_head list;

	struct list_head list;
@@ -305,8 +303,6 @@ struct venus_inst { 
	const struct hfi_inst_ops *ops;

	const struct hfi_inst_ops *ops;

	u32 session_type;

	u32 session_type;

	union hfi_get_property hprop;

	union hfi_get_property hprop;

	bool cap_bufs_mode_static;

	bool cap_bufs_mode_dynamic;

};

};





#define IS_V1(core)	((core)->res->hfi_version == HFI_VERSION_1XX)

#define IS_V1(core)	((core)->res->hfi_version == HFI_VERSION_1XX)

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

+3 −8
Original line number Original line Diff line number Diff line
@@ -60,8 +60,7 @@ fill_buf_mode(struct venus_caps *cap, const void *data, unsigned int num) 
}

}





static void

static void

parse_alloc_mode(struct venus_core *core, struct venus_inst *inst, u32 codecs,

parse_alloc_mode(struct venus_core *core, u32 codecs, u32 domain, void *data)

		 u32 domain, void *data)

{

{

	struct hfi_buffer_alloc_mode_supported *mode = data;

	struct hfi_buffer_alloc_mode_supported *mode = data;

	u32 num_entries = mode->num_entries;

	u32 num_entries = mode->num_entries;
@@ -74,13 +73,9 @@ parse_alloc_mode(struct venus_core *core, struct venus_inst *inst, u32 codecs, 




	while (num_entries--) {

	while (num_entries--) {

		if (mode->buffer_type == HFI_BUFFER_OUTPUT ||

		if (mode->buffer_type == HFI_BUFFER_OUTPUT ||

		    mode->buffer_type == HFI_BUFFER_OUTPUT2) {

		    mode->buffer_type == HFI_BUFFER_OUTPUT2)

			if (*type == HFI_BUFFER_MODE_DYNAMIC && inst)

				inst->cap_bufs_mode_dynamic = true;



			for_each_codec(core->caps, ARRAY_SIZE(core->caps),

			for_each_codec(core->caps, ARRAY_SIZE(core->caps),

				       codecs, domain, fill_buf_mode, type, 1);

				       codecs, domain, fill_buf_mode, type, 1);

		}





		type++;

		type++;

	}

	}
@@ -267,7 +262,7 @@ u32 hfi_parser(struct venus_core *core, struct venus_inst *inst, void *buf, 
			parse_profile_level(core, codecs, domain, data);

			parse_profile_level(core, codecs, domain, data);

			break;

			break;

		case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE_SUPPORTED:

		case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE_SUPPORTED:

			parse_alloc_mode(core, inst, codecs, domain, data);

			parse_alloc_mode(core, codecs, domain, data);

			break;

			break;

		default:

		default:

			break;

			break;