From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Tue, 15 Dec 2020 10:05:43 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae75a0431f822273ce5d3a574863c67503db5775;p=linux.git

Merge drm/drm-next into drm-misc-next

Required backmerge since we will be based on top of v5.11, and there
has been a request to backmerge already to upstream some features.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---

ae75a0431f822273ce5d3a574863c67503db5775
diff --cc drivers/gpu/drm/msm/msm_gem.c
index f995cb02b63d3,9a7c49bc394f8..45e23125dfdb1
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@@ -1180,9 -1211,9 +1211,9 @@@ struct drm_gem_object *msm_gem_import(s
  		goto fail;
  	}
  
 -	ret = drm_prime_sg_to_page_addr_arrays(sgt, msm_obj->pages, NULL, npages);
 +	ret = drm_prime_sg_to_page_array(sgt, msm_obj->pages, npages);
  	if (ret) {
- 		mutex_unlock(&msm_obj->lock);
+ 		msm_gem_unlock(obj);
  		goto fail;
  	}