[PATCH 04/16] Revert "drm/i915: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() part 2"

[Sean Paul]

From: Sean Paul <seanp...@chromium.org>

This reverts commit 984c9949f1c4cf36c35aa2de5ee2b65c39379fd9.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Cc: Fernando Ramos <green...@u92.eu>
Signed-off-by: Sean Paul <seanp...@chromium.org>
---
 drivers/gpu/drm/i915/display/intel_overlay.c | 40 ++++++++++----------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c 
b/drivers/gpu/drm/i915/display/intel_overlay.c
index c623738c59c8..c0ee135e5499 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -1105,7 +1105,6 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, 
void *data,
        struct drm_crtc *drmmode_crtc;
        struct intel_crtc *crtc;
        struct drm_i915_gem_object *new_bo;
-       struct drm_modeset_acquire_ctx ctx;
        int ret;
 
        overlay = dev_priv->overlay;
@@ -1114,24 +1113,24 @@ int intel_overlay_put_image_ioctl(struct drm_device 
*dev, void *data,
                return -ENODEV;
        }
 
-       if (params->flags & I915_OVERLAY_ENABLE) {
-
-               drmmode_crtc = drm_crtc_find(dev, file_priv, params->crtc_id);
-               if (!drmmode_crtc)
-                       return -ENOENT;
-               crtc = to_intel_crtc(drmmode_crtc);
+       if (!(params->flags & I915_OVERLAY_ENABLE)) {
+               drm_modeset_lock_all(dev);
+               ret = intel_overlay_switch_off(overlay);
+               drm_modeset_unlock_all(dev);
 
-               new_bo = i915_gem_object_lookup(file_priv, params->bo_handle);
-               if (!new_bo)
-                       return -ENOENT;
+               return ret;
        }
 
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+       drmmode_crtc = drm_crtc_find(dev, file_priv, params->crtc_id);
+       if (!drmmode_crtc)
+               return -ENOENT;
+       crtc = to_intel_crtc(drmmode_crtc);
 
-       if (!(params->flags & I915_OVERLAY_ENABLE)) {
-               ret = intel_overlay_switch_off(overlay);
-               goto out_unlock;
-       }
+       new_bo = i915_gem_object_lookup(file_priv, params->bo_handle);
+       if (!new_bo)
+               return -ENOENT;
+
+       drm_modeset_lock_all(dev);
 
        if (i915_gem_object_is_tiled(new_bo)) {
                drm_dbg_kms(&dev_priv->drm,
@@ -1196,11 +1195,14 @@ int intel_overlay_put_image_ioctl(struct drm_device 
*dev, void *data,
        if (ret != 0)
                goto out_unlock;
 
-out_unlock:
-       DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+       drm_modeset_unlock_all(dev);
+       i915_gem_object_put(new_bo);
+
+       return 0;
 
-       if (params->flags & I915_OVERLAY_ENABLE)
-               i915_gem_object_put(new_bo);
+out_unlock:
+       drm_modeset_unlock_all(dev);
+       i915_gem_object_put(new_bo);
 
        return ret;
 }
-- 
Sean Paul, Software Engineer, Google / Chromium OS