From: Daniel Vetter Date: Tue, 19 Jul 2016 07:27:29 +0000 (+0200) Subject: Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2383050f6a3a2e00636eabfcf66445af653ddd80;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc Backmerge drm-next to be able to apply Chris' connector_unregister_all cleanup (need latest i915 and sun4i state for that). Also there's a trivial conflict in ttm_bo.c that git rerere fails to remember. Signed-off-by: Daniel Vetter --- 2383050f6a3a2e00636eabfcf66445af653ddd80 diff --cc drivers/gpu/drm/ttm/ttm_bo.c index 4e55863e836b,e340d0d66429..b1c1d8f42c8c --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@@ -146,8 -146,10 +146,9 @@@ static void ttm_bo_release_list(struct BUG_ON(bo->mem.mm_node != NULL); BUG_ON(!list_empty(&bo->lru)); BUG_ON(!list_empty(&bo->ddestroy)); - ttm_tt_destroy(bo->ttm); atomic_dec(&bo->glob->bo_count); + fence_put(bo->moving); if (bo->resv == &bo->ttm_resv) reservation_object_fini(&bo->ttm_resv); mutex_destroy(&bo->wu_mutex);