diff options
| author | Rob Clark <robdclark@chromium.org> | 2024-10-30 09:49:12 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2024-10-30 09:49:12 -0700 |
| commit | 4a6fd06643afa99989a0e6b848e125099674227b (patch) | |
| tree | 906305fd51a4813c9c2383cf6d42889d4188aea4 /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | d6d1ad32d00714ecf9f1996173c6f98e43c5b022 (diff) | |
| parent | 904bc5479896d8da7dcd3e162ce224c32c3dc6c3 (diff) | |
| download | lwn-4a6fd06643afa99989a0e6b848e125099674227b.tar.gz lwn-4a6fd06643afa99989a0e6b848e125099674227b.zip | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next
Merging to pick up commit 785324db2d7a ("drm/msm/dp: migrate the
ycbcr_420_allowed to drm_bridge").
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index fdae677558f3..b9c67e4ca360 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1402,8 +1402,6 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, omap_obj = to_omap_bo(obj); - mutex_lock(&omap_obj->lock); - omap_obj->sgt = sgt; if (omap_gem_sgt_is_contiguous(sgt, size)) { @@ -1418,21 +1416,17 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, pages = kcalloc(npages, sizeof(*pages), GFP_KERNEL); if (!pages) { omap_gem_free_object(obj); - obj = ERR_PTR(-ENOMEM); - goto done; + return ERR_PTR(-ENOMEM); } omap_obj->pages = pages; ret = drm_prime_sg_to_page_array(sgt, pages, npages); if (ret) { omap_gem_free_object(obj); - obj = ERR_PTR(-ENOMEM); - goto done; + return ERR_PTR(-ENOMEM); } } -done: - mutex_unlock(&omap_obj->lock); return obj; } |