1 files changed, 11 insertions, 14 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 6c9e0902a414..e173a5a02f0d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -47,11 +47,8 @@ static void amdgpu_flip_wait_fence(struct amdgpu_device *adev,
         fence = to_amdgpu_fence(*f);
         if (fence) {
                 r = fence_wait(&fence->base, false);
-                if (r == -EDEADLK) {
-                        up_read(&adev->exclusive_lock);
+                if (r == -EDEADLK)
                         r = amdgpu_gpu_reset(adev);
-                        down_read(&adev->exclusive_lock);
-                }
         } else
                 r = fence_wait(*f, false);
 
@@ -77,7 +74,6 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
         unsigned long flags;
         unsigned i;
 
-        down_read(&adev->exclusive_lock);
         amdgpu_flip_wait_fence(adev, &work->excl);
         for (i = 0; i < work->shared_count; ++i)
                 amdgpu_flip_wait_fence(adev, &work->shared[i]);
@@ -91,7 +87,6 @@ static void amdgpu_flip_work_func(struct work_struct *__work)
         amdgpuCrtc->pflip_status = AMDGPU_FLIP_SUBMITTED;
 
         spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
-        up_read(&adev->exclusive_lock);
 }
 
 /*
@@ -715,7 +710,7 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
  * an optional accurate timestamp of when query happened.
  *
  * \param dev Device to query.
- * \param crtc Crtc to query.
+ * \param pipe Crtc to query.
  * \param flags Flags from caller (DRM_CALLED_FROM_VBLIRQ or 0).
  * \param *vpos Location where vertical scanout position should be stored.
  * \param *hpos Location where horizontal scanout position should go.
@@ -738,8 +733,10 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
  * unknown small number of scanlines wrt. real scanout position.
  *
  */
-int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int flags,
-                               int *vpos, int *hpos, ktime_t *stime, ktime_t *etime)
+int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+                               unsigned int flags, int *vpos, int *hpos,
+                               ktime_t *stime, ktime_t *etime,
+                               const struct drm_display_mode *mode)
 {
         u32 vbl = 0, position = 0;
         int vbl_start, vbl_end, vtotal, ret = 0;
@@ -753,7 +750,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl
         if (stime)
                 *stime = ktime_get();
 
-        if (amdgpu_display_page_flip_get_scanoutpos(adev, crtc, &vbl, &position) == 0)
+        if (amdgpu_display_page_flip_get_scanoutpos(adev, pipe, &vbl, &position) == 0)
                 ret |= DRM_SCANOUTPOS_VALID;
 
         /* Get optional system timestamp after query. */
@@ -775,7 +772,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl
         }
         else {
                 /* No: Fake something reasonable which gives at least ok results. */
-                vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay;
+                vbl_start = mode->crtc_vdisplay;
                 vbl_end = 0;
         }
 
@@ -791,7 +788,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl
 
         /* Inside "upper part" of vblank area? Apply corrective offset if so: */
         if (in_vbl && (*vpos >= vbl_start)) {
-                vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal;
+                vtotal = mode->crtc_vtotal;
                 *vpos = *vpos - vtotal;
         }
 
@@ -813,8 +810,8 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl
          * We only do this if DRM_CALLED_FROM_VBLIRQ.
          */
         if ((flags & DRM_CALLED_FROM_VBLIRQ) && !in_vbl) {
-                vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay;
-                vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal;
+                vbl_start = mode->crtc_vdisplay;
+                vtotal = mode->crtc_vtotal;
 
                 if (vbl_start - *vpos < vtotal / 100) {
                         *vpos -= vtotal;