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

Commit f82dc47e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Use smem_get_entry_to_proc()"

parents 13e75329 d246099e

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

+2 −2
Original line number Diff line number Diff line
@@ -1296,8 +1296,8 @@ static void hfi_process_sys_get_prop_image_version( 
	version[i] = '\0';

	dprintk(VIDC_DBG, "F/W version: %s\n", version);



	smem_table_ptr = smem_get_entry(SMEM_IMAGE_VERSION_TABLE,

			&smem_block_size);

	smem_table_ptr = smem_get_entry_to_proc(SMEM_IMAGE_VERSION_TABLE,

			&smem_block_size, 0, SMEM_ANY_HOST_FLAG);

	if (smem_table_ptr &&

			((smem_image_index_venus +

				version_string_size) <= smem_block_size))

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

+2 −2
Original line number Diff line number Diff line
@@ -3505,8 +3505,8 @@ int venus_hfi_get_core_capabilities(void) 
	u8 version_info[256];

	const u32 smem_image_index_venus = 14 * 128;



	smem_table_ptr = smem_get_entry(SMEM_IMAGE_VERSION_TABLE,

			&smem_block_size);

	smem_table_ptr = smem_get_entry_to_proc(SMEM_IMAGE_VERSION_TABLE,

			&smem_block_size, 0, SMEM_ANY_HOST_FLAG);

	if (smem_table_ptr &&

			((smem_image_index_venus + 128) <= smem_block_size))

		memcpy(version_info, smem_table_ptr + smem_image_index_venus,