drm/etnaviv: replace MMU flush marker with flush sequence

[linux-2.6-microblaze.git] / drivers / gpu / drm / etnaviv / etnaviv_gpu.h

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index 9bcf151..9638094 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -7,6 +7,7 @@
 #define __ETNAVIV_GPU_H__
 
 #include "etnaviv_cmdbuf.h"
+#include "etnaviv_gem.h"
 #include "etnaviv_drv.h"
 
 struct etnaviv_gem_submit;
@@ -84,7 +85,6 @@ struct etnaviv_event {
 };
 
 struct etnaviv_cmdbuf_suballoc;
-struct etnaviv_cmdbuf;
 struct regulator;
 struct clk;
 
@@ -99,8 +99,10 @@ struct etnaviv_gpu {
        enum etnaviv_sec_mode sec_mode;
        struct workqueue_struct *wq;
        struct drm_gpu_scheduler sched;
+       bool initialized;
 
        /* 'ring'-buffer: */
+       struct etnaviv_vram_mapping cmdbuf_mapping;
        struct etnaviv_cmdbuf buffer;
        int exec_state;
 
@@ -135,7 +137,7 @@ struct etnaviv_gpu {
        int irq;
 
        struct etnaviv_iommu *mmu;
-       struct etnaviv_cmdbuf_suballoc *cmdbuf_suballoc;
+       unsigned int flush_seq;
 
        /* Power Control: */
        struct clk *clk_bus;