linux-mips
[Top] [All Lists]

[PATCH V6 11/15] drm: Handle io prot correctly for MIPS

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH V6 11/15] drm: Handle io prot correctly for MIPS
From: Huacai Chen <chenhc@lemote.com>
Date: Fri, 17 Aug 2012 16:43:31 +0800
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
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=wwsN01bNbglem1+Oo67QbSeqXYqos3nHSsDd4RDmxkU=; b=KuOtx+Ww5OTO0pYbjv1pJaiG+M+pGBN6lAV5PRUXfTvDn7vwngxzwqgYrOggdZAWK/ XgJAYmtN58YiV+fe2P33Rdb0zNaqprfQV9lY601JSMAZaknFO5cgBRPfoXuEcZpClVS6 z1uAXwZJRFuiylOE6ZlfqRK++6U6fgY1tcrbKEoXsLmSDcNL7AIxM9vQ67Zswwws8xXK 2BijvqeYsbVJdMDdneECmd9S0lGREmZOzrpep3Tmi7CdRSWEbKqOGCoS/AN2FO7ehVf2 meNDNHq8LBtrbL7I8eTXX8TKwQuKDxmuKaOzf/MsZtuwfB8eYDy1ujcWESU5Lw0zIUrW QRHg==
In-reply-to: <1345193015-3024-1-git-send-email-chenhc@lemote.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1345193015-3024-1-git-send-email-chenhc@lemote.com>
Sender: linux-mips-bounce@linux-mips.org
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/ttm/ttm_bo_util.c |    2 +-
 2 files changed, 2 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/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
-- 
1.7.7.3


<Prev in Thread] Current Thread [Next in Thread>