diff options
| author | Jesse Barnes <jbarnes at virtuousgeek.org> | 2009-06-05 14:41:29 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-09 11:15:07 -0700 |
| commit | d765898970f35acef960581f678b9da9d5c779fa (patch) | |
| tree | 07465dd7221dfef8624c9f2982e3cd2c01bf4775 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 1b8e69662e1a086878bf930a6042daf7f8a076cc (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.h | 2 |
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 db81f5513da..6a471458d61 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 { drm_local_map_t hws_map; struct drm_gem_object *hws_obj; + struct resource mch_res; + unsigned int cpp; int back_offset; int front_offset; |