summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_atomic.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-08-25 17:23:36 +1000
committerDave Airlie <airlied@redhat.com>2015-08-25 17:23:36 +1000
commitdb56176025cee5e242dfeed5f4e304d095d29fa3 (patch)
treefac0925556d357be6232b8cead3bc1c7955f2ba2 /drivers/gpu/drm/drm_atomic.c
parent3732ce72b45a2a145803558758821bf198751276 (diff)
downloadlinux-db56176025cee5e242dfeed5f4e304d095d29fa3.tar.bz2
Revert "drm/atomic: Call ww_acquire_done after check phase is complete"
This reverts commit 992cbf19b32900efa17850b9fa0031fd623edd4d. Until we make fbdev layer atomic we can't call this. Requested-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com? Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
-rw-r--r--drivers/gpu/drm/drm_atomic.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 1066e4b658cf..434915448ea0 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1230,9 +1230,6 @@ int drm_atomic_check_only(struct drm_atomic_state *state)
}
}
- if (ret == 0)
- ww_acquire_done(&state->acquire_ctx->ww_ctx);
-
return ret;
}
EXPORT_SYMBOL(drm_atomic_check_only);