diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2013-09-16 18:55:19 +0200 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2013-09-17 10:51:36 +0200 |
commit | a19509d922fed36838c7b26dc58de3a3eb88bef4 (patch) | |
tree | fafeeb097dbcc13190a974079764cfc9f6295d6f /drivers/gpu/drm/msm/adreno/adreno_gpu.c | |
parent | 0cfdf63b987e5a6dc8df7784110312bb99101920 (diff) | |
download | linux-msm-rebase-master.tar.gz linux-msm-rebase-master.tar.xz |
WIP: finally turn all interfaces aroundmsm-rebase-master
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/adreno_gpu.c')
-rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_gpu.c | 13 |
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 f5abcc131639..92f25e6405be 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); } |