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: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c
index 4e4d965fd9ab5924aca6feb607e367c255b43c37..6630e6c0c8be255a271dc323d41aa35fe6c397d0 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_power.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c
@@ -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);

diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index 6263cb906b3c87e2acd828bac2c6ffef5b568f9b..d64ceeb0d6f05416ae4a0f64ea26e5f90f815624 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -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",
        },
 };

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 8d3d0a9249082ab451cc166c73803b1d89724f33..0a869bb8ee9df14265787e7b8a17a9d2a248168c 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -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);