Skip to content

Commit

Permalink
drm/i915: Don't do MTRR setup if PAT is enabled
Browse files Browse the repository at this point in the history
Some newer BIOSes are shipping with all MTRRs already populated.  These
BIOSes are all on machines with sufficiently new CPUs that the
referenced errata doesn't apply anyway, so just don't try to claim the
MTRR.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41648
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Adam Jackson authored and Daniel Vetter committed Mar 18, 2012
1 parent e2b665c commit 9e984bc
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/gpu/drm/i915/i915_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <acpi/video.h>
#include <asm/pat.h>

static void i915_write_hws_pga(struct drm_device *dev)
{
Expand Down Expand Up @@ -1918,6 +1919,11 @@ static void
i915_mtrr_setup(struct drm_i915_private *dev_priv, unsigned long base,
unsigned long size)
{
#if defined(CONFIG_X86_PAT)
if (cpu_has_pat)
return;
#endif

/* Set up a WC MTRR for non-PAT systems. This is more common than
* one would think, because the kernel disables PAT on first
* generation Core chips because WC PAT gets overridden by a UC
Expand Down

0 comments on commit 9e984bc

Please sign in to comment.