diff options
| author | Rob Clark <robdclark@chromium.org> | 2021-06-23 07:32:59 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2021-06-23 07:32:59 -0700 |
| commit | 8c08c7b51ad33b75d480a20fb68a6f1376629e0e (patch) | |
| tree | 310f731015aed3406c4f1266637b12aa4d12e201 /drivers/gpu/drm/msm/msm_gem.c | |
| parent | a1f2ba60eace242fd034173db3762f342a824a2e (diff) | |
| parent | 170b763597d3a0a79f135e4d83a38462c3964fdf (diff) | |
| download | linux-8c08c7b51ad33b75d480a20fb68a6f1376629e0e.tar.bz2 | |
Merge branch 'msm-fixes-v5.13-rc6' into msm-next-redo
Syncing up with -rc6 fixes to avoid conflicts with a660 patches.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 1865919368f2..60eacd92e4d2 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1241,6 +1241,13 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, to_msm_bo(obj)->vram_node = &vma->node; + /* Call chain get_pages() -> update_inactive() tries to + * access msm_obj->mm_list, but it is not initialized yet. + * To avoid NULL pointer dereference error, initialize + * mm_list to be empty. + */ + INIT_LIST_HEAD(&msm_obj->mm_list); + msm_gem_lock(obj); pages = get_pages(obj); msm_gem_unlock(obj); |