diff options
-rw-r--r-- | drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_device.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c index 4e4d965fd9ab..6630e6c0c8be 100644 --- 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) | |||
270 | return; | 270 | return; |
271 | 271 | ||
272 | /* Get the firmware */ | 272 | /* Get the firmware */ |
273 | fw = adreno_request_fw(adreno_gpu, adreno_gpu->info->gpmufw); | 273 | fw = adreno_request_fw(adreno_gpu, adreno_gpu->info->powerfw); |
274 | if (IS_ERR(fw)) { | 274 | if (IS_ERR(fw)) { |
275 | DRM_ERROR("%s: Could not get GPMU firmware. GPMU will not be active\n", | 275 | DRM_ERROR("%s: Could not get GPMU firmware. GPMU will not be active\n", |
276 | gpu->name); | 276 | gpu->name); |
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 6263cb906b3c..d64ceeb0d6f0 100644 --- 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[] = { | |||
84 | .quirks = ADRENO_QUIRK_TWO_PASS_USE_WFI | | 84 | .quirks = ADRENO_QUIRK_TWO_PASS_USE_WFI | |
85 | ADRENO_QUIRK_FAULT_DETECT_MASK, | 85 | ADRENO_QUIRK_FAULT_DETECT_MASK, |
86 | .init = a5xx_gpu_init, | 86 | .init = a5xx_gpu_init, |
87 | .gpmufw = "a530v3_gpmu.fw2", | 87 | .powerfw = "a530v3_gpmu.fw2", |
88 | .zapfw = "a530_zap.mdt", | 88 | .zapfw = "a530_zap.mdt", |
89 | }, | 89 | }, |
90 | }; | 90 | }; |
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index 8d3d0a924908..0a869bb8ee9d 100644 --- 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 { | |||
73 | uint32_t revn; | 73 | uint32_t revn; |
74 | const char *name; | 74 | const char *name; |
75 | const char *pm4fw, *pfpfw; | 75 | const char *pm4fw, *pfpfw; |
76 | const char *gpmufw; | 76 | const char *powerfw; |
77 | uint32_t gmem; | 77 | uint32_t gmem; |
78 | enum adreno_quirks quirks; | 78 | enum adreno_quirks quirks; |
79 | struct msm_gpu *(*init)(struct drm_device *dev); | 79 | struct msm_gpu *(*init)(struct drm_device *dev); |