diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-22 22:50:44 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-29 09:15:06 +0200 |
| commit | d26f96c74dd027caf14713ae736b4d174535412d (patch) | |
| tree | df3fb6cc0aa8ab0f87b51c134f5d6e1fa5ae6ec8 /drivers/gpu/drm/drm_plane.c | |
| parent | drm: Add acquire ctx parameter to ->plane_disable (diff) | |
| download | linux-d26f96c74dd027caf14713ae736b4d174535412d.tar.xz linux-d26f96c74dd027caf14713ae736b4d174535412d.zip | |
drm/atomic-helper: remove backoff hack from disable/update_plane
We can now properly retry at the top level, yay!
v2: Also remove the temporary acquire_ctx hack again, no longer
needed!
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-6-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_plane.c')
| -rw-r--r-- | drivers/gpu/drm/drm_plane.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 526e74b548b2..8535dc17db7e 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -554,7 +554,6 @@ retry: ret = drm_modeset_lock_all_ctx(plane->dev, &ctx); if (ret) goto fail; - plane->dev->mode_config.acquire_ctx = &ctx; ret = __setplane_internal(plane, crtc, fb, crtc_x, crtc_y, crtc_w, crtc_h, src_x, src_y, src_w, src_h, &ctx); @@ -649,7 +648,6 @@ retry: ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx); if (ret) goto fail; - crtc->acquire_ctx = &ctx; /* * Obtain fb we'll be using (either new or existing) and take an extra |