diff options
| author |   Ilia Mirkin <imirkin@alum.mit.edu> | 2013-07-29 19:05:18 -0400 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2013-07-30 13:05:06 +1000 |
| commit | dc409df9447a4e3884d150e2b0dbd89242403fa6 (patch) | |
| tree | c270c20000fb7241d3799796609226454f856cf5 /drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | |
| parent | drm/nv40/mpeg: write magic value to channel object to make it work (diff) | |
| download | linux-dev-dc409df9447a4e3884d150e2b0dbd89242403fa6.tar.xz linux-dev-dc409df9447a4e3884d150e2b0dbd89242403fa6.zip | |
drm/nv31/mpeg: don't recognize nv3x cards as having nv44 graph class
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c index 9f7c7d53e61e..c19004301309 100644 --- a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c +++ b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c @@ -284,7 +284,10 @@ nv31_mpeg_init(struct nouveau_object *object) /* PMPEG init */ nv_wr32(priv, 0x00b32c, 0x00000000); nv_wr32(priv, 0x00b314, 0x00000100); - nv_wr32(priv, 0x00b220, nv44_graph_class(priv) ? 0x00000044 : 0x00000031); + if (nv_device(priv)->chipset >= 0x40 && nv44_graph_class(priv)) + nv_wr32(priv, 0x00b220, 0x00000044); + else + nv_wr32(priv, 0x00b220, 0x00000031); nv_wr32(priv, 0x00b300, 0x02001ec1); nv_mask(priv, 0x00b32c, 0x00000001, 0x00000001); |