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

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

Merge "msm: kgsl: Enable content protection for 8996"

parents 49d2ee12 da9ffef0

arch/arm/boot/dts/qcom/msm8996-gpu.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 


		qcom,secure_align_mask = <0xfff>;

		qcom,retention;

		qcom,hyp_secure_alloc;



		gfx3d_user: gfx3d_user {

			compatible = "qcom,smmu-kgsl-cb";

drivers/gpu/msm/adreno-gpulist.h

+4 −2
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ static const struct adreno_gpu_core adreno_gpulist[] = { 
		.minor = 0,

		.patchid = 1,

		.features = ADRENO_GPMU | ADRENO_SPTP_PC | ADRENO_LM |

			ADRENO_PREEMPTION | ADRENO_SYNC_SMMU_PC | ADRENO_64BIT,

			ADRENO_PREEMPTION | ADRENO_SYNC_SMMU_PC | ADRENO_64BIT |

			ADRENO_CONTENT_PROTECTION,

		.pm4fw_name = "a530_pm4.fw",

		.pfpfw_name = "a530_pfp.fw",

		.zap_name = "a530_zap",
@@ -166,7 +167,8 @@ static const struct adreno_gpu_core adreno_gpulist[] = { 
		.minor = 0,

		.patchid = ANY_ID,

		.features = ADRENO_GPMU | ADRENO_SPTP_PC | ADRENO_LM |

			ADRENO_PREEMPTION | ADRENO_64BIT,

			ADRENO_PREEMPTION | ADRENO_64BIT |

			ADRENO_CONTENT_PROTECTION,

		.pm4fw_name = "a530_pm4.fw",

		.pfpfw_name = "a530_pfp.fw",

		.zap_name = "a530_zap",