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

Commit f306953f authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/adreno: Rename gpmufw to powerfw 



The power management device on the a5xx cores is known as the
GPMU (Graphics Power Management Unit). On a6xx cores the device
was expanded and renamed as the GMU (Graphics Management Unit).
Rename the 'gpmufw' name struct adreno_info as 'powerfw' to
avoid confusion.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent edf5ceac

drivers/gpu/drm/msm/adreno/a5xx_power.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) 
		return;



	/* Get the firmware */

	fw = adreno_request_fw(adreno_gpu, adreno_gpu->info->gpmufw);

	fw = adreno_request_fw(adreno_gpu, adreno_gpu->info->powerfw);

	if (IS_ERR(fw)) {

		DRM_ERROR("%s: Could not get GPMU firmware. GPMU will not be active\n",

			gpu->name);

drivers/gpu/drm/msm/adreno/adreno_device.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static const struct adreno_info gpulist[] = { 
		.quirks = ADRENO_QUIRK_TWO_PASS_USE_WFI |

			ADRENO_QUIRK_FAULT_DETECT_MASK,

		.init = a5xx_gpu_init,

		.gpmufw = "a530v3_gpmu.fw2",

		.powerfw = "a530v3_gpmu.fw2",

		.zapfw = "a530_zap.mdt",

	},

};

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct adreno_info { 
	uint32_t revn;

	const char *name;

	const char *pm4fw, *pfpfw;

	const char *gpmufw;

	const char *powerfw;

	uint32_t gmem;

	enum adreno_quirks quirks;

	struct msm_gpu *(*init)(struct drm_device *dev);