1 files changed, 188 insertions, 212 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5b7526697838..844fea795bae 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -265,7 +265,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_i915_gem_object *obj;
         u64 total_obj_size, total_gtt_size;
         LIST_HEAD(stolen);
@@ -440,15 +440,15 @@ static void print_context_stats(struct seq_file *m,
 
         memset(&stats, 0, sizeof(stats));
 
-        mutex_lock(&dev_priv->dev->struct_mutex);
+        mutex_lock(&dev_priv->drm.struct_mutex);
         if (dev_priv->kernel_context)
                 per_file_ctx_stats(0, dev_priv->kernel_context, &stats);
 
-        list_for_each_entry(file, &dev_priv->dev->filelist, lhead) {
+        list_for_each_entry(file, &dev_priv->drm.filelist, lhead) {
                 struct drm_i915_file_private *fpriv = file->driver_priv;
                 idr_for_each(&fpriv->context_idr, per_file_ctx_stats, &stats);
         }
-        mutex_unlock(&dev_priv->dev->struct_mutex);
+        mutex_unlock(&dev_priv->drm.struct_mutex);
 
         print_file_stats(m, "[k]contexts", stats);
 }
@@ -591,7 +591,7 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
         uintptr_t list = (uintptr_t) node->info_ent->data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_i915_gem_object *obj;
         u64 total_obj_size, total_gtt_size;
         int count, ret;
@@ -625,7 +625,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crtc *crtc;
         int ret;
 
@@ -662,8 +662,8 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
                                            engine->name,
                                            i915_gem_request_get_seqno(work->flip_queued_req),
                                            dev_priv->next_seqno,
-                                           engine->get_seqno(engine),
-                                           i915_gem_request_completed(work->flip_queued_req, true));
+                                           intel_engine_get_seqno(engine),
+                                           i915_gem_request_completed(work->flip_queued_req));
                         } else
                                 seq_printf(m, "Flip not associated with any ring\n");
                         seq_printf(m, "Flip queued on frame %d, (was ready on frame %d), now %d\n",
@@ -695,7 +695,7 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_i915_gem_object *obj;
         struct intel_engine_cs *engine;
         int total = 0;
@@ -740,7 +740,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         struct drm_i915_gem_request *req;
         int ret, any;
@@ -788,17 +788,29 @@ static int i915_gem_request_info(struct seq_file *m, void *data)
 static void i915_ring_seqno_info(struct seq_file *m,
                                  struct intel_engine_cs *engine)
 {
+        struct intel_breadcrumbs *b = &engine->breadcrumbs;
+        struct rb_node *rb;
+
         seq_printf(m, "Current sequence (%s): %x\n",
-                   engine->name, engine->get_seqno(engine));
-        seq_printf(m, "Current user interrupts (%s): %x\n",
-                   engine->name, READ_ONCE(engine->user_interrupts));
+                   engine->name, intel_engine_get_seqno(engine));
+        seq_printf(m, "Current user interrupts (%s): %lx\n",
+                   engine->name, READ_ONCE(engine->breadcrumbs.irq_wakeups));
+
+        spin_lock(&b->lock);
+        for (rb = rb_first(&b->waiters); rb; rb = rb_next(rb)) {
+                struct intel_wait *w = container_of(rb, typeof(*w), node);
+
+                seq_printf(m, "Waiting (%s): %s [%d] on %x\n",
+                           engine->name, w->tsk->comm, w->tsk->pid, w->seqno);
+        }
+        spin_unlock(&b->lock);
 }
 
 static int i915_gem_seqno_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         int ret;
 
@@ -821,7 +833,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         int ret, i, pipe;
 
@@ -1012,7 +1024,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int i, ret;
 
         ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1040,7 +1052,7 @@ static int i915_hws_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         const u32 *hws;
         int i;
@@ -1151,7 +1163,7 @@ static int
 i915_next_seqno_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret;
 
         ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1188,7 +1200,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret = 0;
 
         intel_runtime_pm_get(dev_priv);
@@ -1391,7 +1403,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         u64 acthd[I915_NUM_ENGINES];
         u32 seqno[I915_NUM_ENGINES];
