Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[mirror_ubuntu-artful-kernel.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 f233ac4c7c1cea456ee4c4c4b7e0d0878aefc093..f5321e2f25ffd293caa19a6fca32672adfe9a939 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -23,6 +23,7 @@
 #include "etnaviv_drv.h"
 
 struct etnaviv_gem_submit;
+struct etnaviv_vram_mapping;
 
 struct etnaviv_chip_identity {
        /* Chip model. */
@@ -103,6 +104,7 @@ struct etnaviv_gpu {
 
        /* 'ring'-buffer: */
        struct etnaviv_cmdbuf *buffer;
+       int exec_state;
 
        /* bus base address of memory  */
        u32 memory_base;
@@ -166,7 +168,7 @@ struct etnaviv_cmdbuf {
        struct list_head node;
        /* BOs attached to this command buffer */
        unsigned int nr_bos;
-       struct etnaviv_gem_object *bo[0];
+       struct etnaviv_vram_mapping *bo_map[0];
 };
 
 static inline void gpu_write(struct etnaviv_gpu *gpu, u32 reg, u32 data)