diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-09 20:02:14 +1000 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-09 20:02:14 +1000 |
commit | 31e33813e8c1b085683e68524e680882368e59a9 (patch) | |
tree | aaa12d9c8047203dac0fdffe5d21dce551a70530 /shared-core | |
parent | 3c58195ccd346cc61f98b9f89cf074edf6886723 (diff) |
nouveau: Don't be so strict on <NV50
Diffstat (limited to 'shared-core')
-rw-r--r-- | shared-core/nouveau_object.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c index a394ae6e..bf811b4b 100644 --- a/shared-core/nouveau_object.c +++ b/shared-core/nouveau_object.c @@ -331,18 +331,18 @@ nouveau_gpuobj_instance_get(drm_device_t *dev, int channel, drm_nouveau_private_t *dev_priv = dev->dev_private; nouveau_gpuobj_t *cpramin; - if ((channel > 0) && gpuobj->im_channel != channel) { - DRM_ERROR("Channel mismatch: obj %d, ref %d\n", - gpuobj->im_channel, channel); - return DRM_ERR(EINVAL); - } - /* <NV50 use PRAMIN address everywhere */ if (dev_priv->card_type < NV_50) { *inst = gpuobj->im_pramin->start; return 0; } + if ((channel > 0) && gpuobj->im_channel != channel) { + DRM_ERROR("Channel mismatch: obj %d, ref %d\n", + gpuobj->im_channel, channel); + return DRM_ERR(EINVAL); + } + /* NV50 channel-local instance */ if (channel > 0) { cpramin = dev_priv->fifos[channel]->ramin->gpuobj; |