aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes at virtuousgeek.org>2009-06-05 10:41:29 -0400
committerEric Anholt <eric@anholt.net>2009-06-09 14:15:07 -0400
commitd765898970f35acef960581f678b9da9d5c779fa (patch)
tree07465dd7221dfef8624c9f2982e3cd2c01bf4775 /drivers/gpu/drm/i915/i915_drv.h
parent1b8e69662e1a086878bf930a6042daf7f8a076cc (diff)
drm/i915: enable MCHBAR if needed
Using the new PNP resource checking code, this patch allows the i915 driver to allocate MCHBAR space if needed and use the BAR to determine current memory settings. [apw@canonical.com: moved to the new generic PNP resource interface] Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Eric Anholt <eric@anholt.net> failure to update-index after git-am --reject to hand-apply Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index db81f5513daa..6a471458d61a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -150,6 +150,8 @@ typedef struct drm_i915_private {
150 drm_local_map_t hws_map; 150 drm_local_map_t hws_map;
151 struct drm_gem_object *hws_obj; 151 struct drm_gem_object *hws_obj;
152 152
153 struct resource mch_res;
154
153 unsigned int cpp; 155 unsigned int cpp;
154 int back_offset; 156 int back_offset;
155 int front_offset; 157 int front_offset;