drm/msm/adreno: split out helper to load fw

[linux.git] / drivers / gpu / drm / msm / adreno / a5xx_power.c

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c
index 04aab1dcae2b12e9f52dff5d0de618e85e5f21c9..b5de2be67732777b3c90f8881e5032261ac8c75b 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_power.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c
@@ -264,7 +264,8 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)
                return;
 
        /* Get the firmware */
-       if (request_firmware(&fw, adreno_gpu->info->gpmufw, drm->dev)) {
+       fw = adreno_request_fw(adreno_gpu, adreno_gpu->info->gpmufw);
+       if (IS_ERR(fw)) {
                DRM_ERROR("%s: Could not get GPMU firmware. GPMU will not be active\n",
                        gpu->name);
                return;