1 files changed, 11 insertions, 2 deletions

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 3d1df6b1c4d3..f53fe6cd72be 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -91,8 +91,12 @@ struct vc4_dev {
         struct vc4_bo *overflow_mem;
         struct work_struct overflow_mem_work;
 
+        int power_refcount;
+
+        /* Mutex controlling the power refcount. */
+        struct mutex power_lock;
+
         struct {
-                uint32_t last_ct0ca, last_ct1ca;
                 struct timer_list timer;
                 struct work_struct reset_work;
         } hangcheck;
@@ -142,6 +146,7 @@ struct vc4_seqno_cb {
 };
 
 struct vc4_v3d {
+        struct vc4_dev *vc4;
         struct platform_device *pdev;
         void __iomem *regs;
 };
@@ -202,6 +207,11 @@ struct vc4_exec_info {
         /* Sequence number for this bin/render job. */
         uint64_t seqno;
 
+        /* Last current addresses the hardware was processing when the
+         * hangcheck timer checked on us.
+         */
+        uint32_t last_ct0ca, last_ct1ca;
+
         /* Kernel-space copy of the ioctl arguments */
         struct drm_vc4_submit_cl *args;
 
@@ -443,7 +453,6 @@ void vc4_plane_async_set_fb(struct drm_plane *plane,
 extern struct platform_driver vc4_v3d_driver;
 int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused);
 int vc4_v3d_debugfs_regs(struct seq_file *m, void *unused);
-int vc4_v3d_set_power(struct vc4_dev *vc4, bool on);
 
 /* vc4_validate.c */
 int