samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: gem_free_object removed from drm

Browse Source 
Commit 1a9458aeb8eb ("drm: remove drm_driver::gem_free_object")
deprecates gem_free_object. This changes updates the msm driver
to call msm_gem_free_object from gem_free_object_unlocked.

Change-Id: If6bd6252232045975357e1bdfbeae6017b0f2ed5
Signed-off-by: Samantha Tran <samtran@codeaurora.org>
Signed-off-by: Nilaan Gunabalachandran <ngunabal@codeaurora.org>
This commit is contained in:
Samantha Tran
2020-09-17 21:18:02 -07:00
committed by Nilaan Gunabalachandran
parent 57c40f17c2
commit bb6569b1ab
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msm/msm_drv.c
View File

@@ -1725,7 +1725,7 @@ static struct drm_driver msm_driver = {
.irq_uninstall = msm_irq_uninstall, .irq_uninstall = msm_irq_uninstall,
.enable_vblank = msm_enable_vblank, .enable_vblank = msm_enable_vblank,
.disable_vblank = msm_disable_vblank, .disable_vblank = msm_disable_vblank,
.gem_free_object = msm_gem_free_object, .gem_free_object_unlocked = msm_gem_free_object,
.gem_vm_ops = &vm_ops, .gem_vm_ops = &vm_ops,
.dumb_create = msm_gem_dumb_create, .dumb_create = msm_gem_dumb_create,
.dumb_map_offset = msm_gem_dumb_map_offset, .dumb_map_offset = msm_gem_dumb_map_offset,

3
msm/msm_gem.c
View File

@@ -1003,11 +1003,8 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
/* don't call directly! Use drm_gem_object_put() and friends */ /* don't call directly! Use drm_gem_object_put() and friends */
void msm_gem_free_object(struct drm_gem_object *obj) void msm_gem_free_object(struct drm_gem_object *obj)
{ {
struct drm_device *dev = obj->dev;
struct msm_gem_object *msm_obj = to_msm_bo(obj); struct msm_gem_object *msm_obj = to_msm_bo(obj);
WARN_ON(!mutex_is_locked(&dev->struct_mutex));
/* object should not be on active list: */ /* object should not be on active list: */
WARN_ON(is_active(msm_obj)); WARN_ON(is_active(msm_obj));