From fa09957c702e5aa41c09ca452bd7220c1e8a6985 Mon Sep 17 00:00:00 2001
From: Qiang Yu <yuq825@gmail.com>
Date: Sun, 15 Jul 2018 11:24:41 +0800
Subject: [PATCH 076/146] drm/lima: remove depend on ARM arch
Mali GPU is used on x86-64 arch too:
https://en.wikipedia.org/wiki/Rockchip#Tablet_processors_with_integrated_modem
Always use need_dma32 as it won't cause any trouble
on 32bit arch.
Signed-off-by: Qiang Yu <yuq825@gmail.com>
---
drivers/gpu/drm/lima/Kconfig | 1 -
drivers/gpu/drm/lima/lima_ttm.c | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/lima/Kconfig b/drivers/gpu/drm/lima/Kconfig
index bb75bcb97ccb..89d63cca8a75 100644
--- a/drivers/gpu/drm/lima/Kconfig
+++ b/drivers/gpu/drm/lima/Kconfig
@@ -4,7 +4,6 @@
config DRM_LIMA
tristate "LIMA (DRM support for ARM Mali 400/450 GPU)"
depends on DRM
- depends on ARM || ARM64 || COMPILE_TEST
select DRM_SCHED
select DRM_TTM
help
diff --git a/drivers/gpu/drm/lima/lima_ttm.c b/drivers/gpu/drm/lima/lima_ttm.c
index a79ff0e86929..af46dd1edf43 100644
--- a/drivers/gpu/drm/lima/lima_ttm.c
+++ b/drivers/gpu/drm/lima/lima_ttm.c
@@ -333,25 +333,18 @@ static struct ttm_bo_driver lima_bo_driver = {
int lima_ttm_init(struct lima_device *dev)
{
int err;
- bool need_dma32;
u64 gtt_size;
err = lima_ttm_global_init(dev);
if (err)
return err;
-#if defined(CONFIG_ARM) && !defined(CONFIG_ARM_LPAE)
- need_dma32 = false;
-#else
- need_dma32 = true;
-#endif
-
err = ttm_bo_device_init(&dev->mman.bdev,
dev->mman.bo_global_ref.ref.object,
&lima_bo_driver,
dev->ddev->anon_inode->i_mapping,
DRM_FILE_PAGE_OFFSET,
- need_dma32);
+ true);
if (err) {
dev_err(dev->dev, "failed initializing buffer object "
"driver(%d).\n", err);
--
2.17.1