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

Commit a48a0ff2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for video HEAP ID for sdm660"

parents 455dee37 ccb15fba

arch/arm64/boot/dts/qcom/sdm660-ion.dtsi

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016, 2020, 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
@@ -43,5 +43,12 @@ 
			reg = <9>;

			qcom,ion-heap-type = "SYSTEM_SECURE";

		};



		qcom,ion-heap@12 { /* VIDEO HEAP */

			reg = <12>;

			memory-region = <&video_mem>;

			qcom,ion-heap-type = "HYP_CMA";

		};



	};

};

arch/arm64/boot/dts/qcom/sdm660.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -501,6 +501,14 @@ 
			size = <0x0 0x5c00000>;

		};



		video_mem: video_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xC0000000>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x9800000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";

drivers/soc/qcom/secure_buffer.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 Google, Inc

 * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2020, 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
@@ -457,6 +457,8 @@ const char *msm_secure_vmid_to_string(int secure_vmid) 
		return "VMID_CP_SPSS_SP_SHARED";

	case VMID_CP_SPSS_HLOS_SHARED:

		return "VMID_CP_SPSS_HLOS_SHARED";

	case VMID_CP_CAMERA_ENCODE:

		return "VMID_CP_CAMERA_ENCODE";

	case VMID_CP_CDSP:

		return "VMID_CP_CDSP";

	case VMID_CP_DSP_EXT:

drivers/staging/android/ion/ion.h

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * drivers/staging/android/ion/ion.h

 *

 * Copyright (C) 2011 Google, Inc.

 * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -44,6 +44,7 @@ 
#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_AUDIO_HEAP_NAME    "audio"

#define ION_VIDEO_HEAP_NAME    "video"



#define ION_IS_CACHED(__flags)  ((__flags) & ION_FLAG_CACHED)

drivers/staging/android/ion/ion_secure_util.c

+4 −1
Original line number Diff line number Diff line 
/*

 *

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, 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
@@ -31,6 +31,7 @@ bool is_secure_vmid_valid(int vmid) 
		vmid == VMID_CP_SPSS_SP ||

		vmid == VMID_CP_SPSS_SP_SHARED ||

		vmid == VMID_CP_SPSS_HLOS_SHARED ||

		vmid == VMID_CP_CAMERA_ENCODE ||

		vmid == VMID_CP_CDSP ||

		vmid == VMID_CP_DSP_EXT);

}
@@ -59,6 +60,8 @@ int get_secure_vmid(unsigned long flags) 
		return VMID_CP_SPSS_SP_SHARED;

	if (flags & ION_FLAG_CP_SPSS_HLOS_SHARED)

		return VMID_CP_SPSS_HLOS_SHARED;

	if (flags & ION_FLAG_CP_CAMERA_ENCODE)

		return VMID_CP_CAMERA_ENCODE;

	if (flags & ION_FLAG_CP_CDSP)

		return VMID_CP_CDSP;

	if (flags & ION_FLAG_CP_DSP_EXT)