github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: clean up remaining merge issue from drm/msm/a6xx.c patch

Browse Source 
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 <jcrouse@codeaurora.org>
Cc: John Stultz <john.stultz@linaro.org>
Link: https://lore.kernel.org/lkml/1582223216-23459-5-git-send-email-jcrouse@codeaurora.org/
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4078855b7efb732c52e0dac2febe9389f39aec8e
This commit is contained in:
Greg Kroah-Hartman 2020-04-07 09:20:35 +02:00
parent 763fae9cfb
commit b7393af654
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/msm/adreno/a6xx_gmu.c
View File

@ -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);