OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d8b2b4
)
drm/nv31/mpeg: don't recognize nv3x cards as having nv44 graph class
author
Ilia Mirkin
<imirkin@alum.mit.edu>
Mon, 29 Jul 2013 23:05:18 +0000
(19:05 -0400)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 30 Jul 2013 03:05:06 +0000
(13:05 +1000)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
index
9f7c7d5
..
c190043
100644
(file)
--- 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);