summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_gpu.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.h')
-rw-r--r--drivers/gpu/drm/msm/msm_gpu.h13
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 4487e18..b2a2d4c 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__ */