Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm-next

drm-intel-next-2016-05-22:
- cmd-parser support for direct reg->reg loads (Ken Graunke)
- better handle DP++ smart dongles (Ville)
- bxt guc fw loading support (Nick Hoathe)
- remove a bunch of struct typedefs from dpll code (Ander)
- tons of small work all over to avoid casting between drm_device and the i915
  dev struct (Tvrtko&Chris)
- untangle request retiring from other operations, also fixes reset stat corner
  cases (Chris)
- skl atomic watermark support from Matt Roper, yay!
- various wm handling bugfixes from Ville
- big pile of cdclck rework for bxt/skl (Ville)
- CABC (Content Adaptive Brigthness Control) for dsi panels (Jani&Deepak M)
- nonblocking atomic commits for plane-only updates (Maarten Lankhorst)
- bunch of PSR fixes&improvements
- untangle our map/pin/sg_iter code a bit (Dave Gordon)
drm-intel-next-2016-05-08:
- refactor stolen quirks to share code between early quirks and i915 (Joonas)
- refactor gem BO/vma funcstion (Tvrtko&Dave)
- backlight over DPCD support (Yetunde Abedisi)
- more dsi panel sequence support (Jani)
- lots of refactoring around handling iomaps, vma, ring access and related
  topics culmulating in removing the duplicated request tracking in the execlist
  code (Chris & Tvrtko) includes a small patch for core iomapping code
- hw state readout for bxt dsi (Ramalingam C)
- cdclk cleanups (Ville)
- dedupe chv pll code a bit (Ander)
- enable semaphores on gen8+ for legacy submission, to be able to have a direct
  comparison against execlist on the same platform (Chris) Not meant to be used
  for anything else but performance tuning
- lvds border bit hw state checker fix (Jani)
- rpm vs. shrinker/oom-notifier fixes (Praveen Paneri)
- l3 tuning (Imre)
- revert mst dp audio, it's totally non-functional and crash-y (Lyude)
- first official dmc for kbl (Rodrigo)
- and tons of small things all over as usual

* 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel: (194 commits)
  drm/i915: Revert async unpin and nonblocking atomic commit
  drm/i915: Update DRIVER_DATE to 20160522
  drm/i915: Inline sg_next() for the optimised SGL iterator
  drm/i915: Introduce & use new lightweight SGL iterators
  drm/i915: optimise i915_gem_object_map() for small objects
  drm/i915: refactor i915_gem_object_pin_map()
  drm/i915/psr: Implement PSR2 w/a for gen9
  drm/i915/psr: Use ->get_aux_send_ctl functions
  drm/i915/psr: Order DP aux transactions correctly
  drm/i915/psr: Make idle_frames sensible again
  drm/i915/psr: Try to program link training times correctly
  drm/i915/userptr: Convert to drm_i915_private
  drm/i915: Allow nonblocking update of pageflips.
  drm/i915: Check for unpin correctness.
  Reapply "drm/i915: Avoid stalling on pending flips for legacy cursor updates"
  drm/i915: Make unpin async.
  drm/i915: Prepare connectors for nonblocking checks.
  drm/i915: Pass atomic states to fbc update functions.
  drm/i915: Remove reset_counter from intel_crtc.
  drm/i915: Remove queue_flip pointer.
  ...

