diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-06-23 08:44:05 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 08:03:44 +0200 |
| commit | 52d073318a4c32865e6439f7f6c247092a6f6af3 (patch) | |
| tree | 9b7df0397728b970025d12bba04304391d3edd37 /drivers/gpu/drm/nouveau/nouveau_state.c | |
| parent | drm/nouveau: rename nv40_mpeg to nv31_mpeg (diff) | |
| download | linux-52d073318a4c32865e6439f7f6c247092a6f6af3.tar.xz linux-52d073318a4c32865e6439f7f6c247092a6f6af3.zip | |
drm/nv31/mpeg: support for a single class3174 user
Uncertain if/how the hw does multiple PMPEG channels, supporting one is
better than none however.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 93a2e83d0246..07691c2eceac 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -633,7 +633,10 @@ nouveau_card_init(struct drm_device *dev) break; } - if (dev_priv->card_type == NV_40) + if (dev_priv->card_type == NV_40 || + dev_priv->chipset == 0x31 || + dev_priv->chipset == 0x34 || + dev_priv->chipset == 0x36) nv31_mpeg_create(dev); else if (dev_priv->card_type == NV_50 && |