From a70aedd5fc78a162aeb681d47a75edcc831ed3f3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 9 Jan 2007 13:38:36 +1100 Subject: [PATCH] novueau: try resource 3 if resource 2 is 0 length This happens on my NV43 PPC --- shared-core/nouveau_state.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 44f8c1aa..1e0587f6 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -66,8 +66,12 @@ int nouveau_firstopen(struct drm_device *dev) /* map larger RAMIN aperture on NV40 cards */ if (dev_priv->card_type >= NV_40) { - ret = drm_addmap(dev, drm_get_resource_start(dev, 2), - drm_get_resource_len(dev, 2), + int ramin_resource = 2; + if (drm_get_resource_len(dev, ramin_resource) == 0) + ramin_resource = 3; + + ret = drm_addmap(dev, drm_get_resource_start(dev, ramin_resource), + drm_get_resource_len(dev, ramin_resource), _DRM_REGISTERS, _DRM_READ_ONLY, &dev_priv->ramin);