From 89c5b56be6c242d1489cf5c06b04c8b7a668d6f9 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Mon, 7 Apr 2014 08:42:59 -0400 Subject: [PATCH] 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 Cc: "10.1 10.0" Reviewed-by: Maarten Lankhorst --- src/gallium/drivers/nouveau/nouveau_vp3_video.c | 6 +++--- 1 file 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; -- 2.30.2