diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-05-28 05:21:59 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-31 19:37:25 -0400 |
commit | d7e1958dbe4a7b81d4cab5fab545a068501b967e (patch) | |
tree | 92bf46006c21c4f1770bc8803ae6807461fa2e07 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
parent | 1ae1ddd5e99bbc067414ff571ac18d4312b4c8cf (diff) |
drm/vmwgfx: Support older hardware.
V2: Fix a couple of typos.
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 0c9c0811f42d..bdd87dc9e7b1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -318,6 +318,15 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
318 | goto out_err3; | 318 | goto out_err3; |
319 | } | 319 | } |
320 | 320 | ||
321 | /* Need mmio memory to check for fifo pitchlock cap. */ | ||
322 | if (!(dev_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) && | ||
323 | !(dev_priv->capabilities & SVGA_CAP_PITCHLOCK) && | ||
324 | !vmw_fifo_have_pitchlock(dev_priv)) { | ||
325 | ret = -ENOSYS; | ||
326 | DRM_ERROR("Hardware has no pitchlock\n"); | ||
327 | goto out_err4; | ||
328 | } | ||
329 | |||
321 | dev_priv->tdev = ttm_object_device_init | 330 | dev_priv->tdev = ttm_object_device_init |
322 | (dev_priv->mem_global_ref.object, 12); | 331 | (dev_priv->mem_global_ref.object, 12); |
323 | 332 | ||