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

Commit 754f2699 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: Update expected GMU FW version"

parents b12032f3 7b12108e

drivers/gpu/msm/adreno-gpulist.h

+2 −2
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ static const struct adreno_gpu_core adreno_gpulist[] = { 
		.num_protected_regs = 0x20,

		.busy_mask = 0xFFFFFFFE,

		.gpmufw_name = "a630_gmu.bin",

		.gpmu_major = 0x0,

		.gpmu_minor = 0x005,

		.gpmu_major = 0x1,

		.gpmu_minor = 0x001,

		.gpmu_tsens = 0x000C000D,

		.max_power = 5448,

	},

drivers/gpu/msm/kgsl_hfi.c

+2 −2
Original line number Diff line number Diff line
@@ -594,12 +594,12 @@ int hfi_start(struct gmu_device *gmu, uint32_t boot_state) 


	gmu->ver = ver;

	if (major != FW_VER_MAJOR(ver))

		dev_err(dev, "FW version major %d error (expect %d)\n",

		WARN_ONCE(1, "FW version major %d error (expect %d)\n",

				FW_VER_MAJOR(ver),

				adreno_dev->gpucore->gpmu_major);



	if (minor > FW_VER_MINOR(ver))

		dev_err(dev, "FW version minor %d error (expect %d)\n",

		WARN_ONCE(1, "FW version minor %d error (expect %d)\n",

				FW_VER_MINOR(ver),

				adreno_dev->gpucore->gpmu_minor);