Merge tag 'topic/drm-misc-2016-10-27' of git://anongit.freedesktop.org/git/drm-intel into drm-next
Pull request already again to get the s/fence/dma_fence/ stuff in and allow everyone to resync. Otherwise really just misc stuff all over, and a new bridge driver. * tag 'topic/drm-misc-2016-10-27' of git://anongit.freedesktop.org/git/drm-intel: drm/bridge: fix platform_no_drv_owner.cocci warnings drm/bridge: fix semicolon.cocci warnings drm: Print some debug/error info during DP dual mode detect drm: mark drm_of_component_match_add dummy inline drm/bridge: add Silicon Image SiI8620 driver dt-bindings: add Silicon Image SiI8620 bridge bindings video: add header file for Mobile High-Definition Link (MHL) interface drm: convert DT component matching to component_match_add_release() dma-buf: Rename struct fence to dma_fence dma-buf/fence: add an lockdep_assert_held() drm/dp: Factor out helper to distinguish between branch and sink devices drm/edid: Only print the bad edid when aborting drm/msm: add missing header dependencies drm/msm/adreno: move function declarations to header file drm/i2c/tda998x: mark symbol static where possible doc: add missing docbook parameter for fence-array drm: RIP mode_config->rotation_property drm/msm/mdp5: Advertize 180 degree rotation drm/msm/mdp5: Use per-plane rotation property
This commit is contained in:
@@ -211,7 +211,7 @@ struct ttm_buffer_object {
|
||||
* Members protected by a bo reservation.
|
||||
*/
|
||||
|
||||
struct fence *moving;
|
||||
struct dma_fence *moving;
|
||||
|
||||
struct drm_vma_offset_node vma_node;
|
||||
|
||||
|
@@ -303,7 +303,7 @@ struct ttm_mem_type_manager {
|
||||
/*
|
||||
* Protected by @move_lock.
|
||||
*/
|
||||
struct fence *move;
|
||||
struct dma_fence *move;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -1039,7 +1039,7 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
|
||||
*/
|
||||
|
||||
extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
|
||||
struct fence *fence, bool evict,
|
||||
struct dma_fence *fence, bool evict,
|
||||
struct ttm_mem_reg *new_mem);
|
||||
|
||||
/**
|
||||
@@ -1054,7 +1054,7 @@ extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
|
||||
* immediately or hang it on a temporary buffer object.
|
||||
*/
|
||||
int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
|
||||
struct fence *fence, bool evict,
|
||||
struct dma_fence *fence, bool evict,
|
||||
struct ttm_mem_reg *new_mem);
|
||||
|
||||
/**
|
||||
|
@@ -114,6 +114,6 @@ extern int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
|
||||
|
||||
extern void ttm_eu_fence_buffer_objects(struct ww_acquire_ctx *ticket,
|
||||
struct list_head *list,
|
||||
struct fence *fence);
|
||||
struct dma_fence *fence);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user