diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-10-10 17:14:01 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-10-12 04:59:10 -0400 |
| commit | 9169d3a88072b20f42e68a946e916bd7dfbc7f2c (patch) | |
| tree | f981fbb98946aef615546c68fced4870c07c9ff7 | |
| parent | 1cf8378906b2d5a6449147914fe04c56d6f4fd87 (diff) | |
drm/i915: disable wc gtt pte mappings on gen2
It doesn't work since the gtt pte range sits in the middle of the mmio
bar. We didn't notice that since both my and Chris' gen2 machines
don't support PAT and hence all wc io mapping request will
automatically be demoted to uc.
This regression has been introduce in
commit edef7e685da05c13cce50c0126189c80fe2c8f71
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Sep 14 11:57:47 2012 +0100
agp/intel: Use a write-combining map for updating PTEs
Reported-by: Egbert Eich <eich@pdx.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55834
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index e01f5eaaec8..38390f7c6ab 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
| @@ -667,7 +667,7 @@ static int intel_gtt_init(void) | |||
| 667 | gtt_map_size = intel_private.base.gtt_total_entries * 4; | 667 | gtt_map_size = intel_private.base.gtt_total_entries * 4; |
| 668 | 668 | ||
| 669 | intel_private.gtt = NULL; | 669 | intel_private.gtt = NULL; |
| 670 | if (INTEL_GTT_GEN < 6) | 670 | if (INTEL_GTT_GEN < 6 && INTEL_GTT_GEN > 2) |
| 671 | intel_private.gtt = ioremap_wc(intel_private.gtt_bus_addr, | 671 | intel_private.gtt = ioremap_wc(intel_private.gtt_bus_addr, |
| 672 | gtt_map_size); | 672 | gtt_map_size); |
| 673 | if (intel_private.gtt == NULL) | 673 | if (intel_private.gtt == NULL) |