Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4c60dc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: avoid unmapping the buffer twice during msm_release"

parents 11894729 4d3988b0
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -128,15 +128,6 @@ static void put_pages(struct drm_gem_object *obj)

	if (msm_obj->pages) {
		if (msm_obj->sgt) {
			/* For non-cached buffers, ensure the new
			 * pages are clean because display controller,
			 * GPU, etc. are not coherent:
			 */
			if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
				dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl,
					     msm_obj->sgt->nents,
					     DMA_BIDIRECTIONAL);

			sg_free_table(msm_obj->sgt);
			kfree(msm_obj->sgt);
		}