diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2013-09-16 18:38:26 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2013-09-17 08:45:18 +0200 |
| commit | 112fc6ba0fcf9314f154a92f15921207cc78c64c (patch) | |
| tree | 6632707cfb4cc6deed09b9ccbcb1d5396b9f39c8 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 7fe6bde06a00ac424701af59aefec7a3186aabfe (diff) | |
| download | linux-112fc6ba0fcf9314f154a92f15921207cc78c64c.tar.gz linux-112fc6ba0fcf9314f154a92f15921207cc78c64c.tar.xz | |
WIP: prune msm_gpu from adreno interfaces
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 2f58c5908732..df3f77822d71 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -156,8 +156,8 @@ static int msm_unload(struct drm_device *dev) if (gpu) { mutex_lock(&dev->struct_mutex); - gpu->funcs->pm_suspend(gpu); - gpu->funcs->destroy(gpu); + gpu->funcs->pm_suspend(gpu->gpu); + gpu->funcs->destroy(gpu->gpu); mutex_unlock(&dev->struct_mutex); } @@ -317,11 +317,11 @@ static void load_gpu(struct drm_device *dev) if (gpu) { int ret; - gpu->funcs->pm_resume(gpu); - ret = gpu->funcs->hw_init(gpu); + gpu->funcs->pm_resume(gpu->gpu); + ret = gpu->funcs->hw_init(gpu->gpu); if (ret) { dev_err(dev->dev, "gpu hw init failed: %d\n", ret); - gpu->funcs->destroy(gpu); + gpu->funcs->destroy(gpu->gpu); gpu = NULL; } } @@ -434,7 +434,7 @@ static int msm_gpu_show(struct drm_device *dev, struct seq_file *m) if (gpu) { seq_printf(m, "%s Status:\n", gpu->name); - gpu->funcs->show(gpu, m); + gpu->funcs->show(gpu->gpu, m); } return 0; @@ -600,7 +600,7 @@ static int msm_ioctl_get_param(struct drm_device *dev, void *data, if (!gpu) return -ENXIO; - return gpu->funcs->get_param(gpu, args->param, &args->value); + return gpu->funcs->get_param(gpu->gpu, args->param, &args->value); } static int msm_ioctl_gem_new(struct drm_device *dev, void *data, |