1 files changed, 66 insertions, 81 deletions

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index bd38e49f7334..eb93f90bb74d 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -168,7 +168,7 @@ struct overlay_registers {
 };
 
 struct intel_overlay {
-        struct drm_device *dev;
+        struct drm_i915_private *i915;
         struct intel_crtc *crtc;
         struct drm_i915_gem_object *vid_bo;
         struct drm_i915_gem_object *old_vid_bo;
@@ -190,15 +190,15 @@ struct intel_overlay {
 static struct overlay_registers __iomem *
 intel_overlay_map_regs(struct intel_overlay *overlay)
 {
-        struct drm_i915_private *dev_priv = to_i915(overlay->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct overlay_registers __iomem *regs;
 
-        if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (OVERLAY_NEEDS_PHYSICAL(dev_priv))
                 regs = (struct overlay_registers __iomem *)overlay->reg_bo->phys_handle->vaddr;
         else
-                regs = io_mapping_map_wc(ggtt->mappable,
-                                         i915_gem_obj_ggtt_offset(overlay->reg_bo));
+                regs = io_mapping_map_wc(dev_priv->ggtt.mappable,
+                                         overlay->flip_addr,
+                                         PAGE_SIZE);
 
         return regs;
 }
@@ -206,7 +206,7 @@ intel_overlay_map_regs(struct intel_overlay *overlay)
 static void intel_overlay_unmap_regs(struct intel_overlay *overlay,
                                      struct overlay_registers __iomem *regs)
 {
-        if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (!OVERLAY_NEEDS_PHYSICAL(overlay->i915))
                 io_mapping_unmap(regs);
 }
 
@@ -232,14 +232,13 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
 /* overlay needs to be disable in OCMD reg */
 static int intel_overlay_on(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         struct drm_i915_gem_request *req;
         int ret;
 
         WARN_ON(overlay->active);
-        WARN_ON(IS_I830(dev) && !(dev_priv->quirks & QUIRK_PIPEA_FORCE));
+        WARN_ON(IS_I830(dev_priv) && !(dev_priv->quirks & QUIRK_PIPEA_FORCE));
 
         req = i915_gem_request_alloc(engine, NULL);
         if (IS_ERR(req))
@@ -266,8 +265,7 @@ static int intel_overlay_on(struct intel_overlay *overlay)
 static int intel_overlay_continue(struct intel_overlay *overlay,
                                   bool load_polyphase_filter)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         struct drm_i915_gem_request *req;
         u32 flip_addr = overlay->flip_addr;
@@ -335,8 +333,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)
 /* overlay needs to be disabled in OCMD reg */
 static int intel_overlay_off(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         struct drm_i915_gem_request *req;
         u32 flip_addr = overlay->flip_addr;
@@ -365,7 +362,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
         intel_ring_emit(engine, flip_addr);
         intel_ring_emit(engine, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
         /* turn overlay off */
-        if (IS_I830(dev)) {
+        if (IS_I830(dev_priv)) {
                 /* Workaround: Don't disable the overlay fully, since otherwise
                  * it dies on the next OVERLAY_ON cmd. */
                 intel_ring_emit(engine, MI_NOOP);
@@ -408,12 +405,11 @@ static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay)
  */
 static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct intel_engine_cs *engine = &dev_priv->engine[RCS];
         int ret;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
 
         /* Only wait if there is actually an old frame to release to
          * guarantee forward progress.
@@ -537,10 +533,10 @@ static int uv_vsubsampling(u32 format)
         }
 }
 
-static u32 calc_swidthsw(struct drm_device *dev, u32 offset, u32 width)
+static u32 calc_swidthsw(struct drm_i915_private *dev_priv, u32 offset, u32 width)
 {
         u32 mask, shift, ret;
-        if (IS_GEN2(dev)) {
+        if (IS_GEN2(dev_priv)) {
                 mask = 0x1f;
                 shift = 5;
         } else {
@@ -548,7 +544,7 @@ static u32 calc_swidthsw(struct drm_device *dev, u32 offset, u32 width)
                 shift = 6;
         }
         ret = ((offset + width + mask) >> shift) - (offset >> shift);
-        if (!IS_GEN2(dev))
+        if (!IS_GEN2(dev_priv))
                 ret <<= 1;
         ret -= 1;
         return ret << 2;
@@ -741,12 +737,12 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         int ret, tmp_width;
         struct overlay_registers __iomem *regs;
         bool scale_changed = false;
-        struct drm_device *dev = overlay->dev;
+        struct drm_i915_private *dev_priv = overlay->i915;
         u32 swidth, swidthsw, sheight, ostride;
         enum pipe pipe = overlay->crtc->pipe;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-        WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
+        WARN_ON(!drm_modeset_is_locked(&dev_priv->dev->mode_config.connection_mutex));
 
         ret = intel_overlay_release_old_vid(overlay);
         if (ret != 0)
@@ -769,7 +765,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                         goto out_unpin;
                 }
                 oconfig = OCONF_CC_OUT_8BIT;
-                if (IS_GEN4(overlay->dev))
+                if (IS_GEN4(dev_priv))
                         oconfig |= OCONF_CSC_MODE_BT709;
                 oconfig |= pipe == 0 ?
                         OCONF_PIPE_A : OCONF_PIPE_B;
@@ -796,7 +792,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                 tmp_width = params->src_w;
 
         swidth = params->src_w;
-        swidthsw = calc_swidthsw(overlay->dev, params->offset_Y, tmp_width);
+        swidthsw = calc_swidthsw(dev_priv, params->offset_Y, tmp_width);
         sheight = params->src_h;
         iowrite32(i915_gem_obj_ggtt_offset(new_bo) + params->offset_Y, &regs->OBUF_0Y);
         ostride = params->stride_Y;
@@ -806,9 +802,9 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                 int uv_vscale = uv_vsubsampling(params->format);
                 u32 tmp_U, tmp_V;
                 swidth |= (params->src_w/uv_hscale) << 16;
-                tmp_U = calc_swidthsw(overlay->dev, params->offset_U,
+                tmp_U = calc_swidthsw(dev_priv, params->offset_U,
                                       params->src_w/uv_hscale);
-                tmp_V = calc_swidthsw(overlay->dev, params->offset_V,
+                tmp_V = calc_swidthsw(dev_priv, params->offset_V,
                                       params->src_w/uv_hscale);
                 swidthsw |= max_t(u32, tmp_U, tmp_V) << 16;
                 sheight |= (params->src_h/uv_vscale) << 16;
@@ -840,8 +836,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
         overlay->old_vid_bo = overlay->vid_bo;
         overlay->vid_bo = new_bo;
 
-        intel_frontbuffer_flip(dev,
-                               INTEL_FRONTBUFFER_OVERLAY(pipe));
+        intel_frontbuffer_flip(dev_priv->dev, INTEL_FRONTBUFFER_OVERLAY(pipe));
 
         return 0;
 
@@ -852,12 +847,12 @@ out_unpin:
 
 int intel_overlay_switch_off(struct intel_overlay *overlay)
 {
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct overlay_registers __iomem *regs;
-        struct drm_device *dev = overlay->dev;
         int ret;
 
-        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-        WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+        lockdep_assert_held(&dev_priv->dev->struct_mutex);
+        WARN_ON(!drm_modeset_is_locked(&dev_priv->dev->mode_config.connection_mutex));
 
         ret = intel_overlay_recover_from_interrupt(overlay);
         if (ret != 0)
@@ -897,15 +892,14 @@ static int check_overlay_possible_on_crtc(struct intel_overlay *overlay,
 
 static void update_pfit_vscale_ratio(struct intel_overlay *overlay)
 {
-        struct drm_device *dev = overlay->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = overlay->i915;
         u32 pfit_control = I915_READ(PFIT_CONTROL);
         u32 ratio;
 
         /* XXX: This is not the same logic as in the xorg driver, but more in
          * line with the intel documentation for the i965
          */
-        if (INTEL_INFO(dev)->gen >= 4) {
+        if (INTEL_GEN(dev_priv) >= 4) {
                 /* on i965 use the PGM reg to read out the autoscaler values */
                 ratio = I915_READ(PFIT_PGM_RATIOS) >> PFIT_VERT_SCALE_SHIFT_965;
         } else {
@@ -948,7 +942,7 @@ static int check_overlay_scaling(struct put_image_params *rec)
         return 0;
 }
 
-static int check_overlay_src(struct drm_device *dev,
+static int check_overlay_src(struct drm_i915_private *dev_priv,
                              struct drm_intel_overlay_put_image *rec,
                              struct drm_i915_gem_object *new_bo)
 {
@@ -959,7 +953,7 @@ static int check_overlay_src(struct drm_device *dev,
         u32 tmp;
 
         /* check src dimensions */
-        if (IS_845G(dev) || IS_I830(dev)) {
+        if (IS_845G(dev_priv) || IS_I830(dev_priv)) {
                 if (rec->src_height > IMAGE_MAX_HEIGHT_LEGACY ||
                     rec->src_width  > IMAGE_MAX_WIDTH_LEGACY)
                         return -EINVAL;
@@ -1011,14 +1005,14 @@ static int check_overlay_src(struct drm_device *dev,
                 return -EINVAL;
 
         /* stride checking */
-        if (IS_I830(dev) || IS_845G(dev))
+        if (IS_I830(dev_priv) || IS_845G(dev_priv))
                 stride_mask = 255;
         else
                 stride_mask = 63;
 
         if (rec->stride_Y & stride_mask || rec->stride_UV & stride_mask)
                 return -EINVAL;
-        if (IS_GEN4(dev) && rec->stride_Y < 512)
+        if (IS_GEN4(dev_priv) && rec->stride_Y < 512)
                 return -EINVAL;
 
         tmp = (rec->flags & I915_OVERLAY_TYPE_MASK) == I915_OVERLAY_YUV_PLANAR ?
@@ -1063,13 +1057,13 @@ static int check_overlay_src(struct drm_device *dev,
  * Return the pipe currently connected to the panel fitter,
  * or -1 if the panel fitter is not present or not in use
  */
-static int intel_panel_fitter_pipe(struct drm_device *dev)
+static int intel_panel_fitter_pipe(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         u32  pfit_control;
 
         /* i830 doesn't have a panel fitter */
-        if (INTEL_INFO(dev)->gen <= 3 && (IS_I830(dev) || !IS_MOBILE(dev)))
+        if (INTEL_GEN(dev_priv) <= 3 &&
+            (IS_I830(dev_priv) || !IS_MOBILE(dev_priv)))
                 return -1;
 
         pfit_control = I915_READ(PFIT_CONTROL);
@@ -1079,15 +1073,15 @@ static int intel_panel_fitter_pipe(struct drm_device *dev)
                 return -1;
 
         /* 965 can place panel fitter on either pipe */
-        if (IS_GEN4(dev))
+        if (IS_GEN4(dev_priv))
                 return (pfit_control >> 29) & 0x3;
 
         /* older chips can only use pipe 1 */
         return 1;
 }
 
-int intel_overlay_put_image(struct drm_device *dev, void *data,
-                            struct drm_file *file_priv)
+int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
+                                  struct drm_file *file_priv)
 {
         struct drm_intel_overlay_put_image *put_image_rec = data;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1162,7 +1156,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
 
                 /* line too wide, i.e. one-line-mode */
                 if (mode->hdisplay > 1024 &&
-                    intel_panel_fitter_pipe(dev) == crtc->pipe) {
+                    intel_panel_fitter_pipe(dev_priv) == crtc->pipe) {
                         overlay->pfit_active = true;
                         update_pfit_vscale_ratio(overlay);
                 } else
@@ -1196,7 +1190,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
                 goto out_unlock;
         }
 
-        ret = check_overlay_src(dev, put_image_rec, new_bo);
+        ret = check_overlay_src(dev_priv, put_image_rec, new_bo);
         if (ret != 0)
                 goto out_unlock;
         params->format = put_image_rec->flags & ~I915_OVERLAY_FLAGS_MASK;
@@ -1284,8 +1278,8 @@ static int check_gamma(struct drm_intel_overlay_attrs *attrs)
         return 0;
 }
 
-int intel_overlay_attrs(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv)
+int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
+                              struct drm_file *file_priv)
 {
         struct drm_intel_overlay_attrs *attrs = data;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1309,7 +1303,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
                 attrs->contrast   = overlay->contrast;
                 attrs->saturation = overlay->saturation;
 
-                if (!IS_GEN2(dev)) {
+                if (!IS_GEN2(dev_priv)) {
                         attrs->gamma0 = I915_READ(OGAMC0);
                         attrs->gamma1 = I915_READ(OGAMC1);
                         attrs->gamma2 = I915_READ(OGAMC2);
@@ -1341,7 +1335,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
                 intel_overlay_unmap_regs(overlay, regs);
 
                 if (attrs->flags & I915_OVERLAY_UPDATE_GAMMA) {
-                        if (IS_GEN2(dev))
+                        if (IS_GEN2(dev_priv))
                                 goto out_unlock;
 
                         if (overlay->active) {
@@ -1371,37 +1365,36 @@ out_unlock:
         return ret;
 }
 
-void intel_setup_overlay(struct drm_device *dev)
+void intel_setup_overlay(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_overlay *overlay;
         struct drm_i915_gem_object *reg_bo;
         struct overlay_registers __iomem *regs;
         int ret;
 
-        if (!HAS_OVERLAY(dev))
+        if (!HAS_OVERLAY(dev_priv))
                 return;
 
         overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
         if (!overlay)
                 return;
 
-        mutex_lock(&dev->struct_mutex);
+        mutex_lock(&dev_priv->dev->struct_mutex);
         if (WARN_ON(dev_priv->overlay))
                 goto out_free;
 
-        overlay->dev = dev;
+        overlay->i915 = dev_priv;
 
         reg_bo = NULL;
-        if (!OVERLAY_NEEDS_PHYSICAL(dev))
-                reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE);
-        if (reg_bo == NULL)
-                reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
+        if (!OVERLAY_NEEDS_PHYSICAL(dev_priv))
+                reg_bo = i915_gem_object_create_stolen(dev_priv->dev, PAGE_SIZE);
         if (reg_bo == NULL)
+                reg_bo = i915_gem_object_create(dev_priv->dev, PAGE_SIZE);
+        if (IS_ERR(reg_bo))
                 goto out_free;
         overlay->reg_bo = reg_bo;
 
-        if (OVERLAY_NEEDS_PHYSICAL(dev)) {
+        if (OVERLAY_NEEDS_PHYSICAL(dev_priv)) {
                 ret = i915_gem_object_attach_phys(reg_bo, PAGE_SIZE);
                 if (ret) {
                         DRM_ERROR("failed to attach phys overlay regs\n");
@@ -1441,25 +1434,23 @@ void intel_setup_overlay(struct drm_device *dev)
         intel_overlay_unmap_regs(overlay, regs);
 
         dev_priv->overlay = overlay;
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev_priv->dev->struct_mutex);
         DRM_INFO("initialized overlay support\n");
         return;
 
 out_unpin_bo:
-        if (!OVERLAY_NEEDS_PHYSICAL(dev))
+        if (!OVERLAY_NEEDS_PHYSICAL(dev_priv))
                 i915_gem_object_ggtt_unpin(reg_bo);
 out_free_bo:
         drm_gem_object_unreference(&reg_bo->base);
 out_free:
-        mutex_unlock(&dev->struct_mutex);
+        mutex_unlock(&dev_priv->dev->struct_mutex);
         kfree(overlay);
         return;
 }
 
-void intel_cleanup_overlay(struct drm_device *dev)
+void intel_cleanup_overlay(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
         if (!dev_priv->overlay)
                 return;
 
@@ -1482,18 +1473,17 @@ struct intel_overlay_error_state {
 static struct overlay_registers __iomem *
 intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
 {
-        struct drm_i915_private *dev_priv = to_i915(overlay->dev);
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
+        struct drm_i915_private *dev_priv = overlay->i915;
         struct overlay_registers __iomem *regs;
 
-        if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (OVERLAY_NEEDS_PHYSICAL(dev_priv))
                 /* Cast to make sparse happy, but it's wc memory anyway, so
                  * equivalent to the wc io mapping on X86. */
                 regs = (struct overlay_registers __iomem *)
                         overlay->reg_bo->phys_handle->vaddr;
         else
-                regs = io_mapping_map_atomic_wc(ggtt->mappable,
-                                                i915_gem_obj_ggtt_offset(overlay->reg_bo));
+                regs = io_mapping_map_atomic_wc(dev_priv->ggtt.mappable,
+                                                overlay->flip_addr);
 
         return regs;
 }
@@ -1501,15 +1491,13 @@ intel_overlay_map_regs_atomic(struct intel_overlay *overlay)
 static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay,
                                         struct overlay_registers __iomem *regs)
 {
-        if (!OVERLAY_NEEDS_PHYSICAL(overlay->dev))
+        if (!OVERLAY_NEEDS_PHYSICAL(overlay->i915))
                 io_mapping_unmap_atomic(regs);
 }
 
-
 struct intel_overlay_error_state *
-intel_overlay_capture_error_state(struct drm_device *dev)
+intel_overlay_capture_error_state(struct drm_i915_private *dev_priv)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_overlay *overlay = dev_priv->overlay;
         struct intel_overlay_error_state *error;
         struct overlay_registers __iomem *regs;
@@ -1523,10 +1511,7 @@ intel_overlay_capture_error_state(struct drm_device *dev)
 
         error->dovsta = I915_READ(DOVSTA);
         error->isr = I915_READ(ISR);
-        if (OVERLAY_NEEDS_PHYSICAL(overlay->dev))
-                error->base = (__force long)overlay->reg_bo->phys_handle->vaddr;
-        else
-                error->base = i915_gem_obj_ggtt_offset(overlay->reg_bo);
+        error->base = overlay->flip_addr;
 
         regs = intel_overlay_map_regs_atomic(overlay);
         if (!regs)