diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-10 09:23:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-10 09:23:49 +1000 |
| commit | 7ad7f87b87f4480b989af37488511ed08559a98b (patch) | |
| tree | f331811e53751ba45f57ac47d6e4e61ab628ed03 /drivers/gpu/drm/nouveau/nouveau_object.c | |
| parent | fea6f330cdd18f79d50bcdfbedb96d929a173e0d (diff) | |
| parent | 07cfe0e7a820ecad078c04e9c2a102521709145d (diff) | |
| download | lwn-7ad7f87b87f4480b989af37488511ed08559a98b.tar.gz lwn-7ad7f87b87f4480b989af37488511ed08559a98b.zip | |
Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next
* 'nouveau/drm-nouveau-next' of ../drm-nouveau-next:
drm/nouveau: fix hwmon device binding
drm/nouveau: create grctx on the fly on all chipsets
drm/nvc0: fix init without firmware present
drm/nvc0/pgraph: fix 0x406028/0x405870 init
drm/nvc0/pgraph: more unit names
drm/nvc0/pfifo: support for chipsets with only one PSUBFIFO (0xc1)
drm/nvc0: reserve only subc 0 for kernel use
drm/nv50: sync up gr data error names with rnn, use for nvc0 also
drm/nvc0: parse a couple more PGRAPH_INTR
drm/nvc0: nuke left-over debug messages
drm/nvc0: kill off a couple more magics
drm/nouveau: Validate channel indices passed from userspace.
drm/nouveau: Only select ACPI_VIDEO if its dependencies are met
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_object.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index d77b1fcd19d4..30b6544467ca 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/nouveau_object.c @@ -651,7 +651,8 @@ found: } break; case NVOBJ_ENGINE_GR: - if (dev_priv->card_type >= NV_50 && !chan->ramin_grctx) { + if ((dev_priv->card_type >= NV_20 && !chan->ramin_grctx) || + (dev_priv->card_type < NV_20 && !chan->pgraph_ctx)) { struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph; |