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

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
...@@ -270,7 +270,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) ...@@ -270,7 +270,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)
return; return;
/* Get the firmware */ /* 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)) { if (IS_ERR(fw)) {
DRM_ERROR("%s: Could not get GPMU firmware. GPMU will not be active\n", DRM_ERROR("%s: Could not get GPMU firmware. GPMU will not be active\n",
gpu->name); gpu->name);
......
...@@ -84,7 +84,7 @@ static const struct adreno_info gpulist[] = { ...@@ -84,7 +84,7 @@ static const struct adreno_info gpulist[] = {
.quirks = ADRENO_QUIRK_TWO_PASS_USE_WFI | .quirks = ADRENO_QUIRK_TWO_PASS_USE_WFI |
ADRENO_QUIRK_FAULT_DETECT_MASK, ADRENO_QUIRK_FAULT_DETECT_MASK,
.init = a5xx_gpu_init, .init = a5xx_gpu_init,
.gpmufw = "a530v3_gpmu.fw2", .powerfw = "a530v3_gpmu.fw2",
.zapfw = "a530_zap.mdt", .zapfw = "a530_zap.mdt",
}, },
}; };
......
...@@ -73,7 +73,7 @@ struct adreno_info { ...@@ -73,7 +73,7 @@ struct adreno_info {
uint32_t revn; uint32_t revn;
const char *name; const char *name;
const char *pm4fw, *pfpfw; const char *pm4fw, *pfpfw;
const char *gpmufw; const char *powerfw;
uint32_t gmem; uint32_t gmem;
enum adreno_quirks quirks; enum adreno_quirks quirks;
struct msm_gpu *(*init)(struct drm_device *dev); struct msm_gpu *(*init)(struct drm_device *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment