diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-05-01 22:37:38 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-04 23:43:25 -0400 |
commit | 56fbd2b65446d4fb4df7770c49a70d563b7569c9 (patch) | |
tree | 84e4bb41a6fdc235b1f3c12d1be747d55c5a85be /drivers/gpu | |
parent | 26410c679865bcfcbe18422ca1eb472cf12ea82d (diff) |
drm/nvf0/fifo: enable support
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c index 78ae397c3eee..10a4ee208009 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c | |||
@@ -163,8 +163,8 @@ nve0_identify(struct nouveau_device *device) | |||
163 | device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass; | 163 | device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass; |
164 | device->oclass[NVDEV_SUBDEV_BAR ] = &nvc0_bar_oclass; | 164 | device->oclass[NVDEV_SUBDEV_BAR ] = &nvc0_bar_oclass; |
165 | device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass; | 165 | device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass; |
166 | #if 0 | ||
167 | device->oclass[NVDEV_ENGINE_FIFO ] = &nve0_fifo_oclass; | 166 | device->oclass[NVDEV_ENGINE_FIFO ] = &nve0_fifo_oclass; |
167 | #if 0 | ||
168 | device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass; | 168 | device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass; |
169 | device->oclass[NVDEV_ENGINE_GR ] = nvf0_graph_oclass; | 169 | device->oclass[NVDEV_ENGINE_GR ] = nvf0_graph_oclass; |
170 | #endif | 170 | #endif |
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c index 0338e66bc620..09644fa9602c 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | |||
@@ -221,8 +221,10 @@ nve0_fifo_chan_ctor(struct nouveau_object *parent, | |||
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | if (i == FIFO_ENGINE_NR) | 224 | if (i == FIFO_ENGINE_NR) { |
225 | nv_error(priv, "unsupported engines 0x%08x\n", args->engine); | ||
225 | return -ENODEV; | 226 | return -ENODEV; |
227 | } | ||
226 | 228 | ||
227 | ret = nouveau_fifo_channel_create(parent, engine, oclass, 1, | 229 | ret = nouveau_fifo_channel_create(parent, engine, oclass, 1, |
228 | priv->user.bar.offset, 0x200, | 230 | priv->user.bar.offset, 0x200, |