drm: Add acquire ctx to ->gamma_set hook

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / drm_color_mgmt.c

diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
index cc23b9a505c0d946ee198b84bb8bc90d03358e85..b81dcb1d4cb3b7227c71ba77a98eb2af4ddb2a08 100644 (file)
--- a/drivers/gpu/drm/drm_color_mgmt.c
+++ b/drivers/gpu/drm/drm_color_mgmt.c
@@ -218,28 +218,29 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
        struct drm_crtc *crtc;
        void *r_base, *g_base, *b_base;
        int size;
+       struct drm_modeset_acquire_ctx ctx;
        int ret = 0;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EINVAL;
 
-       drm_modeset_lock_all(dev);
        crtc = drm_crtc_find(dev, crtc_lut->crtc_id);
-       if (!crtc) {
-               ret = -ENOENT;
-               goto out;
-       }
+       if (!crtc)
+               return -ENOENT;
 
-       if (crtc->funcs->gamma_set == NULL) {
-               ret = -ENOSYS;
-               goto out;
-       }
+       if (crtc->funcs->gamma_set == NULL)
+               return -ENOSYS;
 
        /* memcpy into gamma store */
-       if (crtc_lut->gamma_size != crtc->gamma_size) {
-               ret = -EINVAL;
+       if (crtc_lut->gamma_size != crtc->gamma_size)
+               return -EINVAL;
+
+       drm_modeset_acquire_init(&ctx, 0);
+       dev->mode_config.acquire_ctx = &ctx;
+retry:
+       ret = drm_modeset_lock_all_ctx(dev, &ctx);
+       if (ret)
                goto out;
-       }
 
        size = crtc_lut->gamma_size * (sizeof(uint16_t));
        r_base = crtc->gamma_store;
@@ -260,10 +261,17 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
                goto out;
        }
 
-       ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);
+       ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base,
+                                    crtc->gamma_size, &ctx);
 
 out:
-       drm_modeset_unlock_all(dev);
+       if (ret == -EDEADLK) {
+               drm_modeset_backoff(&ctx);
+               goto retry;
+       }
+       drm_modeset_drop_locks(&ctx);
+       drm_modeset_acquire_fini(&ctx);
+
        return ret;
 
 }
@@ -295,19 +303,15 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev,
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EINVAL;
 
-       drm_modeset_lock_all(dev);
        crtc = drm_crtc_find(dev, crtc_lut->crtc_id);
-       if (!crtc) {
-               ret = -ENOENT;
-               goto out;
-       }
+       if (!crtc)
+               return -ENOENT;
 
        /* memcpy into gamma store */
-       if (crtc_lut->gamma_size != crtc->gamma_size) {
-               ret = -EINVAL;
-               goto out;
-       }
+       if (crtc_lut->gamma_size != crtc->gamma_size)
+               return -EINVAL;
 
+       drm_modeset_lock(&crtc->mutex, NULL);
        size = crtc_lut->gamma_size * (sizeof(uint16_t));
        r_base = crtc->gamma_store;
        if (copy_to_user((void __user *)(unsigned long)crtc_lut->red, r_base, size)) {
@@ -327,6 +331,6 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev,
                goto out;
        }
 out:
-       drm_modeset_unlock_all(dev);
+       drm_modeset_unlock(&crtc->mutex);
        return ret;
 }