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

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

Merge "msm: mdss: fix dsi buf_aloc when using physical memory"

parents 3d3cddec 4803cecf

drivers/video/msm/mdss/mdss_smmu.c

+7 −1
Original line number Diff line number Diff line
@@ -399,7 +399,13 @@ static void mdss_smmu_unmap_v2(int domain, unsigned long iova, int gfp_order) 
static char *mdss_smmu_dsi_alloc_buf_v2(struct device *dev, int size,

		dma_addr_t *dmap, gfp_t gfp)

{

	return kzalloc(size, GFP_KERNEL);

	char *data;



	data = kzalloc(size, GFP_KERNEL | GFP_DMA);

	if (data)

		*dmap = (dma_addr_t) virt_to_phys(data);



	return data;

}



/*