Hi,
when I first sent this E-Mail on Saturday, I unfortunately forgot to CC many
people. Now I used get_maintainer.pl to get the list of people that may want
to contribute to this topic.
Because of this topic, there is already a patch from Arjan in the -tip tree to
make PAT and MTRR options only configurable if EMBEDDED and enabled by
default. I think this is a step in the right direction, but at least Henrique,
Robert and I seem to think something like the attached patch is still
required. What do you think?
Kind regards,
Thomas
-----------------------------------------------------------------------------
Hi,
I've found a problem with X.org not setting up MTRR for the framebuffer
memory. After I investigated I think this is not a X.org problem, but a kernel
issue.
X.org uses libpciaccess to map the framebuffer memory. This library opens
/sys/bus/pci/devices/*/resource0_wc and mmaps the memory. Unfortunately, the
kernel only enables write combining if PAT is enabled, if it is not, the
memory is mmapped uncached. But Xorg (respectively libpciaccess) thinks it was
successfully mapped with write combining enabled and thus does not
additionally set up MTRR entries.
The corresponding libpciaccess code can be found here:
http://cgit.freedesktop.org/xorg/lib/libpciaccess/tree/src/linux_sysfs.c#n501
If the kernel behavior is intentional and X.org should always set up MTRR
entries, why should it use /sys/.../resource0_wc at all? I think there are 2
possibilities to make the kernel behavior consistent:
1. The mmap_wc should fail if PAT is not enabled.
(libpciaccess will then map the framebuffer uncached and set up
MTRR entries)
2. Use MTRR to enable write combining if PAT is not available.
In an earlier thread about ioremap_wc, Arjan van de Ven wrote that option 2 is
preferred over option 1:
http://lkml.indiana.edu/hypermail/linux/kernel/0805.3/2925.html
So, I've created the attached patch implementing option 2. For me this solves
the problem with the slow Video playback due to not correctly set up MTRR
entries.
Kind regards,
Thomas Schlichter
From 19fb39061825a0110d1a4feb3f83dfa3f09fb738 Mon Sep 17 00:00:00 2001
From: Thomas Schlichter <thomas.schlich...@web.de>
Date: Thu, 8 Oct 2009 21:24:07 +0200
Subject: [PATCH] Use MTRR for write combining mmap/ioremap if PAT is not available
X.org uses libpciaccess which tries to mmap with write combining enabled via
/sys/bus/pci/devices/*/resource0_wc. Currently, when PAT is not enabled, we
fall back to uncached mmap. Then libpciaccess thinks it succeeded mapping
with write combining anabled and does not set up suited MTRR entries. ;-(
So when falling back to uncached mapping, we better try to set up MTRR
entries automatically. To match this modified PCI mmap behavior, also
ioremap_wc and set_memory_wc are adjusted.
Signed-off-by: Thomas Schlichter <thomas.schlich...@web.de>
---
arch/x86/mm/ioremap.c | 14 +++++++++-----
arch/x86/mm/pageattr.c | 10 ++++++++--
arch/x86/pci/i386.c | 6 ++++++
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 334e63c..1a73bbc 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -21,6 +21,7 @@
#include <asm/tlbflush.h>
#include <asm/pgalloc.h>
#include <asm/pat.h>
+#include <asm/mtrr.h>
#include "physaddr.h"
@@ -268,11 +269,14 @@ EXPORT_SYMBOL(ioremap_nocache);
*/
void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size)
{
- if (pat_enabled)
- return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
- __builtin_return_address(0));
- else
- return ioremap_nocache(phys_addr, size);
+ if (!pat_enabled) {
+ void __iomem *ret = ioremap_nocache(phys_addr, size);
+ if (ret)
+ mtrr_add(phys_addr, size, MTRR_TYPE_WRCOMB, false);
+ return ret;
+ }
+ return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
+ __builtin_return_address(0));
}
EXPORT_SYMBOL(ioremap_wc);
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index dd38bfb..7f3a85b 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -23,6 +23,7 @@
#include <asm/pgalloc.h>
#include <asm/proto.h>
#include <asm/pat.h>
+#include <asm/mtrr.h>
/*
* The current flushing context - we pass it instead of 5 arguments:
@@ -1010,8 +1011,13 @@ int set_memory_wc(unsigned long addr, int numpages)
{
int ret;
- if (!pat_enabled)
- return set_memory_uc(addr, numpages);
+ if (!pat_enabled) {
+ ret = set_memory_uc(addr, numpages);
+ if (!ret)
+ mtrr_add(__pa(addr), numpages * PAGE_SIZE,
+ MTRR_TYPE_WRCOMB, false);
+ return ret;
+ }
ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
_PAGE_CACHE_WC, NULL);
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index b22d13b..06cf678 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <asm/pat.h>
+#include <asm/mtrr.h>
#include <asm/e820.h>
#include <asm/pci_x86.h>
#include <asm/io_apic.h>
@@ -301,5 +302,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
vma->vm_ops = &pci_mmap_ops;
+ if (!pat_enabled && write_combine)
+ mtrr_add_page(vma->vm_pgoff,
+ (vma->vm_end - vma->vm_start) >> PAGE_SHIFT,
+ MTRR_TYPE_WRCOMB, false);
+
return 0;
}
--
1.6.4.4
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
