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_gpu.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_gpu.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index cc4c179005e9..c7cb3d851377 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -17,7 +17,7 @@ #include "msm_gpu.h" #include "msm_gem.h" - +#include "adreno/adreno_gpu.h" /* * Power Management: @@ -160,42 +160,42 @@ static int disable_axi(struct msm_gpu *gpu) return 0; } -int msm_gpu_pm_resume(struct msm_gpu *gpu) +int msm_gpu_pm_resume(struct adreno_gpu *gpu) { int ret; - DBG("%s", gpu->name); + DBG("%s", gpu->base.name); - ret = enable_pwrrail(gpu); + ret = enable_pwrrail(&gpu->base); if (ret) return ret; - ret = enable_clk(gpu); + ret = enable_clk(&gpu->base); if (ret) return ret; - ret = enable_axi(gpu); + ret = enable_axi(&gpu->base); if (ret) return ret; return 0; } -int msm_gpu_pm_suspend(struct msm_gpu *gpu) +int msm_gpu_pm_suspend(struct adreno_gpu *gpu) { int ret; - DBG("%s", gpu->name); + DBG("%s", gpu->base.name); - ret = disable_axi(gpu); + ret = disable_axi(&gpu->base); if (ret) return ret; - ret = disable_clk(gpu); + ret = disable_clk(&gpu->base); if (ret) return ret; - ret = disable_pwrrail(gpu); + ret = disable_pwrrail(&gpu->base); if (ret) return ret; @@ -214,7 +214,7 @@ static void recover_worker(struct work_struct *work) dev_err(dev->dev, "%s: hangcheck recover!\n", gpu->name); mutex_lock(&dev->struct_mutex); - gpu->funcs->recover(gpu); + gpu->funcs->recover(gpu->gpu); mutex_unlock(&dev->struct_mutex); msm_gpu_retire(gpu); @@ -230,7 +230,7 @@ static void hangcheck_timer_reset(struct msm_gpu *gpu) static void hangcheck_handler(unsigned long data) { struct msm_gpu *gpu = (struct msm_gpu *)data; - uint32_t fence = gpu->funcs->last_fence(gpu); + uint32_t fence = gpu->funcs->last_fence(gpu->gpu); if (fence != gpu->hangcheck_fence) { /* some progress has been made.. ya! */ @@ -255,7 +255,7 @@ static void retire_worker(struct work_struct *work) { struct msm_gpu *gpu = container_of(work, struct msm_gpu, retire_work); struct drm_device *dev = gpu->dev; - uint32_t fence = gpu->funcs->last_fence(gpu); + uint32_t fence = gpu->funcs->last_fence(gpu->gpu); mutex_lock(&dev->struct_mutex); @@ -301,7 +301,7 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, gpu->submitted_fence = submit->base.fence; - ret = gpu->funcs->submit(gpu, &submit->base, &filp->ctx); + ret = gpu->funcs->submit(gpu->gpu, &submit->base, &filp->ctx); for (i = 0; i < submit->nr_bos; i++) { struct msm_gem_object *msm_obj = submit->bos[i].obj; @@ -335,7 +335,7 @@ int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, static irqreturn_t irq_handler(int irq, void *data) { struct msm_gpu *gpu = data; - return gpu->funcs->irq(gpu); + return gpu->funcs->irq(gpu->gpu); } static const char *clk_names[] = { |