summaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/intel-agp.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-08-22 09:19:40 +1000
committerDave Airlie <airlied@redhat.com>2012-08-22 09:19:40 +1000
commit85119c16b34526b2b3c33b01ac6d770aa4431434 (patch)
tree6516fb3ac367a1296a21d6e0062b74985f8c0f45 /drivers/char/agp/intel-agp.h
parente2be2cd8046748a006c4afa40959855fe4079274 (diff)
parent1ee9ae3244c4789f3184c5123f3b2d7e405b3f4c (diff)
downloadop-kernel-dev-85119c16b34526b2b3c33b01ac6d770aa4431434.zip
op-kernel-dev-85119c16b34526b2b3c33b01ac6d770aa4431434.tar.gz
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes: " Nothing too major: - A few fixes around the edid handling from Jani, also fixing a regression in 3.5 due to us using gmbus by default. - Fixup hsw uncached pte flags. - Fix suspend/resume crash when using hw contexts, from Ben. - Try to tune gpu turbo a bit better, seems to help with some oddball power regressions." * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: use hsw rps tuning values everywhere on gen6+ drm/i915: fall back to bit-banging if GMBUS fails in CRT EDID reads drm/i915: extract connector update from intel_ddc_get_modes() for reuse drm/i915: fix hsw uncached pte drm/i915/contexts: fix list corruption drm/i915: fix EDID memory leak in SDVO
Diffstat (limited to 'drivers/char/agp/intel-agp.h')
-rw-r--r--drivers/char/agp/intel-agp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 6f007b6..6ec0fff 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -64,6 +64,7 @@
#define I830_PTE_SYSTEM_CACHED 0x00000006
/* GT PTE cache control fields */
#define GEN6_PTE_UNCACHED 0x00000002
+#define HSW_PTE_UNCACHED 0x00000000
#define GEN6_PTE_LLC 0x00000004
#define GEN6_PTE_LLC_MLC 0x00000006
#define GEN6_PTE_GFDT 0x00000008
OpenPOWER on IntegriCloud