From patchwork Fri Aug 17 08:43:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 1337961 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 524EA3FC33 for ; Fri, 17 Aug 2012 08:45:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D5EC59EC2F for ; Fri, 17 Aug 2012 01:45:05 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pz0-f49.google.com (mail-pz0-f49.google.com [209.85.210.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 3483E9EC2F for ; Fri, 17 Aug 2012 01:44:48 -0700 (PDT) Received: by dajq27 with SMTP id q27so797384daj.36 for ; Fri, 17 Aug 2012 01:44:48 -0700 (PDT) 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== Received: by 10.68.197.228 with SMTP id ix4mr10038316pbc.40.1345193087897; Fri, 17 Aug 2012 01:44:47 -0700 (PDT) Received: from localhost.localdomain ([222.92.8.142]) by mx.google.com with ESMTPS id sz3sm4503572pbc.21.2012.08.17.01.44.43 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Aug 2012 01:44:47 -0700 (PDT) From: Huacai Chen To: Ralf Baechle Subject: [PATCH V6 11/15] drm: Handle io prot correctly for MIPS Date: Fri, 17 Aug 2012 16:43:31 +0800 Message-Id: <1345193015-3024-12-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1345193015-3024-1-git-send-email-chenhc@lemote.com> References: <1345193015-3024-1-git-send-email-chenhc@lemote.com> Cc: linux-mips@linux-mips.org, Zhangjin Wu , Hua Yan , Fuxin Zhang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Hongliang Tao , Huacai Chen X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Signed-off-by: Huacai Chen Signed-off-by: Hongliang Tao Signed-off-by: Hua Yan 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