diff options
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_ringbuffer.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 59c5fd62c7ce..c0bf75b47ef6 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -112,7 +112,6 @@ uint32_t adreno_last_fence(struct adreno_gpu *gpu) void adreno_recover(struct adreno_gpu *gpu) { - struct drm_device *dev = gpu->base.dev; int ret; gpu->funcs->pm_suspend(gpu); @@ -126,7 +125,7 @@ void adreno_recover(struct adreno_gpu *gpu) gpu->funcs->pm_resume(gpu); ret = gpu->funcs->hw_init(gpu); if (ret) { - dev_err(dev->dev, "gpu hw init failed: %d\n", ret); + dev_err(gpu->drm->dev, "gpu hw init failed: %d\n", ret); /* hmm, oh well? */ } } @@ -295,6 +294,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, DBG("Found GPU: %s (%u.%u.%u.%u)", gpu->info->name, rev.core, rev.major, rev.minor, rev.patchid); + gpu->drm = drm; gpu->funcs = funcs; gpu->gem = gem; gpu->rev = rev; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index d4aa796df595..8d7f26e7d950 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -48,6 +48,7 @@ struct adreno_rbmemptrs { struct adreno_gpu { struct msm_gpu base; struct platform_device *pdev; + struct drm_device *drm; struct adreno_rev rev; const struct adreno_info *info; uint32_t revn; /* numeric revision name */ diff --git a/drivers/gpu/drm/msm/adreno/adreno_ringbuffer.c b/drivers/gpu/drm/msm/adreno/adreno_ringbuffer.c index eea65f6419dd..3d68bc89a4b9 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_ringbuffer.c +++ b/drivers/gpu/drm/msm/adreno/adreno_ringbuffer.c @@ -16,7 +16,6 @@ */ #include "adreno/adreno_gpu.h" -#include "msm_gpu.h" struct adreno_ringbuffer *adreno_ringbuffer_new(struct adreno_gpu *gpu, int size) { |