Merge tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel into drm-next
- better atomic state debugging from Rob - fence prep from gustavo - sumits flushed out his backlog of pending dma-buf/fence patches from various people - drm_mm leak debugging plus trying to appease Kconfig (Chris) - a few misc things all over * tag 'topic/drm-misc-2016-11-10' of git://anongit.freedesktop.org/drm-intel: (35 commits) drm: Make DRM_DEBUG_MM depend on STACKTRACE_SUPPORT drm/i915: Restrict DRM_DEBUG_MM automatic selection drm: Restrict stackdepot usage to builtin drm.ko drm/msm: module param to dump state on error irq drm/msm/mdp5: add atomic_print_state support drm/atomic: add debugfs file to dump out atomic state drm/atomic: add new drm_debug bit to dump atomic state drm: add helpers to go from plane state to drm_rect drm: add helper for printing to log or seq_file drm: helper macros to print composite types reservation: revert "wait only with non-zero timeout specified (v3)" v2 drm/ttm: fix ttm_bo_wait dma-buf/fence: revert "don't wait when specified timeout is zero" (v2) dma-buf/fence: make timeout handling in fence_default_wait consistent (v2) drm/amdgpu: add the interface of waiting multiple fences (v4) dma-buf: return index of the first signaled fence (v2) MAINTAINERS: update Sync File Framework files dma-buf/sw_sync: put fence reference from the fence creation dma-buf/sw_sync: mark sync_timeline_create() static drm: Add stackdepot include for DRM_DEBUG_MM ...
This commit is contained in:
@@ -158,6 +158,7 @@ static int imx_drm_atomic_commit(struct drm_device *dev,
|
||||
struct drm_plane_state *plane_state;
|
||||
struct drm_plane *plane;
|
||||
struct dma_buf *dma_buf;
|
||||
struct dma_fence *fence;
|
||||
int i;
|
||||
|
||||
/*
|
||||
@@ -170,8 +171,9 @@ static int imx_drm_atomic_commit(struct drm_device *dev,
|
||||
0)->base.dma_buf;
|
||||
if (!dma_buf)
|
||||
continue;
|
||||
plane_state->fence =
|
||||
reservation_object_get_excl_rcu(dma_buf->resv);
|
||||
fence = reservation_object_get_excl_rcu(dma_buf->resv);
|
||||
|
||||
drm_atomic_set_fence_for_plane(plane_state, fence);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user