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/msm_gpu.h | |
| 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/msm_gpu.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 4487e18ec526..b2a2d4cb9e41 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -19,7 +19,6 @@ #define __MSM_GPU_H__ #include <linux/clk.h> -#include <linux/regulator/consumer.h> #include "msm_drv.h" @@ -41,6 +40,7 @@ struct msm_gpu { struct drm_device *dev; struct adreno_gpu *gpu; + struct adreno_gem gem; const struct adreno_gpu_funcs *funcs; /* list of GEM active objects: */ @@ -53,20 +53,11 @@ struct msm_gpu { int id; }; -void msm_gpu_retire(struct msm_gpu *gpu); struct msm_gem_submit; int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, struct msm_file_private *ctx); -int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, - struct msm_gpu *gpu, const struct adreno_gpu_funcs *funcs, - const char *ioname, const char *irqname, int ringsz); +int msm_gpu_init(struct drm_device *drm, struct msm_gpu **gpu); void msm_gpu_cleanup(struct msm_gpu *gpu); -struct msm_gpu *a3xx_gpu_init(struct drm_device *dev, - struct adreno_gem *gem, struct workqueue_struct *wq, - int reglog); -void __init a3xx_register(void); -void __exit a3xx_unregister(void); - #endif /* __MSM_GPU_H__ */ |