From patchwork Sat Jan 30 05:59:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 8169651 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E1CCDBEEE5 for ; Sat, 30 Jan 2016 05:59:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A13020397 for ; Sat, 30 Jan 2016 05:59:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C3E4E20398 for ; Sat, 30 Jan 2016 05:59:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C8E566E090; Fri, 29 Jan 2016 21:59:45 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0C186E04B for ; Fri, 29 Jan 2016 21:59:44 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id l66so886630wml.2 for ; Fri, 29 Jan 2016 21:59:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WkP87efTI5r/UQ0hGKHFL81k++GWHHUx4jO79H/h3yI=; b=IXVuxjr/4faZCA/fcvgbHC/aY277ClxQjMmIureKXtVRVO1TiWK9HGtWiW2V1aJvug 9Z80WZt/3qqVh4kWJkTW1yGVyJ7j0ElovB5p7uyMWBsgd7YDPB5WGWIflZzbOOg3Izhe 3KKA87OC7PLSheCjdfuLWoFvFZCZhJqUU1PyhxGpRsisWJ/MEgZF1tig5gFc69RwCaZN v+Yn5DgTa5zGhBXbO+yrmE5J+ErSm447zbvHcOnVZyr8ZRTFYNylED4qTtklQZo2oJRa jmpaQKYJCtN4T0Pg0kVFc/S8TWobifSQIUxt6QOPg/CHAoJQUDFMSI2eW/0fB0ZgtsoV wZ0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WkP87efTI5r/UQ0hGKHFL81k++GWHHUx4jO79H/h3yI=; b=JJFCYOKbuH2KDyHlf88yVr5znWIv/iV1eBzYev1TL83bMF+lE8f7srSbFbnomK4D8r 37U4B9tkfOV4bW7akgpnefgMpGO49LDWU+ZkheRJTrTsqgmjxdqM3xfUItMuDs1SaZdY KAp0pU37In0bSWGrnyTH3moH2p142BSxkkyOaXKnb0Gp9TciZz/YMMm3MeTSf6LJhbpm JrwXhcmQJfJrD+T1maaQ5Alnjjv2cxLzWN9kzgY68845BJ2XKzqejyeBWUW7R0o/8fTZ OGNG9Iex8APmUjkbdy2/czwF/iQ0VULMJsdpxuZgXa6u9zzDDU9+r7eYnymdCLl2nD3u 9z+w== X-Gm-Message-State: AG10YOSL/i+amSgUypy35daqHqQkPiNxaMfQZs9TJJKSG0gt2QsNn4AUVbMDVxYciXiwhw== X-Received: by 10.194.62.11 with SMTP id u11mr13977850wjr.172.1454133583488; Fri, 29 Jan 2016 21:59:43 -0800 (PST) Received: from odedg-tlv.redhat.com ([77.125.92.242]) by smtp.gmail.com with ESMTPSA id t199sm1034364wmt.23.2016.01.29.21.59.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jan 2016 21:59:42 -0800 (PST) From: Oded Gabbay To: dri-devel@lists.freedesktop.org, alexdeucher@gmail.com Subject: [PATCH 2/3] drm/radeon: mask out WC from BO on unsupported arches Date: Sat, 30 Jan 2016 07:59:33 +0200 Message-Id: <1454133574-20527-2-git-send-email-oded.gabbay@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454133574-20527-1-git-send-email-oded.gabbay@gmail.com> References: <1454133574-20527-1-git-send-email-oded.gabbay@gmail.com> Cc: michel.daenzer@amd.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Oded Gabbay Reviewed-by: Michel Dänzer --- drivers/gpu/drm/radeon/radeon_object.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 84d4563..255faf6 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "radeon.h" #include "radeon_trace.h" @@ -245,6 +246,13 @@ int radeon_bo_create(struct radeon_device *rdev, DRM_INFO_ONCE("Please enable CONFIG_MTRR and CONFIG_X86_PAT for " "better performance thanks to write-combining\n"); bo->flags &= ~(RADEON_GEM_GTT_WC | RADEON_GEM_GTT_UC); +#else + /* + * For architectures that don't support WC memory, + * mask out the WC flag from the BO + */ + if (!drm_arch_can_wc_memory()) + bo->flags &= ~RADEON_GEM_GTT_WC; #endif radeon_ttm_placement_from_domain(bo, domain);