@@ -1408,7 +1420,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
 
         for_each_engine_id(engine, dev_priv, id) {
                 acthd[id] = intel_ring_get_active_head(engine);
-                seqno[id] = engine->get_seqno(engine);
+                seqno[id] = intel_engine_get_seqno(engine);
         }
 
         i915_get_extra_instdone(dev_priv, instdone);
@@ -1428,9 +1440,11 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
                            engine->hangcheck.seqno,
                            seqno[id],
                            engine->last_submitted_seqno);
-                seq_printf(m, "\tuser interrupts = %x [current %x]\n",
+                seq_printf(m, "\twaiters? %d\n",
+                           intel_engine_has_waiter(engine));
+                seq_printf(m, "\tuser interrupts = %lx [current %lx]\n",
                            engine->hangcheck.user_interrupts,
-                           READ_ONCE(engine->user_interrupts));
+                           READ_ONCE(engine->breadcrumbs.irq_wakeups));
                 seq_printf(m, "\tACTHD = 0x%08llx [current 0x%08llx]\n",
                            (long long)engine->hangcheck.acthd,
                            (long long)acthd[id]);
@@ -1460,7 +1474,7 @@ static int ironlake_drpc_info(struct seq_file *m)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 rgvmodectl, rstdbyctl;
         u16 crstandvid;
         int ret;
