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.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index 2dc686e05c54..35e45b865e44 100644
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -46,8 +46,6 @@ struct msm_gpu {
/* list of GEM active objects: */
struct list_head active_list;
- uint32_t submitted_fence;
-
/* worker for handling active-list retiring: */
struct work_struct retire_work;
@@ -62,13 +60,6 @@ struct msm_gpu {
struct clk *ebi1_clk, *grp_clks[5];
uint32_t fast_rate, slow_rate, bus_freq;
uint32_t bsc;
-
- /* Hang Detction: */
-#define DRM_MSM_HANGCHECK_PERIOD 500 /* in ms */
-#define DRM_MSM_HANGCHECK_JIFFIES msecs_to_jiffies(DRM_MSM_HANGCHECK_PERIOD)
- struct timer_list hangcheck_timer;
- uint32_t hangcheck_fence;
- struct work_struct recover_work;
};
int msm_gpu_pm_suspend(struct adreno_gpu *gpu);
@@ -85,7 +76,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
void msm_gpu_cleanup(struct msm_gpu *gpu);
struct msm_gpu *a3xx_gpu_init(struct drm_device *dev,
- struct adreno_gem *gem);
+ struct adreno_gem *gem, struct workqueue_struct *wq);
void __init a3xx_register(void);
void __exit a3xx_unregister(void);