From b7393af6541f366ba4f817fb621774110d363284 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 7 Apr 2020 09:20:35 +0200 Subject: [PATCH] ANDROID: clean up remaining merge issue from drm/msm/a6xx.c patch The patch "FROMLIST: drm/msm/a6xx: Use the DMA API for GMU memory objects" is merged upstream, but when merging from there, one tiny bit was left over in our tree. Revert that as it's not needed here. Cc: Jordan Crouse Cc: John Stultz Link: https://lore.kernel.org/lkml/1582223216-23459-5-git-send-email-jcrouse@codeaurora.org/ Signed-off-by: Greg Kroah-Hartman Change-Id: I4078855b7efb732c52e0dac2febe9389f39aec8e --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 21477657609c..c4e71abbdd53 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -938,7 +938,6 @@ static struct a6xx_gmu_bo *a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, return ERR_PTR(-ENOMEM); bo->size = PAGE_ALIGN(size); - bo->attrs = DMA_ATTR_WRITE_COMBINE; bo->virt = dma_alloc_wc(gmu->dev, bo->size, &bo->iova, GFP_KERNEL);