drm/msm: Fix debugfs deadlock

[sfrench/cifs-2.6.git] / drivers / gpu / drm / msm / msm_drv.h

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index 5cad921c32ba8bac8538f9f185f7ff1f7aba79ca..2536340e62238fb86615f35935d2c43ec3210364 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -174,7 +174,14 @@ struct msm_drm_private {
        struct msm_rd_state *hangrd;   /* debugfs to dump hanging submits */
        struct msm_perf_state *perf;
 
-       /*
+       /**
+        * List of all GEM objects (mainly for debugfs, protected by obj_lock
+        * (acquire before per GEM object lock)
+        */
+       struct list_head objects;
+       struct mutex obj_lock;
+
+       /**
         * Lists of inactive GEM objects.  Every bo is either in one of the
         * inactive lists (depending on whether or not it is shrinkable) or
         * gpu->active_list (for the gpu it is active on[1])