From patchwork Mon May 13 23:58:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 2563101 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 400933FC5A for ; Tue, 14 May 2013 06:36:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E31AE6036 for ; Mon, 13 May 2013 23:36:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-da0-f52.google.com (mail-da0-f52.google.com [209.85.210.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 29554E5FB0 for ; Mon, 13 May 2013 16:59:18 -0700 (PDT) Received: by mail-da0-f52.google.com with SMTP id o9so2606924dan.25 for ; Mon, 13 May 2013 16:59:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=9mTE+TiSuzlUltwTJ1m/0tl5WyHT5uuAhb/Nlh+tRHs=; b=ikuvHShVbea6XN2G+sbwsH9lmRM/fZz/5Bas/VqKngKQkuAZmbLv75xVtTmWQyoHTe i5QGW3ryTGaKR1nlGUdj4Un/UrWnZVVo9FJBmLH1ZCx+lQIx9Jz9/OTNfruE04Z19j+K 0+Wczft9nUrCt9wsnKZlu//fobFBOQzasr2n0jclQB+dJS6RlGlfYBAUSY6DwWaGilZz T2tN6xlYuSHTqkb9HpOs1VqqH6q34I6ZFveX48m72cQ6SmOPvSn4RBUzb3qcf7Mby3PQ MWd6gEe6qHNtLPkk80V6XyIkaV52jjaKeF/y7sL47c7ROZDKY1jS78gtS5Xutz77YUKu zryg== X-Received: by 10.66.253.34 with SMTP id zx2mr32700770pac.35.1368489558013; Mon, 13 May 2013 16:59:18 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id al2sm15689401pbc.25.2013.05.13.16.59.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 May 2013 16:59:16 -0700 (PDT) From: Andy Lutomirski To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v3 7/9] uvesafb: Clean up MTRR code Date: Mon, 13 May 2013 16:58:46 -0700 Message-Id: X-Mailer: git-send-email 1.8.1.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkD0WeIj5eJSe3kkD0q+UJy/u19qoV0BJbGZqgSUdMH/1XsZ5tbeV5f5oogvBhr4quLwLrd X-Mailman-Approved-At: Mon, 13 May 2013 23:17:58 -0700 Cc: Daniel Vetter , Andy Lutomirski 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 The old code allowed very strange memory types. Now it works like all the other video drivers: ioremap_wc is used unconditionally, and MTRRs are set if PAT is unavailable (unless MTRR is disabled by a module parameter). UC, WB, and WT support is gone. If there are MTRR conflicts that prevent addition of a WC MTRR, adding a non-conflicting MTRR is pointless; it's better to just turn off MTRR support entirely. As an added bonus, any MTRR added is freed on unload. Reviewed-by: Daniel Vetter Signed-off-by: Andy Lutomirski --- Documentation/fb/uvesafb.txt | 16 ++++------ drivers/video/uvesafb.c | 70 +++++++++++--------------------------------- include/video/uvesafb.h | 1 + 3 files changed, 23 insertions(+), 64 deletions(-) diff --git a/Documentation/fb/uvesafb.txt b/Documentation/fb/uvesafb.txt index eefdd91..f6362d8 100644 --- a/Documentation/fb/uvesafb.txt +++ b/Documentation/fb/uvesafb.txt @@ -81,17 +81,11 @@ pmipal Use the protected mode interface for palette changes. mtrr:n Setup memory type range registers for the framebuffer where n: - 0 - disabled (equivalent to nomtrr) (default) - 1 - uncachable - 2 - write-back - 3 - write-combining - 4 - write-through - - If you see the following in dmesg, choose the type that matches - the old one. In this example, use "mtrr:2". -... -mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining -... + 0 - disabled (equivalent to nomtrr) + 3 - write-combining (default) + + Values other than 0 and 3 will result in a warning and will be + treated just like 3. nomtrr Do not use memory type range registers. diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index d428445..8701f96 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c @@ -24,9 +24,6 @@ #ifdef CONFIG_X86 #include