From patchwork Fri Oct 5 13:25:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 1553091 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id CAE6ADF24C for ; Fri, 5 Oct 2012 13:27:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D5C6A0C31 for ; Fri, 5 Oct 2012 06:27:20 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 367EA9E8F5 for ; Fri, 5 Oct 2012 06:26:57 -0700 (PDT) Received: by mail-pb0-f49.google.com with SMTP id xa7so1955713pbc.36 for ; Fri, 05 Oct 2012 06:26:56 -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=LLKYMIcPBtr6Hmv2Uznanx1lFdBvXNR3GQjeahKLL/fkFuyxYNb4K2FUnZL7OMTZji KxSB7P0Gv6MqofGDzrwhz4cXHx3Tm1eQ41wsGqFLKjmT/kzyGbArhbzDn/uJURXBSavF vHfpAwCuDxTskcdVGXAOFEUPOhFkWW6iwKfv8VrVNXvlP7wZ1tL5xHR7YImP9Ps3WyeX 4u9iVGGLv371lRBgesyykk9boiProvFGhlqwnoPJ+Yi8UREGF73W/y6dnky79ASIYnrN BFHfSEOQcEXhijeHv+WWHYkXXgnSyeI+Gqppmd/JjORj9G0GzMHHeavOjP9OlNL2Kugs GibA== Received: by 10.68.203.195 with SMTP id ks3mr30694609pbc.79.1349443616675; Fri, 05 Oct 2012 06:26:56 -0700 (PDT) Received: from localhost.localdomain ([222.92.8.142]) by mx.google.com with ESMTPS id op7sm270211pbc.52.2012.10.05.06.26.44 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 06:26:55 -0700 (PDT) From: Huacai Chen To: Ralf Baechle Subject: [PATCH V7 11/15] drm: Handle io prot correctly for MIPS Date: Fri, 5 Oct 2012 21:25:08 +0800 Message-Id: <1349443512-18340-12-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1349443512-18340-1-git-send-email-chenhc@lemote.com> References: <1349443512-18340-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