@@ -1528,7 +1542,7 @@ static int i915_forcewake_domains(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_uncore_forcewake_domain *fw_domain;
 
         spin_lock_irq(&dev_priv->uncore.lock);
@@ -1546,7 +1560,7 @@ static int vlv_drpc_info(struct seq_file *m)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 rpmodectl1, rcctl1, pw_status;
 
         intel_runtime_pm_get(dev_priv);
@@ -1586,7 +1600,7 @@ static int gen6_drpc_info(struct seq_file *m)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 rpmodectl1, gt_core_status, rcctl1, rc6vids = 0;
         unsigned forcewake_count;
         int count = 0, ret;
@@ -1698,7 +1712,7 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         seq_printf(m, "FB tracking busy bits: 0x%08x\n",
                    dev_priv->fb_tracking.busy_bits);
@@ -1713,7 +1727,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (!HAS_FBC(dev)) {
                 seq_puts(m, "FBC unsupported on this chipset\n");
@@ -1743,7 +1757,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
 static int i915_fbc_fc_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (INTEL_INFO(dev)->gen < 7 || !HAS_FBC(dev))
                 return -ENODEV;
@@ -1756,7 +1770,7 @@ static int i915_fbc_fc_get(void *data, u64 *val)
 static int i915_fbc_fc_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 reg;
 
         if (INTEL_INFO(dev)->gen < 7 || !HAS_FBC(dev))
@@ -1783,7 +1797,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (!HAS_IPS(dev)) {
                 seq_puts(m, "not supported\n");
@@ -1813,7 +1827,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         bool sr_enabled = false;
 
         intel_runtime_pm_get(dev_priv);
@@ -1842,7 +1856,7 @@ static int i915_emon_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         unsigned long temp, chipset, gfx;
         int ret;
 
@@ -1870,7 +1884,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret = 0;
         int gpu_freq, ia_freq;
         unsigned int max_gpu_freq, min_gpu_freq;
@@ -1925,7 +1939,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_opregion *opregion = &dev_priv->opregion;
         int ret;
 
@@ -1946,7 +1960,7 @@ static int i915_vbt(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_opregion *opregion = &dev_priv->opregion;
 
         if (opregion->vbt)
@@ -1968,19 +1982,19 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
                 return ret;
 
 #ifdef CONFIG_DRM_FBDEV_EMULATION
-       if (to_i915(dev)->fbdev) {
-               fbdev_fb = to_intel_framebuffer(to_i915(dev)->fbdev->helper.fb);
-
-               seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ",
-                         fbdev_fb->base.width,
-                         fbdev_fb->base.height,
-                         fbdev_fb->base.depth,
-                         fbdev_fb->base.bits_per_pixel,
-                         fbdev_fb->base.modifier[0],
-                         drm_framebuffer_read_refcount(&fbdev_fb->base));
-               describe_obj(m, fbdev_fb->obj);
-               seq_putc(m, '\n');
-       }
+        if (to_i915(dev)->fbdev) {
+                fbdev_fb = to_intel_framebuffer(to_i915(dev)->fbdev->helper.fb);
+
+                seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ",
+                           fbdev_fb->base.width,
+                           fbdev_fb->base.height,
+                           fbdev_fb->base.depth,
+                           fbdev_fb->base.bits_per_pixel,
+                           fbdev_fb->base.modifier[0],
+                           drm_framebuffer_read_refcount(&fbdev_fb->base));
+                describe_obj(m, fbdev_fb->obj);
+                seq_putc(m, '\n');
+        }
 #endif
 
         mutex_lock(&dev->mode_config.fb_lock);
@@ -2017,7 +2031,7 @@ static int i915_context_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         struct i915_gem_context *ctx;
         int ret;
@@ -2114,7 +2128,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         struct i915_gem_context *ctx;
         int ret;
@@ -2141,7 +2155,7 @@ static int i915_execlists(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = (struct drm_info_node *)m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         u32 status_pointer;
         u8 read_pointer;
@@ -2244,7 +2258,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret;
 
         ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -2317,7 +2331,7 @@ static int per_file_ctx(int id, void *ptr, void *data)
 
 static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
         int i;
@@ -2338,7 +2352,7 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)
 
 static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
 
         if (IS_GEN6(dev_priv))
@@ -2372,7 +2386,7 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_file *file;
 
         int ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -2415,7 +2429,7 @@ static int count_irq_waiters(struct drm_i915_private *i915)
         int count = 0;
 
         for_each_engine(engine, i915)
-                count += engine->irq_refcount;
+                count += intel_engine_has_waiter(engine);
 
         return count;
 }
@@ -2424,11 +2438,12 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_file *file;
 
         seq_printf(m, "RPS enabled? %d\n", dev_priv->rps.enabled);
-        seq_printf(m, "GPU busy? %d\n", dev_priv->mm.busy);
+        seq_printf(m, "GPU busy? %s [%x]\n",
+                   yesno(dev_priv->gt.awake), dev_priv->gt.active_engines);
         seq_printf(m, "CPU waiting? %d\n", count_irq_waiters(dev_priv));
         seq_printf(m, "Frequency requested %d; min hard:%d, soft:%d; max soft:%d, hard:%d\n",
                    intel_gpu_freq(dev_priv, dev_priv->rps.cur_freq),
@@ -2469,7 +2484,7 @@ static int i915_llc(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         const bool edram = INTEL_GEN(dev_priv) > 8;
 
         seq_printf(m, "LLC: %s\n", yesno(HAS_LLC(dev)));
@@ -2482,7 +2497,7 @@ static int i915_llc(struct seq_file *m, void *data)
 static int i915_guc_load_status_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
-        struct drm_i915_private *dev_priv = node->minor->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(node->minor->dev);
         struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
         u32 tmp, i;
 
@@ -2544,9 +2559,9 @@ static void i915_guc_client_info(struct seq_file *m,
 
         for_each_engine(engine, dev_priv) {
                 seq_printf(m, "\tSubmissions: %llu %s\n",
-                                client->submissions[engine->guc_id],
+                                client->submissions[engine->id],
                                 engine->name);
-                tot += client->submissions[engine->guc_id];
+                tot += client->submissions[engine->id];
         }
         seq_printf(m, "\tTotal: %llu\n", tot);
 }
@@ -2555,7 +2570,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_guc guc;
         struct i915_guc_client client = {};
         struct intel_engine_cs *engine;
@@ -2587,9 +2602,9 @@ static int i915_guc_info(struct seq_file *m, void *data)
         seq_printf(m, "\nGuC submissions:\n");
         for_each_engine(engine, dev_priv) {
                 seq_printf(m, "\t%-24s: %10llu, last seqno 0x%08x\n",
-                        engine->name, guc.submissions[engine->guc_id],
-                        guc.last_seqno[engine->guc_id]);
-                total += guc.submissions[engine->guc_id];
+                        engine->name, guc.submissions[engine->id],
+                        guc.last_seqno[engine->id]);
+                total += guc.submissions[engine->id];
         }
         seq_printf(m, "\t%s: %llu\n", "Total", total);
 
@@ -2605,7 +2620,7 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj;
         u32 *log;
         int i = 0, pg;
@@ -2633,7 +2648,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 psrperf = 0;
         u32 stat[3];
         enum pipe pipe;
@@ -2701,7 +2716,6 @@ static int i915_sink_crc(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct intel_encoder *encoder;
         struct intel_connector *connector;
         struct intel_dp *intel_dp = NULL;
         int ret;
@@ -2709,18 +2723,19 @@ static int i915_sink_crc(struct seq_file *m, void *data)
 
         drm_modeset_lock_all(dev);
         for_each_intel_connector(dev, connector) {
+                struct drm_crtc *crtc;
 
-                if (connector->base.dpms != DRM_MODE_DPMS_ON)
+                if (!connector->base.state->best_encoder)
                         continue;
 
-                if (!connector->base.encoder)
+                crtc = connector->base.state->crtc;
+                if (!crtc->state->active)
                         continue;
 
-                encoder = to_intel_encoder(connector->base.encoder);
-                if (encoder->type != INTEL_OUTPUT_EDP)
+                if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP)
                         continue;
 
-                intel_dp = enc_to_intel_dp(&encoder->base);
+                intel_dp = enc_to_intel_dp(connector->base.state->best_encoder);
 
                 ret = intel_dp_sink_crc(intel_dp, crc);
                 if (ret)
@@ -2741,7 +2756,7 @@ static int i915_energy_uJ(struct seq_file *m, void *data)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u64 power;
         u32 units;
 
@@ -2767,12 +2782,12 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (!HAS_RUNTIME_PM(dev_priv))
                 seq_puts(m, "Runtime power management not supported\n");
 
-        seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
+        seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->gt.awake));
         seq_printf(m, "IRQs disabled: %s\n",
                    yesno(!intel_irqs_enabled(dev_priv)));
 #ifdef CONFIG_PM
@@ -2782,8 +2797,8 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
         seq_printf(m, "Device Power Management (CONFIG_PM) disabled\n");
 #endif
         seq_printf(m, "PCI device power state: %s [%d]\n",
-                   pci_power_name(dev_priv->dev->pdev->current_state),
-                   dev_priv->dev->pdev->current_state);
+                   pci_power_name(dev_priv->drm.pdev->current_state),
+                   dev_priv->drm.pdev->current_state);
 
         return 0;
 }
