From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon, 7 Apr 2014 12:42:59 +0000 (-0400)
Subject: nouveau: fix firmware check on nvd7/nvd9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89c5b56be6c242d1489cf5c06b04c8b7a668d6f9;p=mesa.git

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>
---

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;