summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/adreno/adreno_gpu.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/adreno_gpu.c')
-rw-r--r--drivers/gpu/drm/msm/adreno/adreno_gpu.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index f5abcc1..92f25e64 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -349,7 +349,7 @@ static void __iomem *adreno_ioremap(struct platform_device *pdev,
int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
struct adreno_gpu *gpu, const struct adreno_gpu_funcs *funcs,
- struct adreno_gem *gem, struct workqueue_struct *wq,
+ const struct adreno_gem *gem, struct workqueue_struct *wq,
struct adreno_rev rev)
{
int i, ret;
@@ -382,10 +382,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
gpu->shared_wq = wq;
gpu->rev = rev;
- /* XXX: urgh - pointers to self are fun! */
- gpu->gem->priv = &gpu->base;
- gpu->base.gpu = gpu;
-
ret = request_firmware(&gpu->pm4, gpu->info->pm4fw, drm->dev);
if (ret) {
dev_err(drm->dev, "failed to load %s PM4 firmware: %d\n",
@@ -421,12 +417,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
return ret;
}
- ret = msm_gpu_init(drm, pdev, &gpu->base, funcs,
- "kgsl_3d0_reg_memory", "kgsl_3d0_irq",
- RB_SIZE);
- if (ret)
- return ret;
-
gpu->memptrs_bo = gpu->gem->gem_new(gpu->gem->priv,
sizeof(*gpu->memptrs), MSM_BO_UNCACHED);
if (IS_ERR(gpu->memptrs_bo)) {
@@ -491,5 +481,4 @@ void adreno_gpu_cleanup(struct adreno_gpu *gpu)
release_firmware(gpu->pm4);
if (gpu->pfp)
release_firmware(gpu->pfp);
- msm_gpu_cleanup(&gpu->base);
}