@@ -2792,7 +2807,7 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_power_domains *power_domains = &dev_priv->power_domains;
         int i;
 
@@ -2827,7 +2842,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_csr *csr;
 
         if (!HAS_CSR(dev)) {
@@ -2950,7 +2965,7 @@ static void intel_dp_info(struct seq_file *m,
 
         seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
         seq_printf(m, "\taudio support: %s\n", yesno(intel_dp->has_audio));
-        if (intel_encoder->type == INTEL_OUTPUT_EDP)
+        if (intel_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)
                 intel_panel_info(m, &intel_connector->panel);
 }
 
@@ -2989,14 +3004,26 @@ static void intel_connector_info(struct seq_file *m,
                 seq_printf(m, "\tCEA rev: %d\n",
                            connector->display_info.cea_rev);
         }
-        if (intel_encoder) {
-                if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
-                    intel_encoder->type == INTEL_OUTPUT_EDP)
-                        intel_dp_info(m, intel_connector);
-                else if (intel_encoder->type == INTEL_OUTPUT_HDMI)
-                        intel_hdmi_info(m, intel_connector);
-                else if (intel_encoder->type == INTEL_OUTPUT_LVDS)
+
+        if (!intel_encoder || intel_encoder->type == INTEL_OUTPUT_DP_MST)
+                return;
+
+        switch (connector->connector_type) {
+        case DRM_MODE_CONNECTOR_DisplayPort:
+        case DRM_MODE_CONNECTOR_eDP:
+                intel_dp_info(m, intel_connector);
+                break;
+        case DRM_MODE_CONNECTOR_LVDS:
+                if (intel_encoder->type == INTEL_OUTPUT_LVDS)
                         intel_lvds_info(m, intel_connector);
+                break;
+        case DRM_MODE_CONNECTOR_HDMIA:
+                if (intel_encoder->type == INTEL_OUTPUT_HDMI ||
+                    intel_encoder->type == INTEL_OUTPUT_UNKNOWN)
+                        intel_hdmi_info(m, intel_connector);
+                break;
+        default:
+                break;
         }
 
         seq_printf(m, "\tmodes:\n");
@@ -3006,7 +3033,7 @@ static void intel_connector_info(struct seq_file *m,
 
 static bool cursor_active(struct drm_device *dev, int pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 state;
 
         if (IS_845G(dev) || IS_I865G(dev))
@@ -3019,7 +3046,7 @@ static bool cursor_active(struct drm_device *dev, int pipe)
 
 static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 pos;
 
         pos = I915_READ(CURPOS(pipe));
@@ -3140,7 +3167,7 @@ static int i915_display_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crtc *crtc;
         struct drm_connector *connector;
 
@@ -3195,7 +3222,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_engine_cs *engine;
         int num_rings = hweight32(INTEL_INFO(dev)->ring_mask);
         enum intel_engine_id id;
@@ -3268,7 +3295,7 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int i;
 
         drm_modeset_lock_all(dev);
@@ -3298,7 +3325,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)
         struct intel_engine_cs *engine;
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_workarounds *workarounds = &dev_priv->workarounds;
         enum intel_engine_id id;
 
@@ -3336,7 +3363,7 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct skl_ddb_allocation *ddb;
         struct skl_ddb_entry *entry;
         enum pipe pipe;
@@ -3374,31 +3401,16 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
 static void drrs_status_per_crtc(struct seq_file *m,
                 struct drm_device *dev, struct intel_crtc *intel_crtc)
 {
-        struct intel_encoder *intel_encoder;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct i915_drrs *drrs = &dev_priv->drrs;
         int vrefresh = 0;
+        struct drm_connector *connector;
 
-        for_each_encoder_on_crtc(dev, &intel_crtc->base, intel_encoder) {
-                /* Encoder connected on this CRTC */
-                switch (intel_encoder->type) {
-                case INTEL_OUTPUT_EDP:
-                        seq_puts(m, "eDP:\n");
-                        break;
-                case INTEL_OUTPUT_DSI:
-                        seq_puts(m, "DSI:\n");
-                        break;
-                case INTEL_OUTPUT_HDMI:
-                        seq_puts(m, "HDMI:\n");
-                        break;
-                case INTEL_OUTPUT_DISPLAYPORT:
-                        seq_puts(m, "DP:\n");
-                        break;
-                default:
-                        seq_printf(m, "Other encoder (id=%d).\n",
-                                                intel_encoder->type);
-                        return;
-                }
+        drm_for_each_connector(connector, dev) {
+                if (connector->state->crtc != &intel_crtc->base)
+                        continue;
+
+                seq_printf(m, "%s:\n", connector->name);
         }
 
         if (dev_priv->vbt.drrs_type == STATIC_DRRS_SUPPORT)
@@ -3461,18 +3473,16 @@ static int i915_drrs_status(struct seq_file *m, void *unused)
         struct intel_crtc *intel_crtc;
         int active_crtc_cnt = 0;
 
+        drm_modeset_lock_all(dev);
         for_each_intel_crtc(dev, intel_crtc) {
-                drm_modeset_lock(&intel_crtc->base.mutex, NULL);
-
                 if (intel_crtc->base.state->active) {
                         active_crtc_cnt++;
                         seq_printf(m, "\nCRTC %d:  ", active_crtc_cnt);
 
                         drrs_status_per_crtc(m, dev, intel_crtc);
                 }
-
-                drm_modeset_unlock(&intel_crtc->base.mutex);
         }
+        drm_modeset_unlock_all(dev);
 
         if (!active_crtc_cnt)
                 seq_puts(m, "No active crtc found\n");
@@ -3490,17 +3500,23 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)
 {
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
-        struct drm_encoder *encoder;
         struct intel_encoder *intel_encoder;
         struct intel_digital_port *intel_dig_port;
+        struct drm_connector *connector;
+
         drm_modeset_lock_all(dev);
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                intel_encoder = to_intel_encoder(encoder);
-                if (intel_encoder->type != INTEL_OUTPUT_DISPLAYPORT)
+        drm_for_each_connector(connector, dev) {
+                if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+                        continue;
+
+                intel_encoder = intel_attached_encoder(connector);
+                if (!intel_encoder || intel_encoder->type == INTEL_OUTPUT_DP_MST)
                         continue;
-                intel_dig_port = enc_to_dig_port(encoder);
+
+                intel_dig_port = enc_to_dig_port(&intel_encoder->base);
                 if (!intel_dig_port->dp.can_mst)
                         continue;
+
                 seq_printf(m, "MST Source Port %c\n",
                            port_name(intel_dig_port->port));
                 drm_dp_mst_dump_topology(m, &intel_dig_port->dp.mst_mgr);
@@ -3512,7 +3528,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)
 static int i915_pipe_crc_open(struct inode *inode, struct file *filep)
 {
         struct pipe_crc_info *info = inode->i_private;
-        struct drm_i915_private *dev_priv = info->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(info->dev);
         struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
 
         if (info->pipe >= INTEL_INFO(info->dev)->num_pipes)
@@ -3536,7 +3552,7 @@ static int i915_pipe_crc_open(struct inode *inode, struct file *filep)
 static int i915_pipe_crc_release(struct inode *inode, struct file *filep)
 {
         struct pipe_crc_info *info = inode->i_private;
-        struct drm_i915_private *dev_priv = info->dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(info->dev);
         struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
 
         spin_lock_irq(&pipe_crc->lock);
@@ -3564,7 +3580,7 @@ i915_pipe_crc_read(struct file *filep, char __user *user_buf, size_t count,
 {
         struct pipe_crc_info *info = filep->private_data;
         struct drm_device *dev = info->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
         char buf[PIPE_CRC_BUFFER_LEN];
         int n_entries;
@@ -3697,7 +3713,7 @@ static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)
 static int display_crc_ctl_show(struct seq_file *m, void *data)
 {
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int i;
 
         for (i = 0; i < I915_MAX_PIPES; i++)
@@ -3758,7 +3774,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
                 case INTEL_OUTPUT_TVOUT:
                         *source = INTEL_PIPE_CRC_SOURCE_TV;
                         break;
-                case INTEL_OUTPUT_DISPLAYPORT:
+                case INTEL_OUTPUT_DP:
                 case INTEL_OUTPUT_EDP:
                         dig_port = enc_to_dig_port(&encoder->base);
                         switch (dig_port->port) {
@@ -3791,7 +3807,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,
                                 enum intel_pipe_crc_source *source,
                                 uint32_t *val)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         bool need_stable_symbols = false;
 
         if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) {
@@ -3862,7 +3878,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,
                                  enum intel_pipe_crc_source *source,
                                  uint32_t *val)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         bool need_stable_symbols = false;
 
         if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) {
@@ -3936,7 +3952,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,
 static void vlv_undo_pipe_scramble_reset(struct drm_device *dev,
                                          enum pipe pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         uint32_t tmp = I915_READ(PORT_DFT2_G4X);
 
         switch (pipe) {
@@ -3961,7 +3977,7 @@ static void vlv_undo_pipe_scramble_reset(struct drm_device *dev,
 static void g4x_undo_pipe_scramble_reset(struct drm_device *dev,
                                          enum pipe pipe)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         uint32_t tmp = I915_READ(PORT_DFT2_G4X);
 
         if (pipe == PIPE_A)
@@ -4004,7 +4020,7 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
 
 static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev, bool enable)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crtc *crtc =
                 to_intel_crtc(dev_priv->pipe_to_crtc_mapping[PIPE_A]);
         struct intel_crtc_state *pipe_config;
@@ -4072,7 +4088,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,
 static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
                                enum intel_pipe_crc_source source)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
         struct intel_crtc *crtc = to_intel_crtc(intel_get_crtc_for_pipe(dev,
                                                                         pipe));
@@ -4579,7 +4595,7 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])
 static int pri_wm_latency_show(struct seq_file *m, void *data)
 {
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         const uint16_t *latencies;
 
         if (INTEL_INFO(dev)->gen >= 9)
@@ -4595,7 +4611,7 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)
 static int spr_wm_latency_show(struct seq_file *m, void *data)
 {
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         const uint16_t *latencies;
 
         if (INTEL_INFO(dev)->gen >= 9)
@@ -4611,7 +4627,7 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)
 static int cur_wm_latency_show(struct seq_file *m, void *data)
 {
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         const uint16_t *latencies;
 
         if (INTEL_INFO(dev)->gen >= 9)
@@ -4702,7 +4718,7 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf,
 {
         struct seq_file *m = file->private_data;
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         uint16_t *latencies;
 
         if (INTEL_INFO(dev)->gen >= 9)
@@ -4718,7 +4734,7 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf,
 {
         struct seq_file *m = file->private_data;
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         uint16_t *latencies;
 
         if (INTEL_INFO(dev)->gen >= 9)
@@ -4734,7 +4750,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,
 {
         struct seq_file *m = file->private_data;
         struct drm_device *dev = m->private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         uint16_t *latencies;
 
         if (INTEL_INFO(dev)->gen >= 9)
@@ -4776,7 +4792,7 @@ static int
 i915_wedged_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         *val = i915_terminally_wedged(&dev_priv->gpu_error);
 
@@ -4787,7 +4803,7 @@ static int
 i915_wedged_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         /*
          * There is no safeguard against this debugfs entry colliding
@@ -4815,44 +4831,10 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,
                         "%llu\n");
 
 static int
-i915_ring_stop_get(void *data, u64 *val)
-{
-        struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        *val = dev_priv->gpu_error.stop_rings;
-
-        return 0;
-}
-
-static int
-i915_ring_stop_set(void *data, u64 val)
-{
-        struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        int ret;
-
-        DRM_DEBUG_DRIVER("Stopping rings 0x%08llx\n", val);
-
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
-
-        dev_priv->gpu_error.stop_rings = val;
-        mutex_unlock(&dev->struct_mutex);
-
-        return 0;
-}
-
-DEFINE_SIMPLE_ATTRIBUTE(i915_ring_stop_fops,
-                        i915_ring_stop_get, i915_ring_stop_set,
-                        "0x%08llx\n");
-
-static int
 i915_ring_missed_irq_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         *val = dev_priv->gpu_error.missed_irq_rings;
         return 0;
@@ -4862,7 +4844,7 @@ static int
 i915_ring_missed_irq_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret;
 
         /* Lock against concurrent debugfs callers */
@@ -4883,7 +4865,7 @@ static int
 i915_ring_test_irq_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         *val = dev_priv->gpu_error.test_irq_rings;
 
@@ -4894,18 +4876,11 @@ static int
 i915_ring_test_irq_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        int ret;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
+        val &= INTEL_INFO(dev_priv)->ring_mask;
         DRM_DEBUG_DRIVER("Masking interrupts on rings 0x%08llx\n", val);
-
-        /* Lock against concurrent debugfs callers */
-        ret = mutex_lock_interruptible(&dev->struct_mutex);
-        if (ret)
-                return ret;
-
         dev_priv->gpu_error.test_irq_rings = val;
-        mutex_unlock(&dev->struct_mutex);
 
         return 0;
 }
@@ -4934,7 +4909,7 @@ static int
 i915_drop_caches_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret;
 
         DRM_DEBUG("Dropping caches: 0x%08llx\n", val);
@@ -4946,7 +4921,7 @@ i915_drop_caches_set(void *data, u64 val)
                 return ret;
 
         if (val & DROP_ACTIVE) {
-                ret = i915_gpu_idle(dev);
+                ret = i915_gem_wait_for_idle(dev_priv);
                 if (ret)
                         goto unlock;
         }
@@ -4974,7 +4949,7 @@ static int
 i915_max_freq_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret;
 
         if (INTEL_INFO(dev)->gen < 6)
@@ -4996,7 +4971,7 @@ static int
 i915_max_freq_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 hw_max, hw_min;
         int ret;
 
@@ -5041,7 +5016,7 @@ static int
 i915_min_freq_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ret;
 
         if (INTEL_INFO(dev)->gen < 6)
@@ -5063,7 +5038,7 @@ static int
 i915_min_freq_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 hw_max, hw_min;
         int ret;
 
@@ -5108,7 +5083,7 @@ static int
 i915_cache_sharing_get(void *data, u64 *val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 snpcr;
         int ret;
 
@@ -5123,7 +5098,7 @@ i915_cache_sharing_get(void *data, u64 *val)
         snpcr = I915_READ(GEN6_MBCUNIT_SNPCR);
 
         intel_runtime_pm_put(dev_priv);
-        mutex_unlock(&dev_priv->dev->struct_mutex);
+        mutex_unlock(&dev_priv->drm.struct_mutex);
 
         *val = (snpcr & GEN6_MBC_SNPCR_MASK) >> GEN6_MBC_SNPCR_SHIFT;
 
@@ -5134,7 +5109,7 @@ static int
 i915_cache_sharing_set(void *data, u64 val)
 {
         struct drm_device *dev = data;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 snpcr;
 
         if (!(IS_GEN6(dev) || IS_GEN7(dev)))
@@ -5171,7 +5146,7 @@ struct sseu_dev_status {
 static void cherryview_sseu_device_status(struct drm_device *dev,
                                           struct sseu_dev_status *stat)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int ss_max = 2;
         int ss;
         u32 sig1[ss_max], sig2[ss_max];
@@ -5203,7 +5178,7 @@ static void cherryview_sseu_device_status(struct drm_device *dev,
 static void gen9_sseu_device_status(struct drm_device *dev,
                                     struct sseu_dev_status *stat)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int s_max = 3, ss_max = 4;
         int s, ss;
         u32 s_reg[s_max], eu_reg[2*s_max], eu_mask[2];
@@ -5268,7 +5243,7 @@ static void gen9_sseu_device_status(struct drm_device *dev,
 static void broadwell_sseu_device_status(struct drm_device *dev,
                                          struct sseu_dev_status *stat)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         int s;
         u32 slice_info = I915_READ(GEN8_GT_SLICE_INFO);
 
@@ -5347,7 +5322,7 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
 static int i915_forcewake_open(struct inode *inode, struct file *file)
 {
         struct drm_device *dev = inode->i_private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (INTEL_INFO(dev)->gen < 6)
                 return 0;
@@ -5361,7 +5336,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
 static int i915_forcewake_release(struct inode *inode, struct file *file)
 {
         struct drm_device *dev = inode->i_private;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (INTEL_INFO(dev)->gen < 6)
                 return 0;
@@ -5477,7 +5452,6 @@ static const struct i915_debugfs_files {
         {"i915_max_freq", &i915_max_freq_fops},
         {"i915_min_freq", &i915_min_freq_fops},
         {"i915_cache_sharing", &i915_cache_sharing_fops},
-        {"i915_ring_stop", &i915_ring_stop_fops},
         {"i915_ring_missed_irq", &i915_ring_missed_irq_fops},
         {"i915_ring_test_irq", &i915_ring_test_irq_fops},
         {"i915_gem_drop_caches", &i915_drop_caches_fops},
@@ -5495,7 +5469,7 @@ static const struct i915_debugfs_files {
 
 void intel_display_crc_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         enum pipe pipe;
 
         for_each_pipe(dev_priv, pipe) {
@@ -5507,8 +5481,9 @@ void intel_display_crc_init(struct drm_device *dev)
         }
 }
 
-int i915_debugfs_init(struct drm_minor *minor)
+int i915_debugfs_register(struct drm_i915_private *dev_priv)
 {
+        struct drm_minor *minor = dev_priv->drm.primary;
         int ret, i;
 
         ret = i915_forcewake_create(minor->debugfs_root, minor);
@@ -5534,8 +5509,9 @@ int i915_debugfs_init(struct drm_minor *minor)
                                         minor->debugfs_root, minor);
 }
 
-void i915_debugfs_cleanup(struct drm_minor *minor)
+void i915_debugfs_unregister(struct drm_i915_private *dev_priv)
 {
+        struct drm_minor *minor = dev_priv->drm.primary;
         int i;
 
         drm_debugfs_remove_files(i915_debugfs_list,