diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-04-07 08:42:59 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-04-07 08:58:15 -0400 |
| commit | 89c5b56be6c242d1489cf5c06b04c8b7a668d6f9 (patch) | |
| tree | 377037bb69e62ca268408de5b76014e3f8cfeea5 | |
| parent | 2f6fcd65f2401695427bcbf1f2bd428d466ecda0 (diff) | |
nouveau: fix firmware check on nvd7/nvd9
The kernel driver expects the class to be based on chipset generation
rather than VP generation. Make sure to pass 90b1 for NVDX chipsets
instead of 95b1.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77102
Fixes: 40dd777b33073
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "10.1 10.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@ubunutu.com>
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_vp3_video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 11cf729f58b..f3a64b22c57 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -371,10 +371,10 @@ firmware_present(struct pipe_screen *pscreen, enum pipe_video_profile profile) int size, oclass; if (chipset < 0xc0) oclass = 0x85b1; - else if (vp5) - oclass = 0x95b1; - else + else if (chipset < 0xe0) oclass = 0x90b1; + else + oclass = 0x95b1; if (chipset < 0xc0) { data = &nv04_data; |