disp: msm: adapt msm_gem ops and drm_drver callbacks for multiple SIs
Commit d1d1173
("disp: msm: update msm_gem ops and remove unused
drm_driver callbacks") Update msm_gem and msm_drv to comply with
latest 5.15 kernel.Modify dma_buf_vmap() and dma-buf's vmap callback
to use truct dma_buf_map. Rename dma_resv_get_excl_rcu to _unlocked.
Remove deprecated GEM and PRIME callbacks.
This change adapts all the interface change for kernel version 5.10
and version 5.15..
Change-Id: Icb495dc4e5d20999f773ed5881eff233ff3a48bc
Signed-off-by: Bruce Hoo <bingchua@codeaurora.org>
This commit is contained in:
@@ -537,7 +537,11 @@ int msm_atomic_prepare_fb(struct drm_plane *plane,
|
||||
|
||||
obj = msm_framebuffer_bo(new_state->fb, 0);
|
||||
msm_obj = to_msm_bo(obj);
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
|
||||
fence = dma_resv_get_excl_unlocked(msm_obj->resv);
|
||||
#else
|
||||
fence = dma_resv_get_excl_rcu(msm_obj->resv);
|
||||
#endif
|
||||
|
||||
drm_atomic_set_fence_for_plane(new_state, fence);
|
||||
|
||||
@@ -745,7 +749,11 @@ int msm_atomic_commit(struct drm_device *dev,
|
||||
msm_framebuffer_bo(new_plane_state->fb, 0);
|
||||
struct msm_gem_object *msm_obj = to_msm_bo(obj);
|
||||
struct dma_fence *fence =
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
|
||||
dma_resv_get_excl_unlocked(msm_obj->resv);
|
||||
#else
|
||||
dma_resv_get_excl_rcu(msm_obj->resv);
|
||||
#endif
|
||||
|
||||
drm_atomic_set_fence_for_plane(new_plane_state, fence);
|
||||
}
|
||||
|
مرجع در شماره جدید
Block a user