diff options
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index c7cb3d851377..96214168c91c 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -164,7 +164,7 @@ int msm_gpu_pm_resume(struct adreno_gpu *gpu) { int ret; - DBG("%s", gpu->base.name); + DBG("%s", adreno_get_name(gpu)); ret = enable_pwrrail(&gpu->base); if (ret) @@ -185,7 +185,7 @@ int msm_gpu_pm_suspend(struct adreno_gpu *gpu) { int ret; - DBG("%s", gpu->base.name); + DBG("%s", adreno_get_name(gpu)); ret = disable_axi(&gpu->base); if (ret) @@ -211,7 +211,8 @@ static void recover_worker(struct work_struct *work) struct msm_gpu *gpu = container_of(work, struct msm_gpu, recover_work); struct drm_device *dev = gpu->dev; - dev_err(dev->dev, "%s: hangcheck recover!\n", gpu->name); + dev_err(dev->dev, "%s: hangcheck recover!\n", + adreno_get_name(gpu->gpu)); mutex_lock(&dev->struct_mutex); gpu->funcs->recover(gpu->gpu); @@ -222,7 +223,7 @@ static void recover_worker(struct work_struct *work) static void hangcheck_timer_reset(struct msm_gpu *gpu) { - DBG("%s", gpu->name); + DBG("%s", adreno_get_name(gpu->gpu)); mod_timer(&gpu->hangcheck_timer, round_jiffies_up(jiffies + DRM_MSM_HANGCHECK_JIFFIES)); } @@ -344,13 +345,12 @@ static const char *clk_names[] = { int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct adreno_gpu_funcs *funcs, - const char *name, const char *ioname, const char *irqname, int ringsz) + const char *ioname, const char *irqname, int ringsz) { int i, ret; gpu->dev = drm; gpu->funcs = funcs; - gpu->name = name; INIT_LIST_HEAD(&gpu->active_list); INIT_WORK(&gpu->retire_work, retire_worker); @@ -362,7 +362,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, BUG_ON(ARRAY_SIZE(clk_names) != ARRAY_SIZE(gpu->grp_clks)); /* Map registers: */ - gpu->mmio = msm_ioremap(pdev, ioname, name); + gpu->mmio = msm_ioremap(pdev, ioname, adreno_get_name(gpu->gpu)); if (IS_ERR(gpu->mmio)) { ret = PTR_ERR(gpu->mmio); goto fail; @@ -377,7 +377,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, } ret = devm_request_irq(&pdev->dev, gpu->irq, irq_handler, - IRQF_TRIGGER_HIGH, gpu->name, gpu); + IRQF_TRIGGER_HIGH, adreno_get_name(gpu->gpu), gpu); if (ret) { dev_err(drm->dev, "failed to request IRQ%u: %d\n", gpu->irq, ret); goto fail; @@ -429,7 +429,7 @@ fail: void msm_gpu_cleanup(struct msm_gpu *gpu) { - DBG("%s", gpu->name); + DBG("%s", adreno_get_name(gpu->gpu)); WARN_ON(!list_empty(&gpu->active_list)); |