Merge "msm: vidc: ensure codec count is in supported session range" (8b4d9679) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/vidc/hfi_response_handler.c

+11 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, 2019 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -603,6 +603,11 @@ static int hfi_fill_codec_info(u8 *data_ptr,
		vidc_get_hal_codec((1 << i) & codecs);
		capability->domain =
		vidc_get_hal_domain(HFI_VIDEO_DOMAIN_DECODER);
		if (codec_count == VIDC_MAX_DECODE_SESSIONS) {
		dprintk(VIDC_ERR,
		"Max supported decoder sessions reached");
		break;
		}
		}
		}
		codecs = sys_init_done->enc_codec_supported;
		@@ -614,6 +619,11 @@ static int hfi_fill_codec_info(u8 *data_ptr,
		vidc_get_hal_codec((1 << i) & codecs);
		capability->domain =
		vidc_get_hal_domain(HFI_VIDEO_DOMAIN_ENCODER);
		if (codec_count == VIDC_MAX_SESSIONS) {
		dprintk(VIDC_ERR,
		"Max supported sessions reached");
		break;
		}
		}
		}
		sys_init_done->codec_count = codec_count;

+4 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2017, 2019 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -66,6 +66,9 @@

		/* 16 encoder and 16 decoder sessions */
		#define VIDC_MAX_SESSIONS 32
		#define VIDC_MAX_DECODE_SESSIONS 16
		#define VIDC_MAX_ENCODE_SESSIONS 16


		enum vidc_status {
		VIDC_ERR_NONE = 0x0,