From: Huacai Chen <chenhuacai@gmail.com>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
Fuxin Zhang <zhangfx@lemote.com>,
Zhangjin Wu <wuzhangjin@gmail.com>,
Huacai Chen <chenhc@lemote.com>, Hongliang Tao <taohl@lemote.com>,
Hua Yan <yanh@lemote.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH V4 11/16] drm/radeon: Make radeon card usable for Loongson.
Date: Fri, 3 Aug 2012 15:06:06 +0800 [thread overview]
Message-ID: <1343977571-2292-12-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1343977571-2292-1-git-send-email-chenhc@lemote.com>
1, Handle io prot correctly for MIPS.
2, Define SAREA_MAX as the size of one page.
3, Include swiotlb.h if SWIOTLB configured.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: dri-devel@lists.freedesktop.org
---
drivers/gpu/drm/drm_vm.c | 2 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++++
drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
include/drm/drm_sarea.h | 2 ++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 961ee08..3f06166 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -62,7 +62,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
tmp = pgprot_writecombine(tmp);
else
tmp = pgprot_noncached(tmp);
-#elif defined(__sparc__) || defined(__arm__)
+#elif defined(__sparc__) || defined(__arm__) || defined(__mips__)
tmp = pgprot_noncached(tmp);
#endif
return tmp;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 5b71c71..fc3ac22 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -41,6 +41,10 @@
#include "radeon_reg.h"
#include "radeon.h"
+#ifdef CONFIG_SWIOTLB
+#include <linux/swiotlb.h>
+#endif
+
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index f8187ea..0df71ea 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -472,7 +472,7 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
else
tmp = pgprot_noncached(tmp);
#endif
-#if defined(__sparc__)
+#if defined(__sparc__) || defined(__mips__)
if (!(caching_flags & TTM_PL_FLAG_CACHED))
tmp = pgprot_noncached(tmp);
#endif
diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
index ee5389d..1d1a858 100644
--- a/include/drm/drm_sarea.h
+++ b/include/drm/drm_sarea.h
@@ -37,6 +37,8 @@
/* SAREA area needs to be at least a page */
#if defined(__alpha__)
#define SAREA_MAX 0x2000U
+#elif defined(__mips__)
+#define SAREA_MAX 0x4000U
#elif defined(__ia64__)
#define SAREA_MAX 0x10000U /* 64kB */
#else
--
1.7.7.3
next prev parent reply other threads:[~2012-08-03 7:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 7:05 [PATCH V4 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-08-03 7:05 ` [PATCH V4 01/16] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2012-08-03 7:05 ` [PATCH V4 02/16] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
2012-08-03 7:05 ` [PATCH V4 03/16] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
2012-08-03 7:05 ` [PATCH V4 04/16] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC Huacai Chen
2012-08-03 7:06 ` [PATCH V4 05/16] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 06/16] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 07/16] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 08/16] MIPS: Loongson 3: Add serial port support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 09/16] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2012-08-03 7:06 ` [PATCH V4 10/16] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
2012-08-03 7:06 ` Huacai Chen [this message]
2012-08-03 8:01 ` [PATCH V4 11/16] drm/radeon: Make radeon card usable for Loongson Michel Dänzer
2012-08-03 10:29 ` Huacai Chen
2012-08-03 7:06 ` [PATCH V4 12/16] ALSA: HDA: Make hda sound " Huacai Chen
2012-08-03 9:24 ` [alsa-devel] " Takashi Iwai
2012-08-03 10:36 ` Huacai Chen
2012-08-03 14:56 ` Takashi Iwai
2012-08-03 7:06 ` [PATCH V4 13/16] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 14/16] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 15/16] MIPS: Fix poweroff failure when HOTPLUG_CPU configured Huacai Chen
2012-08-03 7:06 ` [PATCH V4 16/16] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343977571-2292-12-git-send-email-chenhc@lemote.com \
--to=chenhuacai@gmail.com \
--cc=chenhc@lemote.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=taohl@lemote.com \
--cc=wuzhangjin@gmail.com \
--cc=yanh@lemote.com \
--cc=zhangfx@lemote.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox