diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-04-03 10:33:02 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-04-06 10:22:35 +0200 |
| commit | 3a09f737ee056e022b4c3285852c663e9d294911 (patch) | |
| tree | f557937694ddd19ea667b97f26712be280a8ec07 | |
| parent | drm: Add acquire ctx to ->gamma_set hook (diff) | |
| download | linux-dev-3a09f737ee056e022b4c3285852c663e9d294911.tar.xz linux-dev-3a09f737ee056e022b4c3285852c663e9d294911.zip | |
drm/atomic-helper: Remove legacy backoff hack from gamma_set
Another one knocked down.
With this we can also remove the temporary hack in the gamma_set
ioctl.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403083304.9083-14-daniel.vetter@ffwll.ch
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 13 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_color_mgmt.c | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 25569e5b3adc..a90d67b6310b 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3519,8 +3519,7 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, blob_data[i].blue = blue[i]; } - state->acquire_ctx = crtc->dev->mode_config.acquire_ctx; -retry: + state->acquire_ctx = ctx; crtc_state = drm_atomic_get_crtc_state(state, crtc); if (IS_ERR(crtc_state)) { ret = PTR_ERR(crtc_state); @@ -3544,18 +3543,10 @@ retry: goto fail; ret = drm_atomic_commit(state); -fail: - if (ret == -EDEADLK) - goto backoff; +fail: drm_atomic_state_put(state); drm_property_blob_put(blob); return ret; - -backoff: - drm_atomic_state_clear(state); - drm_atomic_legacy_backoff(state); - - goto retry; } EXPORT_SYMBOL(drm_atomic_helper_legacy_gamma_set); diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index b81dcb1d4cb3..533f3a3e6877 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -236,7 +236,6 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, 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) |