summaryrefslogtreecommitdiff
path: root/shared-core/i915_dma.c
diff options
context:
space:
mode:
authorHong Liu <hong.liu@intel.com>2008-05-12 14:38:49 +0800
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-05-12 12:04:02 -0700
commitaf60d87869303d7f17352c82d2fb1cebb9a8f7ff (patch)
tree0ea18768d4020f5256ab12a091bde428c2e912f2 /shared-core/i915_dma.c
parent3f66a0005c1273b0fc935b9bd62a6fabaf99c2be (diff)
fix G33 hardware status page in modeset
We need to alloc a hw status page bo for G33 if modeset is enabled since the 2D driver can't alloc gfx memory when working in drm modeset.
Diffstat (limited to 'shared-core/i915_dma.c')
-rw-r--r--shared-core/i915_dma.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index fc9e0e49..9bec85a1 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -997,6 +997,10 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
DRM_ERROR("called with no initialization\n");
return -EINVAL;
}
+
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
+ return 0;
+
DRM_DEBUG("set status page addr 0x%08x\n", (u32)hws->addr);
dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12);